diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc
index 237500bf7a..c7ac3823c1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc
@@ -209,12 +209,12 @@
 [% END %]
 
 [% BLOCK items_table_batchmod %]
-
+<div class="page-section">
     [% IF display_columns_selection %][%# Needs js/pages/batchMod.js %]
         [% IF checkboxes_edit OR checkboxes_delete %]
-            <div id="toolbar">
+            <fieldset class="action">
                 <a id="selectallbutton" href="#"><i class="fa fa-check"></i> Select all</a> | <a id="clearallbutton" href="#"><i class="fa fa-remove"></i> Clear all</a> | <a id="clearonloanbutton" href="#">Clear on loan</a>
-            </div>
+            </fieldset>
         [% END %]
 
         <div id="cataloguing_additem_itemlist">
@@ -339,5 +339,5 @@
             [% END # /FOREACH items %]
         </tbody>
     </table> <!-- /#itemst -->
-
+</div>
 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt
index d1c789e3ab..e1dbacec60 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt
@@ -75,7 +75,6 @@
           </div>
         [% END %]
 
-
         [% IF ( barcode_not_unique ) %]
             <div class="dialog alert">
                 <strong>Error saving item</strong>: Barcode must be unique.
@@ -90,19 +89,19 @@
         [% IF ( notfoundbarcodes.size ) %]
             <div class="dialog alert">
                 <p>Warning, the following barcodes were not found:</p>
+                <br/>
+                <table style="margin:auto;">
+                    <thead>
+                        <tr><th>Barcodes not found</th></tr>
+                    </thead>
+                    <tbody>
+                        [% FOREACH notfoundbarcode IN notfoundbarcodes %]
+                            <tr><td>[% notfoundbarcode |html %]</td></td>
+                        [% END %]
+                    </tbody>
+                </table>
             </div>
 
-            <table style="margin:auto;">
-                <thead>
-                    <tr><th>Barcodes not found</th></tr>
-                </thead>
-                <tbody>
-                    [% FOREACH notfoundbarcode IN notfoundbarcodes %]
-                        <tr><td>[% notfoundbarcode |html %]</td></td>
-                    [% END %]
-                </tbody>
-            </table>
-
             [% IF ( item_loop ) %]
                 [% UNLESS ( too_many_items_display ) %]
                     <h4>The following barcodes were found: </h4>
@@ -113,18 +112,18 @@
         [% IF ( notfounditemnumbers.size ) %]
             <div class="dialog alert">
                 <p>Warning, the following itemnumbers were not found:</p>
+                <br/>
+                <table style="margin:auto;">
+                    <thead>
+                        <tr><th>Itemnumbers not found</th></tr>
+                    </thead>
+                    <tbody>
+                        [% FOREACH notfounditemnumber IN notfounditemnumbers %]
+                            <tr><td>[% notfounditemnumber |html %]</td></td>
+                        [% END %]
+                    </tbody>
+                </table>
             </div>
-
-            <table style="margin:auto;">
-                <thead>
-                    <tr><th>Itemnumbers not found</th></tr>
-                </thead>
-                <tbody>
-                    [% FOREACH notfounditemnumber IN notfounditemnumbers %]
-                        <tr><td>[% notfounditemnumber |html %]</td></td>
-                    [% END %]
-                </tbody>
-            </table>
             [% IF ( item_loop ) %]
                 [% UNLESS ( too_many_items_display ) %]
                     <h4>The following itemnumbers were found: </h4>