diff --git a/css/style-light.css b/css/style-light.css
index 5b9c6c1..cd2384c 100644
--- a/css/style-light.css
+++ b/css/style-light.css
@@ -8,6 +8,16 @@ a, a:hover, a:visited {
     color: #000;
 }
 
+.bouton {
+	background-color: #000;
+    color: #fff;
+    border: none;
+}
+.bouton:hover {
+	background-color: #222222;
+    color: #F1F1F1;
+}
+
 #main ul#links li a.current {
     background-color: #000;
     color: #fff;
diff --git a/css/style.css b/css/style.css
index b8327c3..9fadfa9 100644
--- a/css/style.css
+++ b/css/style.css
@@ -4,11 +4,14 @@ body {
     margin: 10px;
 }
 
-
 header {
     text-align: center;
 }
 
+.bouton {
+	border-radius: 2px;
+}
+
 #main ul#links {
     padding: 0;
     list-style-type: none;
@@ -56,11 +59,6 @@ footer {
     text-align: right;
 }
 
-/*** ***/
-/*** LOGIN FORM ***/
-ul#login li {
-    list-style-type: none;
-}
 /*** ***/
 /*** LINKS DISPLAY ***/
 
@@ -208,7 +206,7 @@ body.article {
 .messages p { margin: 3px 0 3px 10px !important; padding: 0 10px 0 23px !important; font-size: 14px; line-height: 16px; }
 .messages.error { border: 1px solid #C42608; color: #c00 !important; background: #FFF0EF; }
 .messages.error p { background: url(../img/messages/cross.png ) no-repeat 0px 50%; color:#c00 !important; }
-.messages.success {background: #E0FBCC; border: 1px solid #6DC70C; } 
+.messages.success {background: #E0FBCC; border: 1px solid #6DC70C; }
 .messages.success p { background: url(../img/messages/tick.png) no-repeat 0px 50%; color: #2B6301 !important; }
 .messages.warning { background: #FFFCD3; border: 1px solid #EBCD41; color: #000; }
 .messages.warning p { background: url(../img/messages/warning.png ) no-repeat 0px 50%; color: #5F4E01; }
diff --git a/tpl/home.html b/tpl/home.html
index ad88199..e99e168 100644
--- a/tpl/home.html
+++ b/tpl/home.html
@@ -1,6 +1,6 @@
     <body class="light-style">
         <header>
-            <h1><img src="./img/logo.png" alt="logo poche" />poche</h1>
+            <h1><a href="/"><img src="./img/logo.png" alt="logo poche" /></a>poche</h1>
         </header>
         <div id="main">
             <ul id="links">
@@ -10,7 +10,7 @@
                 <li><a href="?view=config" {if="$view == 'config'"}class="current"{/if}>config</a></li>
                 <li><a href="?logout" title="Logout">logout</a></li>
             </ul>
-            {if condition="isset($entries)"} 
+            {if condition="isset($entries)"}
             <ul id="sort">
                 <li><img src="img/up.png" onclick="sort_links('{$view}', 'ia');" title="by date asc" /> by date <img src="img/down.png" onclick="sort_links('{$view}', 'id');" title="by date desc" /></li>
                 <li><img src="img/up.png" onclick="sort_links('{$view}', 'ta');" title="by title asc" /> by title <img src="img/down.png" onclick="sort_links('{$view}', 'td');" title="by title desc" /></li>
diff --git a/tpl/login.html b/tpl/login.html
index 1292769..66dac99 100644
--- a/tpl/login.html
+++ b/tpl/login.html
@@ -1,31 +1,33 @@
 {include="head"}
     <body class="light-style">
         <header>
-            <h1><img src="./img/logo.png" alt="logo poche" />poche</h1>
+            <h1><a href="/"><img src="./img/logo.png" alt="logo poche" /></a>poche</h1>
         </header>
         <div id="main">
             <form method="post" action="?login" name="loginform">
-                <fieldset>
-                    <h2>login to your poche</h2>
-                    <ul id="login">
-                        <li>
-                            <label for="login">Login</label> <input type="text" id="login" name="login" placeholder="Login" tabindex="1">
-                        </li>
-                        <li>
-                            <label for="password">Password</label> <input type="password" id="password" name="password" placeholder="Password" tabindex="2">
-                        </li>
-                        <li>
-                            <label><input type="checkbox" name="longlastingsession" tabindex="3">&nbsp;Stay signed in (Do not check on public computers)</label>
-                        </li>
-                        <li>
-                            <button type="submit" tabindex="4">Sign in</button>
-                        </li>
-                    </ul>
+                <fieldset class="w500p center">
+                    <h2 class="mbs txtcenter">login to your poche</h2>
+					<div class="row">
+						<label class="col w150p" for="login">Login</label>
+						<input class="col" type="text" id="login" name="login" placeholder="Login" tabindex="1" autofocus />
+					</div>
+					<div class="row">
+						<label class="col w150p" for="password" >Password</label>
+						<input class="col" type="password" id="password" name="password" placeholder="Password" tabindex="2">
+					</div>
+					<div class="row">
+						<label class="col w150p">Stay signed in</label>
+						<div class="col">
+							<input type="checkbox" name="longlastingsession" tabindex="3">
+							<small class="inbl">(Do not check on public computers)</small>
+						</div>
+					</div>
+					<div class="row mts txtcenter">
+						<button class="bouton" type="submit" tabindex="4">Sign in</button>
+					</div>
                 </fieldset>
                 <input type="hidden" name="returnurl" value="<?php echo htmlspecialchars($referer);?>">
                 <input type="hidden" name="token" value="<?php echo Session::getToken(); ?>">
             </form>
-            <script type="text/javascript">
-            window.onload = document.loginform.login.focus();
-            </script>
+
 {include="footer"}
