diff --git a/css/style.css b/css/style.css
index ee0a47d..9f3f3d3 100644
--- a/css/style.css
+++ b/css/style.css
@@ -37,6 +37,10 @@ body {
     margin: 15px auto 30px;
 }
 
+.hide {
+    display: none;
+}
+
 /* Commentaires */
 div.comment{
     margin-bottom: 10px;
@@ -69,10 +73,10 @@ header h1 {
     margin-top: 0;
 }
 .container {
-    padding:30px;
+    padding: 30px;
 }
 .container .jumbotron {
-    padding:20px 20px;
+    padding: 20px 20px;
     border-radius: 2px;
 }
 .container .jumbotron p {
@@ -115,7 +119,7 @@ header h1 {
 /* Description du sondage */
     /* studs.php et adminstuds.php */
 header .lead {
-    padding:10px 0;
+    padding: 10px 0;
     margin:0;
 }
 
@@ -240,7 +244,7 @@ table.results tbody td {
 table.results thead th {
     text-align:center;
     border:2px solid white;
-    padding:5px;
+    padding: 5px;
     min-width:40px;
     font-size:12px;
     max-width:100px;
@@ -249,8 +253,8 @@ table.results thead th {
 }
 
 table.results thead .btn {
-    margin:0 auto;
-    display:block;
+    margin: 0 auto;
+    display: block;
 }
 
 table.results th.rbd.day,
@@ -333,7 +337,15 @@ table.results .btn-link.btn-sm {
 }
 
 .choice label {
-    cursor:pointer;
+    cursor: pointer;
+}
+
+td.btn-edit {
+    padding: 5px;
+}
+
+span.edit-username-left {
+    float: right;
 }
 
 .yes .btn, .ifneedbe .btn, .no .btn {
@@ -398,7 +410,7 @@ table.results .btn-link.btn-sm {
 
 table.results .bg-danger .glyphicon {
     opacity:0;
-  
+
     -moz-animation-name: hideNoIcon;
     -moz-animation-iteration-count: 1;
     -moz-animation-timing-function: ease-in;
@@ -505,4 +517,4 @@ table.results > tbody > tr:hover > td .glyphicon {
 
 #password-form .btn-cancel {
     float: right;
-}
\ No newline at end of file
+}
diff --git a/tpl/part/vote_table_classic.tpl b/tpl/part/vote_table_classic.tpl
index fe6a43e..0ccdcae 100644
--- a/tpl/part/vote_table_classic.tpl
+++ b/tpl/part/vote_table_classic.tpl
@@ -50,7 +50,7 @@
                 {if $editingVoteId === $vote->uniqId && !$expired}
 
                 <tr class="hidden-print">
-                    <td class="bg-info" style="padding:5px">
+                    <td class="bg-info btn-edit">
                         <div class="input-group input-group-sm" id="edit">
                             <span class="input-group-addon"><i class="glyphicon glyphicon-user"></i></span>
                             <input type="hidden" name="edited_vote" value="{$vote->uniqId}"/>
@@ -82,7 +82,7 @@
                                         <i class="glyphicon glyphicon-ban-circle"></i><span class="sr-only">{__('Generic', 'No')}</span>
                                     </label>
                                 </li>
-                                <li style="display:none">
+                                <li class="hide">
                                     <input type="radio" id="n-choice-{$id}" name="choices[{$id}]" value=" " {if $choice!='2' && $choice!='1' && $choice!='0'}checked {/if}/>
                                 </li>
                             </ul>
@@ -91,12 +91,20 @@
                         {$id=$id + 1}
                     {/foreach}
 
-                    <td style="padding:5px"><button type="submit" class="btn btn-success btn-xs" name="save" value="{$vote->id|html}" title="{__('Poll results', 'Save the choices')} {$vote->name|html}">{__('Generic', 'Save')}</button></td>
+                    <td class="btn-edit"><button type="submit" class="btn btn-success btn-xs" name="save" value="{$vote->id|html}" title="{__('Poll results', 'Save the choices')} {$vote->name|html}">{__('Generic', 'Save')}</button></td>
                 </tr>
                 {elseif !$hidden} {* Voted line *}
                 <tr>
 
-                    <th class="bg-info">{$vote->name|html}</th>
+                    <th class="bg-info">{$vote->name|html}
+					{if $slots gt 4}
+					<span class="edit-username-left">
+						<a href="{if $admin}{poll_url id=$poll->admin_id vote_id=$vote->uniqId admin=true}{else}{poll_url id=$poll->id vote_id=$vote->uniqId}{/if}" class="btn btn-default btn-sm" title="{__f('Poll results', 'Edit the line: %s', $vote->name)|html}">
+                    	<i class="glyphicon glyphicon-pencil"></i><span class="sr-only">{__('Generic', 'Edit')}</span>
+                   	 	</a>
+					</span>
+					{/if}
+					</th>
 
                     {$id=0}
                     {foreach $slots as $slot}
@@ -146,7 +154,7 @@
 
             {if $active && $editingVoteId === 0 && !$expired && $accessGranted}
                 <tr id="vote-form" class="hidden-print">
-                    <td class="bg-info" style="padding:5px">
+                    <td class="bg-info" class="btn-edit">
                         <div class="input-group input-group-sm">
                             <span class="input-group-addon"><i class="glyphicon glyphicon-user"></i></span>
                             <input type="text" id="name" name="name" class="form-control" title="{__('Generic', 'Your name')}" placeholder="{__('Generic', 'Your name')}" />
@@ -173,7 +181,7 @@
                                         <i class="glyphicon glyphicon-ban-circle"></i><span class="sr-only">{__('Generic', 'No')}</span>
                                     </label>
                                 </li>
-                                <li style="display:none">
+                                <li class="hide">
                                   <input type="radio" id="n-choice-{$id}" name="choices[{$id}]" value=" " checked/>
                                 </li>
                             </ul>
@@ -226,10 +234,10 @@
                 $('#showChart')
                         .after("<h3>{__('Poll results', 'Chart')}</h3><canvas id=\"Chart\"></canvas>")
                         .remove();
-                
+
                 var resIfneedbe = [];
                 var resYes = [];
-            
+
                 $('#addition').find('td').each(function () {
                     var inbCountText = $(this).find('.inb-count').text();
                     if(inbCountText != '' && inbCountText != undefined) {
@@ -247,7 +255,7 @@
                 });
                 var cols = [
                 {foreach $slots as $id=>$slot}
-                    $('<div/>').html('{$slot->title|markdown:true}').text(), 
+                    $('<div/>').html('{$slot->title|markdown:true}').text(),
                 {/foreach}
                 ];
 
@@ -282,7 +290,7 @@
             });
         });
     </script>
-    
+
 {/if}
 
 
@@ -304,7 +312,7 @@
 
 
                 {$i = 0}
-                <ul style="list-style:none">
+                <ul class="list-unstyled">
                     {foreach $slots as $slot}
                         {if $best_choices['y'][$i] == $max}
                             <li><strong>{$slot->title|markdown:true}</strong></li>
diff --git a/tpl/part/vote_table_date.tpl b/tpl/part/vote_table_date.tpl
index 7723b17..6384b87 100644
--- a/tpl/part/vote_table_date.tpl
+++ b/tpl/part/vote_table_date.tpl
@@ -97,14 +97,16 @@
 
                 {if $editingVoteId === $vote->uniqId && !$expired}
                 <tr class="hidden-print">
-                    <td class="bg-info" style="padding:5px">
+                    <td class="bg-info btn-edit">
                         <div class="input-group input-group-sm" id="edit">
                             <span class="input-group-addon"><i class="glyphicon glyphicon-user"></i></span>
                             <input type="hidden" name="edited_vote" value="{$vote->uniqId}"/>
                             <input type="text" id="name" name="name" value="{$vote->name|html}" class="form-control" title="{__('Generic', 'Your name')}" placeholder="{__('Generic', 'Your name')}" />
+
                         </div>
                     </td>
 
+
                     {$k=0}
                     {foreach $slots as $slot}
                       {foreach $slot->moments as $moment}
@@ -131,7 +133,7 @@
                                         <i class="glyphicon glyphicon-ban-circle"></i><span class="sr-only">{__('Generic', 'No')}</span>
                                     </label>
                                 </li>
-                                <li style="display:none">
+                                <li class="hide">
                                     <input type="radio" id="n-choice-{$k}" name="choices[{$k}]" value=" " {if $choice!='2' && $choice!='1' && $choice!='0'}checked {/if}/>
                                 </li>
                             </ul>
@@ -141,7 +143,7 @@
                       {/foreach}
                     {/foreach}
 
-                    <td style="padding:5px"><button type="submit" class="btn btn-success btn-xs" name="save" value="{$vote->id|html}" title="{__('Poll results', 'Save the choices')} {$vote->name|html}">{__('Generic', 'Save')}</button></td>
+                    <td class="btn-edit"><button type="submit" class="btn btn-success btn-xs" name="save" value="{$vote->id|html}" title="{__('Poll results', 'Save the choices')} {$vote->name|html}">{__('Generic', 'Save')}</button></td>
 
                 </tr>
                 {elseif !$hidden}
@@ -149,7 +151,18 @@
 
                     {* Voted line *}
 
-                    <th class="bg-info">{$vote->name|html}</th>
+                    <th class="bg-info">{$vote->name|html}
+					{if $slots gt 4}
+						<span class="edit-username-left">
+							<a href="{if $admin}{poll_url id=$poll->admin_id vote_id=$vote->uniqId admin=true}{else}{poll_url id=$poll->id vote_id=$vote->uniqId}{/if}" class="btn btn-default btn-sm" title="{__f('Poll results', 'Edit the line: %s', $vote->name)|html}">
+                       		<i class="glyphicon glyphicon-pencil"></i><span class="sr-only">{__('Generic', 'Edit')}</span>
+                       		</a>
+					</span>
+					{/if}
+					</th>
+
+
+
 
                     {$k=0}
                     {foreach $slots as $slot}
@@ -200,7 +213,7 @@
 
             {if $active && $editingVoteId === 0 && !$expired && $accessGranted}
                 <tr id="vote-form" class="hidden-print">
-                    <td class="bg-info" style="padding:5px">
+                    <td class="bg-info btn-edit">
                         <div class="input-group input-group-sm">
                             <span class="input-group-addon"><i class="glyphicon glyphicon-user"></i></span>
                             <input type="text" id="name" name="name" class="form-control" title="{__('Generic', 'Your name')}" placeholder="{__('Generic', 'Your name')}" />
@@ -229,7 +242,7 @@
                                             <i class="glyphicon glyphicon-ban-circle"></i><span class="sr-only">{__('Generic', 'No')}</span>
                                         </label>
                                     </li>
-                                    <li style="display:none">
+                                    <li class="hide">
                                       <input type="radio" id="n-choice-{$i}" name="choices[{$i}]" value=" " checked/>
                                     </li>
                                 </ul>
@@ -284,10 +297,10 @@
                 $('#showChart')
                         .after("<h3>{__('Poll results', 'Chart')}</h3><canvas id=\"Chart\"></canvas>")
                         .remove();
-                               
+
                 var resIfneedbe = [];
                 var resYes = [];
-            
+
                 $('#addition').find('td').each(function () {
                     var inbCountText = $(this).find('.inb-count').text();
                     if(inbCountText != '' && inbCountText != undefined) {
@@ -305,7 +318,7 @@
                 var cols = [
                 {foreach $slots as $slot}
                     {foreach $slot->moments as $moment}
-                        $('<div/>').html('{$slot->day|date_format:$date_format.txt_short|html} - {$moment|html}').text(), 
+                        $('<div/>').html('{$slot->day|date_format:$date_format.txt_short|html} - {$moment|html}').text(),
                     {/foreach}
                 {/foreach}
                 ];
@@ -341,7 +354,7 @@
             });
         });
     </script>
-    
+
 {/if}
 
 {if !$hidden}
@@ -361,7 +374,7 @@
 
 
                 {$i = 0}
-                <ul style="list-style:none">
+                <ul class="list-unstyled">
                     {foreach $slots as $slot}
                         {foreach $slot->moments as $moment}
                             {if $best_choices['y'][$i] == $max}