diff --git a/inc/shaarli.css b/inc/shaarli.css
index 5083984..a1f0f5d 100644
--- a/inc/shaarli.css
+++ b/inc/shaarli.css
@@ -69,9 +69,9 @@ h1 { font-size:20pt; font-weight:bold; font-style:italic; margin-bottom:20px; }
 
 /* Small tab on the left of each link with edit/delete buttons. */
 .button_edit, .button_delete { border-radius:0; box-shadow:none; border-style:none; border-width:0; padding:0; background:none; }
-.linkeditbuttons {  
-	position:absolute; 
-	left:-1px;  
+.linkeditbuttons {
+	position:absolute;
+	left:-1px;
 	padding:4px 2px 2px 2px;
 	background-color:#f0f0f0;
 
@@ -111,7 +111,7 @@ cursor:pointer;
     box-shadow: 0 1px 2px rgba(0, 0, 0, 0.5);
 	width:auto;
 	padding:0 10px 5px 10px;
-	margin: auto; 
+	margin: auto;
 }
 
 #pageheader a
@@ -132,6 +132,8 @@ cursor:pointer;
 	text-decoration:none;
 }
 
+.shareYourLink  {float:right; font-style:italic; color:#bbb; text-align:right; padding:0 5 0 0;}
+
 #toolsdiv a{
 	clear:both;
 }
@@ -206,7 +208,7 @@ cursor:pointer;
 #paging_older { margin-right:15px; }
 #paging_newer { margin-left:15px; }
 
-#headerform { color:#ffffff; padding:5px 5px 5px 5px; clear: both;}
+#headerform { color:#ffffff; padding:5px 5px 5px 5px; clear: both; width:100%; white-space:nowrap;}
 #toolsdiv { color:#ffffff; padding:5px 5px 5px 5px; clear:left; }
 #uploaddiv { color:#ffffff; padding:5px 5px 5px 5px; clear:left; }
 #editlinkform { height:100%;color:#ffffff; padding:5px 5px 5px 15px; width:80%; clear:left; }
@@ -271,7 +273,8 @@ font-size:9pt;
 #footer  a:hover{ color:#000000;}
 #newversion { background-color: #FFFFA0; color:#000; position:absolute; top:0;right:0; padding:2 7 2 7;  font-size:9pt;}
 #cloudtag  { padding-left:10%; padding-right:10%; }
-#cloudtag a { color:black; text-decoration:none; }
+#cloudtag a { font-weight:bold; color:black; text-decoration:none }
+#cloudtag span { color:#99f; font-size:9pt; padding-left:5px; padding-right:2px;}
 #installform td  { font-size: 10pt; color:black; padding:10px 5px 10px 5px; clear:left; }
 #changepasswordform { color:#ccc; padding:10px 5px 10px 5px; clear:left; }
 #changetag { color:#ccc; padding:10px 5px 10px 5px; clear:left; }
@@ -305,7 +308,7 @@ font-size:9pt;
   background-color: transparent;
   background-color: rgba(0, 0, 0, 0.4);  /* FF3+, Saf3+, Opera 10.10+, Chrome, IE9 */
             filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#66000000,endColorstr=#66000000); /* IE6–IE9 */
-text-shadow:2px 2px 1px #000000;    
+text-shadow:2px 2px 1px #000000;
 }
 
 /* Minimal customisation for jQuery widgets */
@@ -336,7 +339,7 @@ box-shadow:2px 2px 20px 2px #333333;
 
 div.daily
 {
-    font-family: Georgia, 'DejaVu Serif', Norasi, serif; 
+    font-family: Georgia, 'DejaVu Serif', Norasi, serif;
     background-color: #E6D6BE;
     /* Background paper texture by BashCorpo:
        http://www.bashcorpo.dk/textures.php
@@ -355,7 +358,7 @@ div.daily
 #daily_col3 { float:left;position:relative; width:33%;}
 
 div.dailyAbout
-{ 
+{
     float:left;
     border: 1px solid black;
     font-size: 8pt;
@@ -363,21 +366,21 @@ div.dailyAbout
     left:10px;
     top: 15px;
     padding: 5px 5px 5px 5px;
-    text-align:center; 
+    text-align:center;
 }
 div.dailyAbout  a { color: #890500; }
 div.dailyTitle
- { 
+ {
      font-weight: bold;
      font-size: 44pt;
-     text-align:center; 
+     text-align:center;
      padding:10px 20px 0px 20px;
 }
 div.dailyDate
- { 
+ {
      font-size: 12pt;
-     font-weight:bold; 
-     text-align:center; 
+     font-weight:bold;
+     text-align:center;
      padding:0px 20px 30px 20px;
 }
 
@@ -391,19 +394,19 @@ div.dailyEntry
 div.dailyEntry  a { text-decoration:none; color: #890500; }
 div.dailyEntryTags { font-size:7.75pt;  }
 div.dailyEntryTitle { font-size:18pt; font-weight:bold;}
-div.dailyEntryThumbnail 
-{ 
-    width:100%; 
-    text-align:center; 
-    background-color:rgb(128,128,128); 
+div.dailyEntryThumbnail
+{
+    width:100%;
+    text-align:center;
+    background-color:rgb(128,128,128);
     background:url(../images/50pc_transparent.png);
     padding:4px 0px 2px 0px;
 }
 div.dailyEntryDescription
-{ 
+{
     margin-top: 10px;
-    margin-bottom: 30px; 
-    text-align:justify; 
+    margin-bottom: 30px;
+    text-align:justify;
     overflow:auto;
 }
 
@@ -413,7 +416,7 @@ div.dailyEntryDescription
 }
 
 /* For lazy images loading in picture wall.
-   using http://www.appelsiini.net/projects/lazyload 
+   using http://www.appelsiini.net/projects/lazyload
  */
 .lazyimage { display:none; }
 
@@ -462,7 +465,7 @@ div.dailyDate  {  font-size: 11pt;padding:0px; display:block; }
 div.dailyEntryTitle { font-size:16pt; font-weight:bold;}
 div.dailyEntryDescription { font-size:10pt; }
 
-} 
+}
 
 /* Highlight search results */
 .highlight { background-color: #FFFF33; }
\ No newline at end of file
diff --git a/tpl/linklist.html b/tpl/linklist.html
index 08455b3..91a0a23 100644
--- a/tpl/linklist.html
+++ b/tpl/linklist.html
@@ -4,7 +4,7 @@
 <body>
 <div id="pageheader">
 	{include="page.header"}
-	<div id="headerform" style="width:100%; white-space:nowrap;">
+	<div id="headerform">
 	    <form method="GET" class="searchform" name="searchform" style="display:inline;"><input type="text" id="searchform_value" name="searchterm" style="width:30%" value=""> <input type="submit" value="Search" class="bigbutton"></form>
 	    <form method="GET" class="tagfilter" name="tagfilter" style="display:inline;margin-left:24px;"><input type="text" name="searchtags" id="tagfilter_value" style="width:10%" value=""> <input type="submit" value="Filter by tag" class="bigbutton"></form>
 	</div>
diff --git a/tpl/loginform.html b/tpl/loginform.html
index 805a014..7a64470 100644
--- a/tpl/loginform.html
+++ b/tpl/loginform.html
@@ -13,7 +13,7 @@
     Login: <input type="text" name="login" tabindex="1">&nbsp;&nbsp;&nbsp;
     Password : <input type="password" name="password" tabindex="2">
     <input type="submit" value="Login" class="bigbutton" tabindex="4"><br>
-    <input style="margin:10 0 0 40;" type="checkbox" name="longlastingsession" id="longlastingsession"  tabindex="3"><label for="longlastingsession">&nbsp;Stay signed in (Do not check on public computers)</label>
+    <input type="checkbox" name="longlastingsession" id="longlastingsession"  tabindex="3"><label for="longlastingsession">&nbsp;Stay signed in (Do not check on public computers)</label>
     <input type="hidden" name="token" value="{$token}">
     {if="$returnurl"}<input type="hidden" name="returnurl" value="{$returnurl|htmlspecialchars}">{/if}
     </form>
diff --git a/tpl/page.header.html b/tpl/page.header.html
index 125b365..4072ede 100644
--- a/tpl/page.header.html
+++ b/tpl/page.header.html
@@ -1,9 +1,9 @@
 
     <div id="logo" title="Share your links !" onclick="document.location='?';"></div>
-    <div style="float:right; font-style:italic; color:#bbb; text-align:right; padding:0 5 0 0;" class="nomobile">Shaare your links...<br>
+    <div class="nomobile shareYourLink">Shaare your links...<br>
         {if="!empty($linkcount)"}{$linkcount} links{/if}</div>
     <span id="shaarli_title"><a href="?">{$shaarlititle|htmlspecialchars}</a></span>
-  
+
 {if="!empty($_GET['source']) && $_GET['source']=='bookmarklet'"}
     {ignore} When called as a popup from bookmarklet, do not display menu. {/ignore}
 {else}
@@ -16,7 +16,7 @@
         <a href="?do=login">Login</a>
     {/if}
     <a href="{$feedurl}?do=rss{$searchcrits}" class="nomobile">RSS Feed</a>
-    <a href="{$feedurl}?do=atom{$searchcrits}" style="padding-left:10px;" class="nomobile">ATOM Feed</a>
+    <a href="{$feedurl}?do=atom{$searchcrits}" class="nomobile">ATOM Feed</a>
     <a href="?do=tagcloud">Tag cloud</a>
     <a href="?do=picwall{$searchcrits}">Picture wall</a>
     <a href="?do=daily">Daily</a>
diff --git a/tpl/tagcloud.html b/tpl/tagcloud.html
index 6918c7b..3a69705 100644
--- a/tpl/tagcloud.html
+++ b/tpl/tagcloud.html
@@ -6,7 +6,7 @@
 <center>
 <div id="cloudtag">
     {loop="tags"}
-    <span style="color:#99f; font-size:9pt; padding-left:5px; padding-right:2px;">{$value.count}</span><a href="?searchtags={$key|htmlspecialchars}" style="font-size:{$value.size}pt; font-weight:bold; color:black; text-decoration:none">{$key|htmlspecialchars}</a>
+    <span>{$value.count}</span><a href="?searchtags={$key|htmlspecialchars}" style="font-size:{$value.size}pt;">{$key|htmlspecialchars}</a>
     {/loop}
 </div>
 </center>