diff --git a/css/app/create_poll.css b/css/app/create_poll.css
index 58b79eb..18935fc 100644
--- a/css/app/create_poll.css
+++ b/css/app/create_poll.css
@@ -22,10 +22,4 @@
     border-bottom: 4px dashed;
     border-top: 0 none;
     content: "";
-}
-
-@media (max-width: 767px) {
-    #optionnal {
-        margin-top: 15px;
-    }
 }
\ No newline at end of file
diff --git a/css/style.css b/css/style.css
index bbdd74a..ee16b7b 100644
--- a/css/style.css
+++ b/css/style.css
@@ -521,6 +521,12 @@ table.results > tbody > tr:hover > td .glyphicon {
 #poll_search {
     cursor: pointer;
 }
+.table-of-polls {
+    overflow-x: scroll;
+    margin-bottom: 0;
+    border: 0;
+    box-shadow: none;
+}
 
 /* Studs */
 .password_request {
diff --git a/tpl/admin/polls.tpl b/tpl/admin/polls.tpl
index d7a00df..6fb872d 100644
--- a/tpl/admin/polls.tpl
+++ b/tpl/admin/polls.tpl
@@ -64,59 +64,60 @@
             <div class="panel-heading">
                 {if $count == $total}{$count}{else}{$count} / {$total}{/if} {__('Admin', 'polls in the database at this time')}
             </div>
-
-            <table class="table table-bordered table-polls">
-                <tr align="center">
-                    <th scope="col"></th>
-                    <th scope="col">{__('Admin', 'Title')}</th>
-                    <th scope="col">{__('Admin', 'Author')}</th>
-                    <th scope="col">{__('Admin', 'Email')}</th>
-                    <th scope="col">{__('Admin', 'Expiration date')}</th>
-                    <th scope="col">{__('Admin', 'Votes')}</th>
-                    <th scope="col">{__('Admin', 'Poll ID')}</th>
-                    <th scope="col" colspan="3">{__('Admin', 'Actions')}</th>
-                </tr>
-                {foreach $polls as $poll}
+            <div class="table-of-polls panel">
+                <table class="table table-bordered table-polls">
                     <tr align="center">
-                        <td class="cell-format">
-                            {if $poll->format === 'D'}
-                                <span class="glyphicon glyphicon-calendar" aria-hidden="true"
-                                      title="{__('Generic', 'Date')}"></span>
-                                <span class="sr-only">{__('Generic', 'Date')}</span>
-                            {else}
-                                <span class="glyphicon glyphicon-list-alt" aria-hidden="true"
-                                      title="{__('Generic', 'Classic')}"></span>
-                                <span class="sr-only">{__('Generic', 'Classic')}</span>
-                            {/if}
-                        </td>
-                        <td>{$poll->title|html}</td>
-                        <td>{$poll->admin_name|html}</td>
-                        <td>{$poll->admin_mail|html}</td>
-
-                        {if strtotime($poll->end_date) > time()}
-                            <td>{date('d/m/y', strtotime($poll->end_date))}</td>
-                        {else}
-                            <td><span class="text-danger">{strtotime($poll->end_date)|date_format:'d/m/Y'}</span></td>
-                        {/if}
-                        <td>{$poll->votes|html}</td>
-                        <td>{$poll->id|html}</td>
-                        <td><a href="{poll_url id=$poll->id}" class="btn btn-link"
-                               title="{__('Admin', 'See the poll')}"><span
-                                        class="glyphicon glyphicon-eye-open"></span><span
-                                        class="sr-only">{__('Admin', 'See the poll')}</span></a></td>
-                        <td><a href="{poll_url id=$poll->admin_id admin=true}" class="btn btn-link"
-                               title="{__('Admin', 'Change the poll')}"><span
-                                        class="glyphicon glyphicon-pencil"></span><span
-                                        class="sr-only">{__('Admin', 'Change the poll')}</span></a></td>
-                        <td>
-                            <button type="submit" name="delete_poll" value="{$poll->id|html}" class="btn btn-link"
-                                    title="{__('Admin', 'Deleted the poll')}"><span
-                                        class="glyphicon glyphicon-trash text-danger"></span><span
-                                        class="sr-only">{__('Admin', 'Deleted the poll')}</span>
-                        </td>
+                        <th scope="col"></th>
+                        <th scope="col">{__('Admin', 'Title')}</th>
+                        <th scope="col">{__('Admin', 'Author')}</th>
+                        <th scope="col">{__('Admin', 'Email')}</th>
+                        <th scope="col">{__('Admin', 'Expiration date')}</th>
+                        <th scope="col">{__('Admin', 'Votes')}</th>
+                        <th scope="col">{__('Admin', 'Poll ID')}</th>
+                        <th scope="col" colspan="3">{__('Admin', 'Actions')}</th>
                     </tr>
-                {/foreach}
-            </table>
+                    {foreach $polls as $poll}
+                        <tr align="center">
+                            <td class="cell-format">
+                                {if $poll->format === 'D'}
+                                    <span class="glyphicon glyphicon-calendar" aria-hidden="true"
+                                          title="{__('Generic', 'Date')}"></span>
+                                    <span class="sr-only">{__('Generic', 'Date')}</span>
+                                {else}
+                                    <span class="glyphicon glyphicon-list-alt" aria-hidden="true"
+                                          title="{__('Generic', 'Classic')}"></span>
+                                    <span class="sr-only">{__('Generic', 'Classic')}</span>
+                                {/if}
+                            </td>
+                            <td>{$poll->title|html}</td>
+                            <td>{$poll->admin_name|html}</td>
+                            <td>{$poll->admin_mail|html}</td>
+
+                            {if strtotime($poll->end_date) > time()}
+                                <td>{date('d/m/y', strtotime($poll->end_date))}</td>
+                            {else}
+                                <td><span class="text-danger">{strtotime($poll->end_date)|date_format:'d/m/Y'}</span></td>
+                            {/if}
+                            <td>{$poll->votes|html}</td>
+                            <td>{$poll->id|html}</td>
+                            <td><a href="{poll_url id=$poll->id}" class="btn btn-link"
+                                   title="{__('Admin', 'See the poll')}"><span
+                                            class="glyphicon glyphicon-eye-open"></span><span
+                                            class="sr-only">{__('Admin', 'See the poll')}</span></a></td>
+                            <td><a href="{poll_url id=$poll->admin_id admin=true}" class="btn btn-link"
+                                   title="{__('Admin', 'Change the poll')}"><span
+                                            class="glyphicon glyphicon-pencil"></span><span
+                                            class="sr-only">{__('Admin', 'Change the poll')}</span></a></td>
+                            <td>
+                                <button type="submit" name="delete_poll" value="{$poll->id|html}" class="btn btn-link"
+                                        title="{__('Admin', 'Deleted the poll')}"><span
+                                            class="glyphicon glyphicon-trash text-danger"></span><span
+                                            class="sr-only">{__('Admin', 'Deleted the poll')}</span>
+                            </td>
+                        </tr>
+                    {/foreach}
+                </table>
+            </div>
 
             <div class="panel-heading">
                 {__('Admin', 'Pages:')}