diff --git a/templates/admin/default/currency-edit.html b/templates/admin/default/currency-edit.html
index 0724cbe72..9add46f0a 100644
--- a/templates/admin/default/currency-edit.html
+++ b/templates/admin/default/currency-edit.html
@@ -5,138 +5,121 @@
 {block name="check-permissions"}admin.configuration.currencies.edit{/block}
 
 {block name="main-content"}
-<div class="currencies edit-currency">
+    <div class="currencies edit-currency">
 
-    <div id="wrapper" class="container">
+        <div id="wrapper" class="container">
 
-        {loop name="currency_edit" type="currency" id="$currency_id" backend_context="1" lang="$edit_language_id"}
+            {loop name="currency_edit" type="currency" id="$currency_id" backend_context="1" lang="$edit_language_id"}
 
-        <ul class="breadcrumb">
-			<li><a href="{url path='/admin/home'}">{intl l="Home"}</a></li>
-            <li><a href="{url path='/admin/configuration'}">{intl l="Configuration"}</a></li>
-            <li><a href="{url path='/admin/configuration/currencies'}">{intl l="Currencies"}</a></li>
-            <li>{intl l='Editing currency "%name"' name="{$NAME}"}</li>
-        </ul>
+                <ul class="breadcrumb">
+        			<li><a href="{url path='/admin/home'}">{intl l="Home"}</a></li>
+                    <li><a href="{url path='/admin/configuration'}">{intl l="Configuration"}</a></li>
+                    <li><a href="{url path='/admin/configuration/currencies'}">{intl l="Currencies"}</a></li>
+                    <li>{intl l='Editing currency "%name"' name="{$NAME}"}</li>
+                </ul>
 
-		<div class="row">
-			<div class="col-md-12 general-block-decorator">
-				<div class="row">
+        		<div class="row">
+        			<div class="col-md-12 general-block-decorator">
+        				<div class="row">
 
-					<div class="col-md-12 title title-without-tabs">
-					   {intl l="Edit currency $NAME"}
-					</div>
+        					<div class="col-md-12 title title-without-tabs">
+        					   {intl l="Edit currency $NAME"}
+        					</div>
 
-                    <div class="form-container">
-                         <div class="col-md-12">
-						    {form name="thelia.admin.currency.modification"}
-						    <form method="POST" action="{url path='/admin/configuration/currencies/save'}" {form_enctype form=$form}>
-                                
-                                {* Be sure to get the currency ID, even if the form could not be validated *}
-                                <input type="hidden" name="currency_id" value="{$currency_id}" />
+                            <div class="form-container">
+                                <div class="col-md-12">
+        						    
+        						    {form name="thelia.admin.currency.modification"}
+        						    	<form method="POST" action="{url path='/admin/configuration/currencies/save'}" {form_enctype form=$form} class="clearfix">
+                                        
+        	                                {* Be sure to get the currency ID, even if the form could not be validated *}
+        	                                <input type="hidden" name="currency_id" value="{$currency_id}" />
 
-                                {include file="includes/inner-form-toolbar.html"}
+                                        	{include file="includes/inner-form-toolbar.html"}
 
-						        {form_hidden_fields form=$form}
+        						        	{form_hidden_fields form=$form}
 
-						        {form_field form=$form field='success_url'}
-						        <input type="hidden" name="{$name}" value="{url path='/admin/configuration/currencies'}" />
-						        {/form_field}
+        						        	{form_field form=$form field='success_url'}
+        						        		<input type="hidden" name="{$name}" value="{url path='/admin/configuration/currencies'}" />
+        						        	{/form_field}
 
-		                        {form_field form=$form field='locale'}
-		                        <input type="hidden" name="{$name}" value="{$edit_language_locale}" />
-		                        {/form_field}
+        			                        {form_field form=$form field='locale'}
+        			                        	<input type="hidden" name="{$name}" value="{$edit_language_locale}" />
+        			                        {/form_field}
 
-					            {if $form_error}<div class="alert alert-block alert-error">{$form_error_message}</div>{/if}                                
-                                	
-                                <div class="col-md-6">
+        					            	{if $form_error}<div class="alert alert-block alert-error">{$form_error_message}</div>{/if}                                
+                                        	
+        	                                <div class="col-md-6">
+        										
+        										{form_field form=$form field='name'}
+        								            <div class="form-group {if $error}has-error{/if}">
+        								                <label>{intl l='Name *'}</label>
+        												<input type="text" required="required" name="{$name}" value="{$value|htmlspecialchars}" title="{intl l='Currency name'}" placeholder="{intl l='Currency name'}" class="form-control">							                
+        								            </div>
+        							            {/form_field}
+        										
+        										{form_field form=$form field='code'}
+        		                                    <div class="form-group {if $error}has-error{/if}">
+        		                                        <label>
+                                                            {intl l='ISO 4217 Code *'}    
+                                                            <span class="label-help-block">
+                                                                <a title="{intl l='More information about ISO 4217'}" href="http://fr.wikipedia.org/wiki/ISO_4217" target="_blank">List of ISO 4217 code</a>
+                                                            </span>
+        		                                       	</label>
+                                                        <input type="text" required="required" name="{$name}" value="{$value|htmlspecialchars}" title="{intl l='Currency ISO 4217 Code'}" placeholder="{intl l='Code'}" class="form-control">
+        		                                    </div>
+        		                               	{/form_field}
 
-						            <div class="form-group">
-						                <label class="control-label">
-						                   {intl l='Name *'}
-						                </label>
+        	                                </div>
 
-						                <div class="controls">
-						                    {form_field form=$form field='name'}
-						                    <span {if $error}class="error"{/if}>
-						                       <input type="text" required="required" name="{$name}" value="{$value|htmlspecialchars}" title="{intl l='Currency name'}" placeholder="{intl l='Currency name'}" class="form-control input-medium">
-						                    </span>
-						                    {/form_field}
-						                </div>
-						            </div>
+                                            <div class="col-md-6">
 
-                                    <div class="form-group">
-                                        <label class="control-label">
-                                           {intl l='ISO 4217 Code *'}    
-                                           <span class="label-help-block"><a title="{intl l='More information about ISO 4217'}" href="http://fr.wikipedia.org/wiki/ISO_4217" target="_blank">List of ISO 4217 code</a></span>
-                                       	</label>
+                                                {form_field form=$form field='symbol'}
+            	                                    <div class="form-group {if $error}has-error{/if}">
+            	                                        <label>
+            	                                           {intl l='Symbol *'}
+            	                                           <span class="label-help-block">The symbol, sur as $, £, &euro;...</span>
+            	                                        </label>
+                                                        <input type="text" required="required" name="{$name}" value="{$value|htmlspecialchars}" title="{intl l='Currency symbol'}" placeholder="{intl l='Symbol'}" class="form-control">
+            	                                    </div>
+                                                {/form_field}
+                                                
+                                                {form_field form=$form field='rate'}
+            	                                    <div class="form-group {if $error}has-error{/if}">
+            	                                        <label>
+            	                                           {intl l='Rate from &euro; *'}
+            	                                           <span class="label-help-block">The rate from Euro</span>
+            	                                        </label>
+                                                        <input type="text" required="required" name="{$name}" value="{$value|htmlspecialchars}" title="{intl l='Rate from Euro'}" placeholder="{intl l='Rate'}" class="form-control">
+                                                        <span class="help-block">Price in Euro x rate = Price in this currency</span>        	                                        
+            	                                    </div>
+                                                {/form_field}
+                                               
+                                            </div>
+                                        
+                                        </form>
+        							{/form}
 
-                                        <div class="controls">
-                                            {form_field form=$form field='code'}
-                                            <span {if $error}class="error"{/if}>
-                                               <input type="text" required="required" name="{$name}" value="{$value|htmlspecialchars}" title="{intl l='Currency ISO 4217 Code'}" placeholder="{intl l='Code'}" class="form-control input-mini">
-                                            </span>                                            
-                                            {/form_field}
-                                        </div>
-                                    </div>
-                                </div>
+        						</div>
+        					</div>
 
-                                <div class="col-md-6">
-	                                    <div class="form-group">
-	                                        <label class="control-label">
-	                                           {intl l='Symbol *'}
-	                                           <span class="label-help-block">The symbol, sur as $, £, &euro;...</span>
-	                                        </label>
+        				</div>
+        			</div>
 
-	                                        <div class="controls">
-	                                            {form_field form=$form field='symbol'}
-	                                            <span {if $error}class="error"{/if}>
-	                                               <input type="text" required="required" name="{$name}" value="{$value|htmlspecialchars}" title="{intl l='Currency symbol'}" placeholder="{intl l='Symbol'}" class="form-control input-mini">
-	                                            </span>
-	                                            {/form_field}
-	                                        </div>
-	                                    </div>
+        		</div>
 
-	                                    <div class="form-group">
-	                                        <label class="control-label">
-	                                           {intl l='Rate from &euro; *'}
-	                                           <span class="label-help-block">The rate from Euro</span>
-	                                        </label>
+    		{/loop}
 
-	                                        <div class="controls">
-	                                            {form_field form=$form field='rate'}
-	                                            <span {if $error}class="error"{/if}>
-	                                               <input type="text" required="required" name="{$name}" value="{$value|htmlspecialchars}" title="{intl l='Rate from Euro'}" placeholder="{intl l='Rate'}" class="form-control input-mini">
-	                                            </span>
-	                                            {/form_field}
-                                               	<span class="help-block">Price in Euro x rate = Price in this currency</span>
-	                                        </div>
-	                                    </div>
-                                   
-                                </div>
-
-	                            
-                                
-							</form>
-							{/form}
-						</div>
-					</div>
-				</div>
-			</div>
-
-		</div>
-
-		{/loop}
-
-        {elseloop rel="currency_edit"}
-        <div class="row">
-            <div class="col-md-12">
-                <div class="alert alert-error">
-                    {intl l="Sorry, currency ID=$currency_id was not found."}
+            {elseloop rel="currency_edit"}
+                <div class="row">
+                    <div class="col-md-12">
+                        <div class="alert alert-error">
+                            {intl l="Sorry, currency ID=$currency_id was not found."}
+                        </div>
+                    </div>
                 </div>
-            </div>
-        </div>
-        {/elseloop}
+            {/elseloop}
 
+        </div>
     </div>
-</div>
 {/block}
\ No newline at end of file