diff --git a/css/style.css b/css/style.css
index fb71373..0251ee4 100644
--- a/css/style.css
+++ b/css/style.css
@@ -68,6 +68,9 @@ header h1 {
     padding:20px 20px;
     border-radius: 2px;
 }
+.container .jumbotron p {
+    font-size: 1em;
+}
 
 .summary h4 {
     margin-top:0;
diff --git a/tpl/part/poll_info.tpl b/tpl/part/poll_info.tpl
index 9af9067..cc81e53 100644
--- a/tpl/part/poll_info.tpl
+++ b/tpl/part/poll_info.tpl
@@ -2,7 +2,7 @@
 
 {if $admin}<form action="{poll_url id=$admin_poll_id admin=true}" method="POST">{/if}
     <div class="jumbotron{if $admin} bg-danger{/if}">
-        <div class="row">
+        <div class="row"> {* Title | buttons*}
             <div id="title-form" class="col-md-7">
                 <h3>{$poll->title|html}{if $admin && !$expired} <button class="btn btn-link btn-sm btn-edit" title="{__('PollInfo', 'Edit the title')}"><span class="glyphicon glyphicon-pencil"></span><span class="sr-only">{__('Generic', 'Edit')}</span></button>{/if}</h3>
                 {if $admin && !$expired}
@@ -36,57 +36,57 @@
                 </div>
             </div>
         </div>
-        <div class="row">
-            <div id="name-form" class="form-group col-md-5">
-                <h4 class="control-label">{__('PollInfo', 'Initiator of the poll')}</h4>
-                <p class="form-control-static">{$poll->admin_name|html}{if $admin && !$expired} <button class="btn btn-link btn-sm btn-edit" title="{__('PollInfo', 'Edit the name')}"><span class="glyphicon glyphicon-pencil"></span><span class="sr-only">{__('Generic', 'Edit')}</span></button>{/if}</p>
-                {if $admin && !$expired}
-                <div class="hidden js-name">
-                    <label class="sr-only" for="newname">{__('PollInfo', 'Initiator of the poll')}</label>
-                    <div class="input-group">
-                        <input type="text" class="form-control" id="newname" name="name" size="40" value="{$poll->admin_name|html}" />
-                        <span class="input-group-btn">
-                        <button type="submit" class="btn btn-success" name="update_poll_info" value="name" title="{__('PollInfo', 'Save the new name')}"><span class="glyphicon glyphicon-ok"></span><span class="sr-only">{__('Generic', 'Save')}</span></button>
-                        <button class="btn btn-link btn-cancel" title="{__('PollInfo', 'Cancel the name edit')}"><span class="glyphicon glyphicon-remove"></span><span class="sr-only">{__('Generic', 'Cancel')}</span></button>
-                        </span>
-                    </div>
-                </div>
-                {/if}
-            </div>
-        </div>
-        <div class="row">
-            {if $admin}
+        <div class="row"> {* Admin name + email | Description *}
             <div class="form-group col-md-5">
-                <div id="email-form">
-                    <p>{$poll->admin_mail|html}{if !$expired} <button class="btn btn-link btn-sm btn-edit" title="{__('PollInfo', 'Edit the email adress')}"><span class="glyphicon glyphicon-pencil"></span><span class="sr-only">{__('Generic', 'Edit')}</span></button>{/if}</p>
-                    {if !$expired}
-                    <div class="hidden js-email">
-                        <label class="sr-only" for="admin_mail">{__('PollInfo', 'Email')}</label>
+                <div id="name-form">
+                    <h4 class="control-label">{__('PollInfo', 'Initiator of the poll')}</h4>
+                    <p class="form-control-static">{$poll->admin_name|html}{if $admin && !$expired} <button class="btn btn-link btn-sm btn-edit" title="{__('PollInfo', 'Edit the name')}"><span class="glyphicon glyphicon-pencil"></span><span class="sr-only">{__('Generic', 'Edit')}</span></button>{/if}</p>
+                    {if $admin && !$expired}
+                    <div class="hidden js-name">
+                        <label class="sr-only" for="newname">{__('PollInfo', 'Initiator of the poll')}</label>
                         <div class="input-group">
-                            <input type="text" class="form-control" id="admin_mail" name="admin_mail" size="40" value="{$poll->admin_mail|html}" />
+                            <input type="text" class="form-control" id="newname" name="name" size="40" value="{$poll->admin_name|html}" />
                             <span class="input-group-btn">
-                                <button type="submit" name="update_poll_info" value="admin_mail" class="btn btn-success" title="{__('PollInfo', 'Save the email address')}"><span class="glyphicon glyphicon-ok"></span><span class="sr-only">{__('Generic', 'Save')}</span></button>
-                                <button class="btn btn-link btn-cancel" title="{__('PollInfo', 'Cancel the email address edit')}"><span class="glyphicon glyphicon-remove"></span><span class="sr-only">{__('Generic', 'Cancel')}</span></button>
+                            <button type="submit" class="btn btn-success" name="update_poll_info" value="name" title="{__('PollInfo', 'Save the new name')}"><span class="glyphicon glyphicon-ok"></span><span class="sr-only">{__('Generic', 'Save')}</span></button>
+                            <button class="btn btn-link btn-cancel" title="{__('PollInfo', 'Cancel the name edit')}"><span class="glyphicon glyphicon-remove"></span><span class="sr-only">{__('Generic', 'Cancel')}</span></button>
                             </span>
                         </div>
                     </div>
                     {/if}
                 </div>
+                {if $admin}
+                <div id="email-form">
+                    <p>{$poll->admin_mail|html}{if !$expired} <button class="btn btn-link btn-sm btn-edit" title="{__('PollInfo', 'Edit the email adress')}"><span class="glyphicon glyphicon-pencil"></span><span class="sr-only">{__('Generic', 'Edit')}</span></button>{/if}</p>
+                    {if !$expired}
+                        <div class="hidden js-email">
+                            <label class="sr-only" for="admin_mail">{__('PollInfo', 'Email')}</label>
+                            <div class="input-group">
+                                <input type="text" class="form-control" id="admin_mail" name="admin_mail" size="40" value="{$poll->admin_mail|html}" />
+                            <span class="input-group-btn">
+                                <button type="submit" name="update_poll_info" value="admin_mail" class="btn btn-success" title="{__('PollInfo', 'Save the email address')}"><span class="glyphicon glyphicon-ok"></span><span class="sr-only">{__('Generic', 'Save')}</span></button>
+                                <button class="btn btn-link btn-cancel" title="{__('PollInfo', 'Cancel the email address edit')}"><span class="glyphicon glyphicon-remove"></span><span class="sr-only">{__('Generic', 'Cancel')}</span></button>
+                            </span>
+                            </div>
+                        </div>
+                    {/if}
+                </div>
+                {/if}
             </div>
-            {/if}
             <div class="form-group col-md-7" id="description-form">
                 <h4 class="control-label">{__('Generic', 'Description')}{if $admin && !$expired} <button class="btn btn-link btn-sm btn-edit" title="{__('PollInfo', 'Edit the description')}"><span class="glyphicon glyphicon-pencil"></span><span class="sr-only">{__('Generic', 'Edit')}</span></button>{/if}</h4>
                 <p class="form-control-static well">{$poll->description|html}</p>
                 {if $admin && !$expired}
-                <div class="hidden js-desc text-right">
-                    <label class="sr-only" for="newdescription">{__('Generic', 'Description')}</label>
-                    <textarea class="form-control" id="newdescription" name="description" rows="2" cols="40">{$poll->description|html}</textarea>
-                    <button type="submit" id="btn-new-desc" name="update_poll_info" value="description" class="btn btn-sm btn-success" title="{__('PollInfo', 'Save the description')}"><span class="glyphicon glyphicon-ok"></span><span class="sr-only">{__('Generic', 'Save')}</span></button>
-                    <button class="btn btn-default btn-sm btn-cancel" title="{__('PollInfo', 'Cancel the description edit')}"><span class="glyphicon glyphicon-remove"></span><span class="sr-only">{__('Generic', 'Cancel')}</span></button>
-                </div>
+                    <div class="hidden js-desc text-right">
+                        <label class="sr-only" for="newdescription">{__('Generic', 'Description')}</label>
+                        <textarea class="form-control" id="newdescription" name="description" rows="2" cols="40">{$poll->description|html}</textarea>
+                        <button type="submit" id="btn-new-desc" name="update_poll_info" value="description" class="btn btn-sm btn-success" title="{__('PollInfo', 'Save the description')}"><span class="glyphicon glyphicon-ok"></span><span class="sr-only">{__('Generic', 'Save')}</span></button>
+                        <button class="btn btn-default btn-sm btn-cancel" title="{__('PollInfo', 'Cancel the description edit')}"><span class="glyphicon glyphicon-remove"></span><span class="sr-only">{__('Generic', 'Cancel')}</span></button>
+                    </div>
                 {/if}
             </div>
         </div>
+        <div class="row">
+        </div>
 
         <div class="row">
             <div class="form-group form-group {if $admin}col-md-4{else}col-md-6{/if}">