diff --git a/core/lib/Thelia/Form/ConfigCreationForm.php b/core/lib/Thelia/Form/ConfigCreationForm.php
index 5594830bc..fc65d3d44 100644
--- a/core/lib/Thelia/Form/ConfigCreationForm.php
+++ b/core/lib/Thelia/Form/ConfigCreationForm.php
@@ -40,11 +40,19 @@ class ConfigCreationForm extends BaseForm
 
         $this->formBuilder
             ->add("name", "text", array(
-                "constraints" => $name_constraints
+                "constraints" => $name_constraints,
+                "label" => "Name *",
+                "label_attr" => array(
+                    "for" => "name"
+                )
             ))
             ->add("title", "text", array(
                 "constraints" => array(
                     new Constraints\NotBlank()
+                ),
+                "label" => "Purpose *",
+                "label_attr" => array(
+                    "for" => "purpose"
                 )
             ))
             ->add("locale", "hidden", array(
@@ -52,7 +60,12 @@ class ConfigCreationForm extends BaseForm
                     new Constraints\NotBlank()
                 )
             ))
-            ->add("value", "text", array())
+            ->add("value", "text", array(                
+                "label" => "Value *",
+                "label_attr" => array(
+                    "for" => "value"
+                )
+            ))
             ->add("hidden", "hidden", array())
             ->add("secured", "hidden", array())
         ;
diff --git a/templates/admin/default/variables.html b/templates/admin/default/variables.html
index bbab0ae72..6373618f9 100644
--- a/templates/admin/default/variables.html
+++ b/templates/admin/default/variables.html
@@ -22,99 +22,105 @@
                 <form action="{url path='/admin/configuration/variables/update-values'}" method="post">
 	                <div class="general-block-decorator">
 	                    <table class="table table-striped table-condensed table-left-aligned">
-	                        <caption>
+	                        <caption class="clearfix">
 	                           {intl l='Thelia system variables'}
 	                           {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.configuration.variables.create"}
-                                <a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new variable'}" href="#add_variable_dialog" data-toggle="modal">
-                                    <span class="glyphicon glyphicon-plus-sign"></span>
-                                </a>
-                                <button class="btn btn-default btn-primary action-btn" title="{intl l='Save chages'}">{intl l='Save changes'} <span class="glyphicon glyphicon-ok"></span></button>
+                               <div class="pull-right">
+                                  <a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new variable'}" href="#add_variable_dialog" data-toggle="modal">
+                                      <span class="glyphicon glyphicon-plus-sign"></span>
+                                  </a>
+                                  <button class="btn btn-default btn-primary" title="{intl l='Save chages'}"><span class="glyphicon glyphicon-ok"></span> {intl l='Save changes'}</button>
+                                </div>
                             {/loop}
 
 	                        </caption>
-	                        <tr>
-	                           <th>
-                               {admin_sortable_header
-                                  current_order=$order
-                                  order='title'
-                                  reverse_order='title_reverse'
-                                  path={url path='/admin/configuration/variables'}
-                                  label={intl l='Purpose'}
-                               }
-	                           </th>
 
-                               <th>
-                               {admin_sortable_header
-                                  current_order=$order
-                                  order='name'
-                                  reverse_order='name_reverse'
-                                  path={url path='/admin/configuration/variables'}
-                                  label={intl l='Name'}
-                               }
-                               </th>
+                          <thead>
+  	                        <tr>
+  	                           <th>
+                                 {admin_sortable_header
+                                    current_order=$order
+                                    order='title'
+                                    reverse_order='title_reverse'
+                                    path={url path='/admin/configuration/variables'}
+                                    label={intl l='Purpose'}
+                                 }
+  	                           </th>
 
-                               <th>
-                               {admin_sortable_header
-                                  current_order=$order
-                                  order='value'
-                                  reverse_order='value_reverse'
-                                  path={url path='/admin/configuration/variables'}
-                                  label={intl l='Value'}
-                               }
-                               </th>
+                                 <th>
+                                 {admin_sortable_header
+                                    current_order=$order
+                                    order='name'
+                                    reverse_order='name_reverse'
+                                    path={url path='/admin/configuration/variables'}
+                                    label={intl l='Name'}
+                                 }
+                                 </th>
 
-                               {module_include location='variables_table_header'}
+                                 <th>
+                                 {admin_sortable_header
+                                    current_order=$order
+                                    order='value'
+                                    reverse_order='value_reverse'
+                                    path={url path='/admin/configuration/variables'}
+                                    label={intl l='Value'}
+                                 }
+                                 </th>
 
-                               <th>&nbsp;</th>
-	                        </tr>
+                                 {module_include location='variables_table_header'}
 
-	                        {loop name="config" type="config" hidden="0" secured="*" backend_context="1" lang="$lang_id" order="$order"}
-	                            <tr>
+                                 <th>{intl l='Action'}</th>
+  	                        </tr>
+                          </thead>
+                          <tbody>
+  	                        {loop name="config" type="config" hidden="0" secured="*" backend_context="1" lang="$lang_id" order="$order"}
+  	                            <tr>
 
-	                               <td>{$TITLE}</td>
+  	                               <td>{$TITLE}</td>
 
-                                   <td>
-                                   {if ! $SECURED}
-                                       {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.variables.change"}
-                                           <a title="{intl l='Change this variable'}" href="{url path='/admin/configuration/variables/update' variable_id="$ID"}">{$NAME}</a>
-                                       {/loop}
-                                       {elseloop rel="can_change"}
-                                           {$NAME}
-                                       {/elseloop}
-                                   {else}
-                                       {$NAME}
-                                   {/if}
-                                   </td>
+                                     <td>
+                                     {if ! $SECURED}
+                                         {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.variables.change"}
+                                             <a title="{intl l='Change this variable'}" href="{url path='/admin/configuration/variables/update' variable_id="$ID"}">{$NAME}</a>
+                                         {/loop}
+                                         {elseloop rel="can_change"}
+                                             {$NAME}
+                                         {/elseloop}
+                                     {else}
+                                         {$NAME}
+                                     {/if}
+                                     </td>
 
-	                                <td>
-	                                    {if $SECURED}
-	                                        {$VALUE}
-	                                    {else}
-	                                        <input id="cancelable_edit_{$ID}" class="js-edit" data-id="{$ID}" type="text" name="variable[{$ID}]" value="{$VALUE|htmlspecialchars}" />
-	                                    {/if}
-	                                </td>
+  	                                <td>
+  	                                    {if $SECURED}
+  	                                        {$VALUE}
+  	                                    {else}
+  	                                        <input id="cancelable_edit_{$ID}" class="js-edit form-control" data-id="{$ID}" type="text" name="variable[{$ID}]" value="{$VALUE|htmlspecialchars}" />
+  	                                    {/if}
+  	                                </td>
 
-	                                {module_include location='variables_table_row'}
+  	                                {module_include location='variables_table_row'}
 
-	                                <td class="actions">
-	                                    {if ! $SECURED}
-		                                    <div class="btn-group">
-                                               <a class="btn btn-default btn-xs cancel-edit" id="cancel_edit_btn_{$ID}" data-id="{$ID}" title="{intl l='Cancel changes and revert to original value'}" href="#"><i class="glyphicon glyphicon-remove"></i></a>
+  	                                <td class="actions">
+  	                                    {if ! $SECURED}
+  		                                    <div class="btn-group">
+                                                 <a class="btn btn-default btn-xs cancel-edit" id="cancel_edit_btn_{$ID}" data-id="{$ID}" title="{intl l='Cancel changes and revert to original value'}" href="#"><i class="glyphicon glyphicon-remove"></i></a>
 
-                                               {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.variables.change"}
-                                                   <a class="btn btn-default btn-xs config-change" title="{intl l='Change this variable'}" href="{url path='/admin/configuration/variables/update' variable_id="$ID"}"><i class="glyphicon glyphicon-edit"></i></a>
-                                               {/loop}
+                                                 {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.variables.change"}
+                                                     <a class="btn btn-default btn-xs config-change" title="{intl l='Change this variable'}" href="{url path='/admin/configuration/variables/update' variable_id="$ID"}"><i class="glyphicon glyphicon-edit"></i></a>
+                                                 {/loop}
 
-                                               {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.configuration.variables.delete"}
-                                                   <a class="btn btn-default btn-xs config-delete" title="{intl l='Delete this variable'}" href="#delete_variable_dialog" data-id="{$ID}" data-toggle="modal"><i class="glyphicon glyphicon-trash"></i></a>
-                                               {/loop}
-		                                    </div>
-		                                {else}
-		                                    <i title="{intl l='This variable could not be changed.'}" class="glyphicon glyphicon-ban-circle"></i>
-	                                    {/if}
-	                                </td>
-	                            </tr>
-	                        {/loop}
+                                                 {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.configuration.variables.delete"}
+                                                     <a class="btn btn-default btn-xs config-delete" title="{intl l='Delete this variable'}" href="#delete_variable_dialog" data-id="{$ID}" data-toggle="modal"><i class="glyphicon glyphicon-trash"></i></a>
+                                                 {/loop}
+  		                                    </div>
+  		                                {else}
+  		                                    <i title="{intl l='This variable could not be changed.'}" class="glyphicon glyphicon-ban-circle"></i>
+  	                                    {/if}
+  	                                </td>
+  	                            </tr>
+  	                        {/loop}
+                          </tbody>
 	                    </table>
 	                </div>
                 </form>
@@ -129,129 +135,115 @@
 
 {* Adding a new variable *}
 
-<div class="modal hide fade" id="add_variable_dialog" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="modal fade" id="add_variable_dialog" tabindex="-1" role="dialog" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
 
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-        <h3>{intl l="Create a new variable"}</h3>
-    </div>
+      <div class="modal-header">
+          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+          <h3>{intl l="Create a new variable"}</h3>
+      </div>
 
-    {form name="thelia.admin.config.creation"}
-    <form method="POST" action="{url path='/admin/configuration/variables/create'}" {form_enctype form=$form}>
+      {form name="thelia.admin.config.creation"}
+      <form method="POST" action="{url path='/admin/configuration/variables/create'}" {form_enctype form=$form}>
 
-        {form_hidden_fields form=$form}
+          {form_hidden_fields form=$form}
 
-        {form_field form=$form field='success_url'}
-        {* on success, redirect to the edition page, _ID_ is replaced with the created variable ID, see controller  *}
-        <input type="hidden" name="{$name}" value="{url path='/admin/configuration/variables/update' variable_id='_ID_'}" />
-        {/form_field}
+          {form_field form=$form field='success_url'}
+          {* on success, redirect to the edition page, _ID_ is replaced with the created variable ID, see controller  *}
+          <input type="hidden" name="{$name}" value="{url path='/admin/configuration/variables/update' variable_id='_ID_'}" />
+          {/form_field}
 
-        {* We do not allow users to create hidden or secured variables from here *}
+          {* We do not allow users to create hidden or secured variables from here *}
 
-        {form_field form=$form field='hidden'}
-        <input type="hidden" name="{$name}" value="0" />
-        {/form_field}
+          {form_field form=$form field='hidden'}
+          <input type="hidden" name="{$name}" value="0" />
+          {/form_field}
 
-        {form_field form=$form field='secured'}
-        <input type="hidden" name="{$name}" value="0" />
-        {/form_field}
+          {form_field form=$form field='secured'}
+          <input type="hidden" name="{$name}" value="0" />
+          {/form_field}
 
-        <div class="modal-body">
+          <div class="modal-body">
 
-            {if #form_error}<div class="alert alert-block alert-error" id="add_variable_dialog_error">#form_error_message</div>{/if}
+              {if #form_error}<div class="alert alert-error" id="add_variable_dialog_error">#form_error_message</div>{/if}
+                
+              {form_field form=$form field='name'}
+              <div class="form-group {if $error}has-error{/if}">
+                  <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                  <input type="text" id="{$label_attr.for}" required="required" name="{$name}" value="{$value}" title="{intl l='Variable name'}" placeholder="{intl l='Variable name'}" class="form-control">    
+              </div>
+              {/form_field}
+              
+              {form_field form=$form field='value'}
+              <div class="form-group {if $error}has-error{/if}">
+                  <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                  <input type="text" id="{$label_attr.for}" name="{$name}" value="{$value}" title="{intl l='Variable value'}" placeholder="{intl l='Variable value'}" class="form-control">                    
+              </div>
+              {/form_field}
+              
+              {form_field form=$form field='title'}
+              <div class="form-group {if $error}has-error{/if}">
+                  <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
 
-            <div class="control-group">
+                  {loop type="lang" name="default-lang" default_only="1"}
 
-                <label class="control-label">
-                   {intl l='Name *'}
-                </label>
+                      {* Switch edition to the current locale *}
+                      <input type="hidden" name="edit_language_id" value="{$ID}" />
 
-                <div class="controls">
-	                {form_field form=$form field='name'}
-	                <span {if $error}class="error"{/if}>
-	                   <input type="text" required="required" name="{$name}" value="{$value}" title="{intl l='Variable name'}" placeholder="{intl l='Variable name'}" class="input-block-level">
-	                </span>
-	                {/form_field}
-                </div>
-            </div>
+                      <div class="input-group">
+                        <input type="text" id="{$label_attr.for}" required="required" name="{$name}" value="{$value}" title="{intl l='Variable purpose'}" placeholder="{intl l='Variable purpose'}" class="form-control">
+                        <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.gif"}" alt="{intl l=$TITLE}" /></span>
+                      </div>
 
-            <div class="control-group">
+                      <div class="help-block">{intl l="Enter here the variable purpose in the default language ($TITLE)"}</div>
 
-                <label class="control-label">
-                   {intl l='Value'}
-                </label>
-
-                <div class="controls">
-                    {form_field form=$form field='value'}
-                    <span {if $error}class="error"{/if}>
-                       <input type="text" name="{$name}" value="{$value}" title="{intl l='Variable value'}" placeholder="{intl l='Variable value'}" class="input-block-level">
-                    </span>
-                    {/form_field}
-                </div>
-            </div>
-
-            <div class="control-group">
-                <label class="control-label">
-                   {intl l='Purpose *'}
-                </label>
-
-                <div class="controls">
-                    {loop type="lang" name="default-lang" default_only="1"}
-
-                        {* Switch edition to the current locale *}
-                        <input type="hidden" name="edit_language_id" value="{$ID}" />
-
-                        {form_field form=$form field='locale'}
+                      {form_field form=$form field='locale'}
                         <input type="hidden" name="{$name}" value="{$LOCALE}" />
-                        {/form_field}
+                      {/form_field}
+                  {/loop}
+              </div>
+              {/form_field}
 
-                        <div class="input-group input-block-level">
-                            {form_field form=$form field='title'}
-                            <span {if $error}class="error"{/if}>
-                               <input type="text" required="required" name="{$name}" value="{$value}" title="{intl l='Variable purpose'}" placeholder="{intl l='Variable purpose'}" class="input-block-level">
-                            </span>
-                            {/form_field}
-                            <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.gif"}" alt="{intl l=$TITLE}" /></span>
-                        </div>
+          </div>
+          
+          <div class="modal-footer">
+              <button type="button" class="btn btn-default" data-dismiss="modal" aria-hidden="true"><span class="glyphicon glyphicon-remove"></span> {intl l="Cancel"}</button>
+              <button type="submit" class="btn btn-default btn-primary"><span class="glyphicon glyphicon-check"></span> {intl l="Create this variable"}</button>
+          </div>
 
-                        <div class="help-block">{intl l="Enter here the variable purpose in the default language ($TITLE)"}</div>
-                    {/loop}
-                </div>
-            </div>
-
-        </div>
-
-        <div class="modal-footer">
-            <button type="submit" class="btn btn-default btn-primary">{intl l="Create this variable"}</button>
-            <button type="button" class="btn btn-default" data-dismiss="modal" aria-hidden="true">{intl l="Cancel"}</button>
-        </div>
-
-    </form>
-    {/form}
+      </form>
+      {/form}
+    </div>
+  </div>
 </div>
 
 
 {* Delete confirmation dialog *}
 
-<div class="modal hide fade" id="delete_variable_dialog" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="modal fade" id="delete_variable_dialog" tabindex="-1" role="dialog" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
 
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-        <h3>{intl l="Delete a variable"}</h3>
+      <div class="modal-header">
+          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+          <h3>{intl l="Delete a variable"}</h3>
+      </div>
+
+      <div class="modal-body">
+          <p>{intl l="Do you really want to delete this variable ?"}</p>
+      </div>
+
+      <form method="post" action="{url path='/admin/configuration/variables/delete'}">
+          <input type="hidden" name="variable_id" id="variable_delete_id" value="" />
+
+  	    <div class="modal-footer">
+            <button type="button" class="btn btn-default" data-dismiss="modal" aria-hidden="true"><span class="glyphicon glyphicon-remove"></span> {intl l="No"}</button>
+            <button type="submit" class="btn btn-default btn-primary"><span class="glyphicon glyphicon-check"></span> {intl l="Yes"}</button>
+  	    </div>
+      </form>
     </div>
-
-    <div class="modal-body">
-        <p>{intl l="Do you really want to delete this variable ?"}</p>
-    </div>
-
-    <form method="post" action="{url path='/admin/configuration/variables/delete'}">
-        <input type="hidden" name="variable_id" id="variable_delete_id" value="" />
-
-	    <div class="modal-footer">
-            <button type="submit" class="btn btn-default btn-primary">{intl l="Yes"}</button>
-	        <button type="button" class="btn btn-default" data-dismiss="modal" aria-hidden="true">{intl l="No"}</button>
-	    </div>
-    </form>
+  </div>
 </div>
 {/block}