diff --git a/templates/backOffice/default/folder-edit.html b/templates/backOffice/default/folder-edit.html
index 75e4f47da..c34733cea 100755
--- a/templates/backOffice/default/folder-edit.html
+++ b/templates/backOffice/default/folder-edit.html
@@ -13,28 +13,21 @@
 
         <div class="row">
             {loop name="folder_edit" type="folder" visible="*" id="{$folder_id}" backend_context="1" lang="$edit_language_id"}
+
+            {* Define close url *}
+            {assign var='close_url' value="{url path='/admin/folders' folder_id=$ID}"}
+
             <div class="col-md-12 general-block-decorator">
                 <div class="row">
                     <div class="col-md-7 title">
 						{intl l='Edit folder %title' title=$TITLE}
 		            </div>
 
-	                <div class="col-md-5 actions">
-
-	                    {if $HAS_PREVIOUS != 0}
-			                <a href="{url path="/admin/folders/update/$PREVIOUS"}" class="btn btn-default" title="{intl l='Edit previous folder'}"><span class="glyphicon glyphicon-arrow-left"></span></a>
-                        {else}
-                            <a href="#" disabled="disabled" class="btn btn-default"><span class="glyphicon glyphicon-arrow-left"></span></a>
-		                {/if}
-
-		                <a  href="{$URL}" target="_blank" class="btn btn-default" title="{intl l='Preview folder page'}"><span class="glyphicon glyphicon-eye-open"></span></a>
-
-                        {if $HAS_NEXT != 0}
-                            <a href="{url path="/admin/folders/update/$NEXT"}" class="btn btn-default" title="{intl l='Edit next folder'}"><span class="glyphicon glyphicon-arrow-right"></span></a>
-                        {else}
-                            <a href="#" disabled="disabled" class="btn btn-default"><span class="glyphicon glyphicon-arrow-right"></span></a>
-                         {/if}
-	                </div>
+                    <div class="col-md-5 actions">
+                        <a {if $HAS_PREVIOUS != 0}href="{url path="/admin/folders/update/$PREVIOUS"}"{else}disabled="disabled"{/if} class="btn btn-default" title="{intl l='Edit previous folder'}"><span class="glyphicon glyphicon-arrow-left"></span></a>
+                        <a  href="{$URL}" target="_blank" class="btn btn-default" title="{intl l='Preview folder page'}"><span class="glyphicon glyphicon-eye-open"></span></a>
+                        <a {if $HAS_NEXT != 0}href="{url path="/admin/folders/update/$NEXT"}"{else}disabled="disabled"{/if} class="btn btn-default" title="{intl l='Edit next folder'}"><span class="glyphicon glyphicon-arrow-right"></span></a>
+                    </div>
                 </div>
 
 	            <div class="row">
@@ -58,24 +51,19 @@
 				                    {form name="thelia.admin.folder.modification"}
 				                    <form method="POST" action="{url path='/admin/folders/save'}" {form_enctype form=$form} class="clearfix">
 
-	                                    {include file="includes/inner-form-toolbar.html" close_url="{url path='/admin/folders' folder_id=$folder_id}"}
+	                                    {include file="includes/inner-form-toolbar.html" close_url=$close_url}
 
 			                            {* Be sure to get the folder ID, even if the form could not be validated *}
 			                            <input type="hidden" name="folder_id" value="{$folder_id}" />
-
                                         <input type="hidden" name="current_tab" value="general" />
 
 			                            {form_hidden_fields form=$form}
 
 			                            {form_field form=$form field='success_url'}
-			                                <input type="hidden" name="{$name}" value="{url path="/admin/folders/update{$ID}"}" />
+			                                <input type="hidden" name="{$name}" value="{url path="/admin/folders/update/{$ID}"}" />
 			                            {/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-danger">{$form_error_message}</div>{/if}
+			                            {if $form_error and $form_error_message}{include file='includes/notifications.html' message=$form_error_message}{/if}
 
                                         <div class="row">
                                             <div class="col-md-8">
@@ -102,9 +90,7 @@
 		                                                </select>
 		                                             </div>
 		                                        {/form_field}
-						                    </div>
 
-                                            <div class="col-md-6">
 									            {form_field form=$form field='visible'}
 									                <div class="form-group {if $error}has-error{/if}">
 									                    <label for="{$label_attr.for}" class="control-label">{intl l='Visibility'}</label>
@@ -122,8 +108,7 @@
                                         {include
                                             file="includes/inner-form-toolbar.html"
                                             hide_flags = true
-
-                                            close_url="{url path='/admin/folders' folder_id=$folder_id}"
+                                            close_url=$close_url
                                         }
 
                                         <small>{intl l='Colder created on %date_create. Last modification: %date_change' date_create="{format_date date=$CREATE_DATE}" date_change="{format_date date=$UPDATE_DATE}"}</small>
@@ -136,9 +121,9 @@
                             <div class="tab-pane fade" id="seo">
                                 {form name="thelia.admin.seo"}
                                     {include file="includes/seo-tab.html"
-                                    form = $form
-                                    formAction = "{url path='/admin/folders/seo/save'}"
-                                    closeUrl = "{url path='/admin/folders' folder_id=$folder_id}"
+                                        form = $form
+                                        formAction = "{url path='/admin/folders/seo/save'}"
+                                        closeUrl = $close_url
                                     }
                                 {/form}
                             </div>
@@ -151,7 +136,7 @@
 									        {include
 									            file="includes/inner-form-toolbar.html"
 									            hide_submit_buttons=true
-									            close_url="{url path='/admin/folders' folder_id=$folder_id}"
+									            close_url=$close_url
 									        }
 
 									        <input type="hidden" name="folder_id" value="{$folder_id}" />
@@ -248,11 +233,11 @@
 		                    </div>
 
 		                    <div class="tab-pane fade" id="images">
-                                {include file='includes/image-upload-form.html' imageType='folder' parentId=$folder_id}
+                                {include file='includes/image-upload-form.html' imageType='folder' parentId=$ID}
 		                    </div>
 
 		                    <div class="tab-pane fade" id="documents">
-                                {include file='includes/document-upload-form.html' documentType='folder' parentId=$folder_id}
+                                {include file='includes/document-upload-form.html' documentType='folder' parentId=$ID}
 		                    </div>
 
 		                    <div class="tab-pane fade" id="modules">