diff --git a/admin/batch_manager_unit.php b/admin/batch_manager_unit.php
index a63e5ea03..85ae1d60e 100644
--- a/admin/batch_manager_unit.php
+++ b/admin/batch_manager_unit.php
@@ -139,8 +139,10 @@ $template->set_filenames(
 
 $base_url = PHPWG_ROOT_PATH.'admin.php';
 
+
 $template->assign(
   array(
+    
     'U_ELEMENTS_PAGE' => $base_url.get_query_string_diff(array('display','start')),
     'level_options' => get_privacy_level_options(),
     'ADMIN_PAGE_TITLE' => l10n('Batch Manager'),
@@ -271,6 +273,8 @@ $template->assign(
 // how many items to display on this page
 if (!empty($_GET['display']))
 {
+  // conf_update_param('batch_manager_images_per_page_unit' , intval($_GET['display']));
+  // $page['nb_images'] = $conf['batch_manager_images_per_page_unit'];
   $page['nb_images'] = intval($_GET['display']);
 }
 elseif (in_array($conf['batch_manager_images_per_page_unit'], array(5, 10, 50)))
@@ -281,7 +285,7 @@ else
 {
   $page['nb_images'] = 5;
 }
-
+$template->assign('per_page', $conf['batch_manager_images_per_page_unit']);
 
 
 if (count($page['cat_elements_id']) > 0)
@@ -466,6 +470,7 @@ SELECT
     $admin_url_start = $admin_photo_base_url.'-properties';
     $admin_url_start.= isset($row['cat_id']) ? '&cat_id='.$row['cat_id'] : '';
     $selected_level = isset($row['level']) ? $row['level'] : $row['level'];
+    
 
     $template->append(
       'elements', array_merge($row,
diff --git a/admin/themes/default/js/batchManagerUnit.js b/admin/themes/default/js/batchManagerUnit.js
index 8ca7697b8..0f103dff7 100644
--- a/admin/themes/default/js/batchManagerUnit.js
+++ b/admin/themes/default/js/batchManagerUnit.js
@@ -15,7 +15,7 @@ $(document).ready(function () {
       }
   });
 
-  $('.related-categories-container .remove-item').on('click', function() {
+  $('.related-categories-container .remove-item, .datepickerDelete').on('click', function() {
     user_interacted = true;
     var pictureId = $(this).parents("fieldset").data("image_id");
     showUnsavedLocalBadge(pictureId);
diff --git a/admin/themes/default/template/batch_manager_unit.tpl b/admin/themes/default/template/batch_manager_unit.tpl
index 8c902545f..8247b7031 100644
--- a/admin/themes/default/template/batch_manager_unit.tpl
+++ b/admin/themes/default/template/batch_manager_unit.tpl
@@ -113,7 +113,7 @@ const strs_privacy = {
 
 <div class="deleted-element" data-image_id="{$element.ID}" style="display: none;"><i class="icon-ok">&#xe819;</i><p>Image #{$element.ID} '{$element.FILE}' was succesfully deleted</p></div>
 <fieldset class="elementEdit" id="picture-{$element.ID}" data-image_id="{$element.ID}">
-  <div class="pictureIdLabel">#{$element.ID}</div>
+  
   <div class="media-box">
     <img src="{$element.TN_SRC}" alt="imagename" class="media-box-embed" style="{if $element.FORMAT}width:100%; max-height:100%;{else}max-width:100%; height:100%;{/if}">
     <div class="media-hover">
@@ -172,7 +172,7 @@ const strs_privacy = {
       <label class="calendar-input">
         <i class="icon-calendar"></i>
         <input type="text" data-datepicker="date_creation-{$element.id}" data-datepicker-unset="date_creation_unset-{$element.id}" readonly>
-        <a href="#" class="icon-cancel-circled unset" id="date_creation_unset-{$element.id}"></a>
+        <a href="#" class="icon-cancel-circled unset datepickerDelete" id="date_creation_unset-{$element.id}"></a>
       </label>
       
       
@@ -240,6 +240,7 @@ const strs_privacy = {
     <div class="local-unsaved-badge badge-container" style="display: none;"><div class="badge-unsaved"><i class="icon-attention">&#xe829;</i>You have unsaved changes</div></div>
     <div class="local-succes-badge badge-container" style="display: none;"><div class="badge-succes"><i class="icon-ok">&#xe819;</i>Changes saved</div></div>
     <div class="local-error-badge badge-container" style="display: none;"><div class="badge-error"><i class="icon-cancel">&#xe822;</i>An error occured</div></div>
+    <div class="pictureIdLabel">#{$element.ID}</div>
     </div>
   </div>
 </fieldset>
@@ -271,12 +272,12 @@ const strs_privacy = {
     </div>
   </div>
   <div class="badge-container global-succes-badge" style="display: none;">
-    <div class="badge-succes"><i class="icon-attention">&#xe829;</i>
+    <div class="badge-succes"><i class="icon-ok">&#xe829;</i>
       Changes saved
     </div>
   </div>
   <div class="badge-container global-error-badge" style="display: none;">
-    <div class="badge-error"><i class="icon-attention">&#xe829;</i>
+    <div class="badge-error"><i class="icon-cancel">&#xe829;</i>
       Error during save
     </div>
   </div>
@@ -347,11 +348,12 @@ const strs_privacy = {
 }
 
 .pictureIdLabel{
-  position: absolute;
-  bottom: 0;
-  right: 0;
-  color:#7A7A7A;
-  font-size: 20px;
+  position: relative;
+  top: 0px;
+  right: 20px;
+  align-items: right;
+  color:#7a7a7a89;
+  font-size: 14px;
   padding: 10px;
 }
 
@@ -437,7 +439,7 @@ const strs_privacy = {
   flex-direction:row;
   flex-wrap:wrap;
   align-content: flex-start;
-  padding: 20px 0px;
+  padding: 20px 10px 20px 0px;
   gap: 10px 0px;
   color:#7A7A7A;
   text-align: left;
diff --git a/admin/themes/default/template/include/batch_manager_filter.inc.tpl b/admin/themes/default/template/include/batch_manager_filter.inc.tpl
index 644ca8a40..91cc04d28 100644
--- a/admin/themes/default/template/include/batch_manager_filter.inc.tpl
+++ b/admin/themes/default/template/include/batch_manager_filter.inc.tpl
@@ -40,10 +40,9 @@ var sliders = {
 {/footer_script}
 
 {combine_script id='batchManagerFilter' load='footer' path='admin/themes/default/js/batchManagerFilter.js'}
-
+<form method="post" action="{$F_ACTION}" class="filter">
 <fieldset>
 <legend><span class='icon-filter icon-green'></span>{'Filter'|@translate}</legend>
-<form method="post" action="{$F_ACTION}" class="filter">
 <div class="filterBlock">
   <ul id="filterList">
     <li id="filter_prefilter" {if !isset($filter.prefilter)}style="display:none"{/if}>
@@ -238,5 +237,5 @@ var sliders = {
     </button>
   </div>
 </div>
-</form>
-</fieldset>
\ No newline at end of file
+</fieldset>
+</form>
\ No newline at end of file