diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
index 61846cf124..dc945d7073 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
@@ -5,7 +5,7 @@
 
 [% IF ( opacfacets ) %]
     [% IF ( facets_loop ) %]
-        <div id="search-facets">
+        <div id="search-facets" class="sidebar_menu">
             <h4>Refine your search</h4>
             <ul>
                 [% IF Koha.Preference("SavedSearchFilters") && search_filters.count > 0 %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/main-container.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/main-container.inc
index 5111914b57..67ac411c55 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/main-container.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/main-container.inc
@@ -5,9 +5,12 @@
         [% IF aside && !asides %]
             [% SET asides = [aside] %]
         [% END %]
-        [% IF asides || aside_block %]
+        [% IF ( asides && asides.size ) || aside_block %]
             <div class="col-md-10 order-sm-1 order-md-2">
                 <main>
+                    [% IF messages_block %]
+                        [% messages_block | $raw %]
+                    [% END %]
                     [% INCLUDE 'messages.inc' %]
                     [% content | $raw %]
                 </main>
@@ -71,6 +74,9 @@
         [% ELSIF wide_centered %]
             <div class="col-md-10 offset-md-1">
                 <main>
+                    [% IF messages_block %]
+                        [% messages_block | $raw %]
+                    [% END %]
                     [% INCLUDE 'messages.inc' %]
                     [% content | $raw %]
                 </main>
@@ -78,6 +84,9 @@
         [% ELSIF wide_full %]
             <div class="col-lg-8 offset-lg-2 col-xl-12 offset-xl-0">
                 <main>
+                    [% IF messages_block %]
+                        [% messages_block | $raw %]
+                    [% END %]
                     [% INCLUDE 'messages.inc' %]
                     [% content | $raw %]
                 </main>
@@ -85,6 +94,9 @@
         [% ELSE %]
             <div class="col-md-10 offset-md-1 col-lg-8 offset-lg-2">
                 <main>
+                    [% IF messages_block %]
+                        [% messages_block | $raw %]
+                    [% END %]
                     [% INCLUDE 'messages.inc' %]
                     [% content | $raw %]
                 </main>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
index 0a449ccea7..9fc55a4197 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
@@ -32,7 +32,6 @@
 [%- searchtype = searchtype || Koha.Preference('DefaultPatronSearchMethod') -%]
 [% BLOCK patron_search_filters %]
     [% SET has_patron_search_filters_block = 1 %]
-    <aside>
         <form method="get" class="patron_search_form">
             <fieldset class="brief">
                 <h3>Search for patron</h3>
@@ -109,7 +108,6 @@
                 <input type="button" value="Clear" class="btn btn-default clear_search" />
             </fieldset>
         </form>
-    </aside>
 [% END %]
 
 [%# Display the table with: %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
index bb4f97b25f..8fd772b7de 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
@@ -46,12 +46,14 @@
     [% END #/ WRAPPER breadcrumbs %]
 [% END #/ WRAPPER sub-header.inc %]
 
-<div class="main container-fluid">
-    <div class="row">
-        <div class="col-md-10 order-md-2 order-sm-2">
-            <main>
-                [% INCLUDE 'messages.inc' %]
+[% aside = BLOCK %]
+                [% IF ( order_loop ) %]
+                    [% PROCESS acquisitions_filter_form context => "sidebar" %]
+                [% END %]
+                [% INCLUDE 'acquisitions-menu.inc' %]
+[% END %]
 
+[% WRAPPER 'main-container.inc' aside_block=aside %]
                 <h1>Order search</h1>
 
                 [% IF !order_loop && search_done %]
@@ -146,22 +148,7 @@
                         </table>
                     </div>
                 [% END %]
-            </main>
-        </div>
-        <!-- /.col-md-10.order-md-2 -->
-
-        <div class="col-md-2 order-sm-2 order-md-1">
-            <aside>
-                [% IF ( order_loop ) %]
-                    [% PROCESS acquisitions_filter_form context => "sidebar" %]
-                [% END %]
-                [% INCLUDE 'acquisitions-menu.inc' %]
-            </aside>
-        </div>
-        <!-- /.col-md-2.order-md-1 -->
-    </div>
-</div>
-<!-- /.main.container-fluid -->
+[% END %]
 
 [% MACRO jsinclude BLOCK %]
     [% Asset.js("js/acquisitions-menu.js") | $raw %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
index 58476ef984..9abe7d96a3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
@@ -33,12 +33,118 @@
     [% END #/ WRAPPER breadcrumbs %]
 [% END #/ WRAPPER sub-header.inc %]
 
-<div class="main container-fluid">
-    <div class="row">
-        <div class="col-md-10 order-md-2 order-sm-2">
-            <main>
-                [% INCLUDE 'messages.inc' %]
+[% aside = BLOCK %]
+                <form action="" method="get">
+                    <fieldset class="sidebar brief">
+                        <h3>Search filters</h3>
+                        <ol>
+                            <li>
+                                <label for="invoicenumber">Invoice number</label>
+                                <input type="text" id="invoicenumber" name="invoicenumber" value="[% invoicenumber | html %]" class="focus" />
+                            </li>
+                            <li>
+                                <label for="supplier">Vendor:</label>
+                                <select id="supplierid" name="supplierid">
+                                    [% IF ( supplier ) %]
+                                        <option selected="selected" value="[% supplier.id | html %]">[% supplier.name | html %]</option>
+                                    [% END %]
+                                </select>
+                            </li>
+                            <li>
+                                <fieldset class="brief">
+                                    <legend>Shipment date</legend>
+                                    <ol>
+                                        <li>
+                                            <label for="shipmentdatefrom">From:</label>
+                                            <input type="text" id="shipmentdatefrom" name="shipmentdatefrom" size="10" value="[% shipmentdatefrom | html %]" class="flatpickr" data-date_to="shipmentdateto" />
+                                            <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
+                                        </li>
+                                        <li>
+                                            <label for="shipmentdateto">To:</label>
+                                            <input type="text" id="shipmentdateto" name="shipmentdateto" size="10" value="[% shipmentdateto | html %]" class="flatpickr" />
+                                            <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
+                                        </li>
+                                    </ol>
+                                </fieldset>
+                            </li>
+                            <li>
+                                <fieldset class="brief">
+                                    <legend>Billing date</legend>
+                                    <ol>
+                                        <li>
+                                            <label for="billingdatefrom">From:</label>
+                                            <input type="text" id="billingdatefrom" name="billingdatefrom" size="10" value="[% billingdatefrom | html %]" class="flatpickr" data-date_to="billingdateto" />
+                                            <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
+                                        </li>
+                                        <li>
+                                            <label for="billingdateto">To:</label>
+                                            <input type="text" id="billingdateto" name="billingdateto" size="10" value="[% billingdateto | html %]" class="flatpickr" />
+                                            <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
+                                        </li>
+                                    </ol>
+                                </fieldset>
+                            </li>
+                            <li>
+                                <label for="isbneanissn">ISBN / EAN / ISSN:</label>
+                                <input type="text" id="isbneanissn" name="isbneanissn" value="[% isbneanissn | html %]" />
+                            </li>
+                            <li>
+                                <label for="title">Title:</label>
+                                <input type="text" id="title" name="title" value="[% title | html %]" />
+                            </li>
+                            <li>
+                                <label for="author">Author:</label>
+                                <input type="text" id="author" name="author" value="[% author | html %]" />
+                            </li>
+                            <li>
+                                <label for="publisher">Publisher:</label>
+                                <input type="text" id="publisher" name="publisher" value="[% publisher | html %]" />
+                            </li>
+                            <li>
+                                <label for="publicationyear">Publication year:</label>
+                                <input type="text" id="publicationyear" name="publicationyear" value="[% publicationyear | html %]" />
+                            </li>
+                            <li>
+                                <label for="branch">Library:</label>
+                                <select id="branch" name="branch">
+                                    <option value="">All</option>
+                                    [%# FIXME Should not we filter the libraries %]
+                                    [% PROCESS options_for_libraries libraries => Branches.all( selected => branch, unfiltered => 1 ) %]
+                                </select>
+                            </li>
+                            [%# FIXME additional-fields.entry.inc should/could be considered here %]
+                            [% FOR field IN additional_fields_for_invoice %]
+                                <li>
+                                    <label for="additional_field_[% field.id | html %]ID"> [% field.name | html %]: </label>
+                                    [% IF field.authorised_value_category %]
+                                        <select id="additional_field_[% field.id | html %]" name="additional_field_[% field.id | html %]">
+                                            <option value="">All</option>
+                                            [% FOREACH av IN AuthorisedValues.GetAuthValueDropbox(field.authorised_value_category) %]
+                                                [% IF av.authorised_value == additional_field_filters.${field.id} %]
+                                                    <option value="[% av.authorised_value | html %]" selected="selected">[% av.lib | html %]</option>
+                                                [% ELSE %]
+                                                    <option value="[% av.authorised_value | html %]">[% av.lib | html %]</option>
+                                                [% END %]
+                                            [% END %]
+                                        </select>
+                                    [% ELSE %]
+                                        <input id="additional_field_[% field.id | html %]" type="text" value="[% additional_field_filters.${field.id} | html %]" name="additional_field_[% field.id | html %]" />
+                                    [% END %]
+                                </li>
+                            [% END %]
+                        </ol>
+                    </fieldset>
+                    <!-- /.sidebar.brief -->
+                    <fieldset class="action">
+                        <input type="submit" class="btn btn-primary" value="Search" />
+                    </fieldset>
+                    <input type="hidden" name="op" id="op" value="do_search" />
+                </form>
+                [% INCLUDE 'acquisitions-menu.inc' %]
 
+[% END %]
+
+[% WRAPPER 'main-container.inc' aside_block=aside %]
                 <h1>Invoices</h1>
                 [% IF ( do_search ) %]
                     [% IF invoices %]
@@ -360,126 +466,7 @@
                 [% ELSE %]
                     <p>Use the search form on the left to find invoices.</p>
                 [% END %]<!-- do_search -->
-            </main>
-        </div>
-        <!-- /.col-md-10.order-md-2 -->
-
-        <div class="col-md-2 order-sm-2 order-md-1">
-            <aside>
-                <form action="" method="get">
-                    <fieldset class="sidebar brief">
-                        <h3>Search filters</h3>
-                        <ol>
-                            <li>
-                                <label for="invoicenumber">Invoice number</label>
-                                <input type="text" id="invoicenumber" name="invoicenumber" value="[% invoicenumber | html %]" class="focus" />
-                            </li>
-                            <li>
-                                <label for="supplier">Vendor:</label>
-                                <select id="supplierid" name="supplierid">
-                                    [% IF ( supplier ) %]
-                                        <option selected="selected" value="[% supplier.id | html %]">[% supplier.name | html %]</option>
-                                    [% END %]
-                                </select>
-                            </li>
-                            <li>
-                                <fieldset class="brief">
-                                    <legend>Shipment date</legend>
-                                    <ol>
-                                        <li>
-                                            <label for="shipmentdatefrom">From:</label>
-                                            <input type="text" id="shipmentdatefrom" name="shipmentdatefrom" size="10" value="[% shipmentdatefrom | html %]" class="flatpickr" data-date_to="shipmentdateto" />
-                                            <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
-                                        </li>
-                                        <li>
-                                            <label for="shipmentdateto">To:</label>
-                                            <input type="text" id="shipmentdateto" name="shipmentdateto" size="10" value="[% shipmentdateto | html %]" class="flatpickr" />
-                                            <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
-                                        </li>
-                                    </ol>
-                                </fieldset>
-                            </li>
-                            <li>
-                                <fieldset class="brief">
-                                    <legend>Billing date</legend>
-                                    <ol>
-                                        <li>
-                                            <label for="billingdatefrom">From:</label>
-                                            <input type="text" id="billingdatefrom" name="billingdatefrom" size="10" value="[% billingdatefrom | html %]" class="flatpickr" data-date_to="billingdateto" />
-                                            <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
-                                        </li>
-                                        <li>
-                                            <label for="billingdateto">To:</label>
-                                            <input type="text" id="billingdateto" name="billingdateto" size="10" value="[% billingdateto | html %]" class="flatpickr" />
-                                            <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
-                                        </li>
-                                    </ol>
-                                </fieldset>
-                            </li>
-                            <li>
-                                <label for="isbneanissn">ISBN / EAN / ISSN:</label>
-                                <input type="text" id="isbneanissn" name="isbneanissn" value="[% isbneanissn | html %]" />
-                            </li>
-                            <li>
-                                <label for="title">Title:</label>
-                                <input type="text" id="title" name="title" value="[% title | html %]" />
-                            </li>
-                            <li>
-                                <label for="author">Author:</label>
-                                <input type="text" id="author" name="author" value="[% author | html %]" />
-                            </li>
-                            <li>
-                                <label for="publisher">Publisher:</label>
-                                <input type="text" id="publisher" name="publisher" value="[% publisher | html %]" />
-                            </li>
-                            <li>
-                                <label for="publicationyear">Publication year:</label>
-                                <input type="text" id="publicationyear" name="publicationyear" value="[% publicationyear | html %]" />
-                            </li>
-                            <li>
-                                <label for="branch">Library:</label>
-                                <select id="branch" name="branch">
-                                    <option value="">All</option>
-                                    [%# FIXME Should not we filter the libraries %]
-                                    [% PROCESS options_for_libraries libraries => Branches.all( selected => branch, unfiltered => 1 ) %]
-                                </select>
-                            </li>
-                            [%# FIXME additional-fields.entry.inc should/could be considered here %]
-                            [% FOR field IN additional_fields_for_invoice %]
-                                <li>
-                                    <label for="additional_field_[% field.id | html %]ID"> [% field.name | html %]: </label>
-                                    [% IF field.authorised_value_category %]
-                                        <select id="additional_field_[% field.id | html %]" name="additional_field_[% field.id | html %]">
-                                            <option value="">All</option>
-                                            [% FOREACH av IN AuthorisedValues.GetAuthValueDropbox(field.authorised_value_category) %]
-                                                [% IF av.authorised_value == additional_field_filters.${field.id} %]
-                                                    <option value="[% av.authorised_value | html %]" selected="selected">[% av.lib | html %]</option>
-                                                [% ELSE %]
-                                                    <option value="[% av.authorised_value | html %]">[% av.lib | html %]</option>
-                                                [% END %]
-                                            [% END %]
-                                        </select>
-                                    [% ELSE %]
-                                        <input id="additional_field_[% field.id | html %]" type="text" value="[% additional_field_filters.${field.id} | html %]" name="additional_field_[% field.id | html %]" />
-                                    [% END %]
-                                </li>
-                            [% END %]
-                        </ol>
-                    </fieldset>
-                    <!-- /.sidebar.brief -->
-                    <fieldset class="action">
-                        <input type="submit" class="btn btn-primary" value="Search" />
-                    </fieldset>
-                    <input type="hidden" name="op" id="op" value="do_search" />
-                </form>
-                [% INCLUDE 'acquisitions-menu.inc' %]
-            </aside>
-        </div>
-        <!-- /.col-md-2.order-md-1 -->
-    </div>
-    <!-- /.row -->
-</div>
-<!-- /.main.container-fluid -->
+[% END %]
 
 [% MACRO jsinclude BLOCK %]
     [% Asset.js("js/acquisitions-menu.js") | $raw %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
index 0c90b6ea0d..e419852a7d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
@@ -33,12 +33,47 @@
     [% END #/ WRAPPER breadcrumbs %]
 [% END #/ WRAPPER sub-header.inc %]
 
-<div class="main container-fluid">
-    <div class="row">
-        <div class="col-md-10 order-md-2 order-sm-2">
-            <main>
-                [% INCLUDE 'messages.inc' %]
+[% aside = BLOCK %]
+                <form action="lateorders.pl" method="get">
+                    <fieldset class="brief">
+                        <h4>Filter results:</h4>
+                        [% FOREACH ERROR_LOO IN ERROR_LOOP %]
+                            [% IF ( ERROR_LOO.delay_digits ) %]<p class="error">The number of days ([% ERROR_LOO.bad_delay | html %]) must be a number between 0 and 999.</p>[% END %]
+                        [% END %]
+                        <ol>
+                            <li><label for="delay">Order date:</label><input size="3" maxlength="3" id="delay" type="text" name="delay" value="[% delay | html %]" /> days ago</li>
+                            <li
+                                ><label for="from">Estimated delivery date from: </label>
+                                <input type="text" size="10" id="from" name="estimateddeliverydatefrom" value="[% estimateddeliverydatefrom | html %]" class="flatpickr" data-date_to="to" />
+                                <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
+                            </li>
+                            <li
+                                ><label for="to">To: </label>
+                                <input type="text" size="10" id="to" name="estimateddeliverydateto" value="[% estimateddeliverydateto | html %]" class="flatpickr" />
+                                <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
+                            </li>
 
+                            <li
+                                ><label for="booksellerid">Vendor:</label>
+                                <select id="booksellerid" tabindex="" name="booksellerid">
+                                    <option value=""></option>
+                                    [% FOREACH bookseller IN booksellers %]
+                                        [% IF bookseller.id == bookseller_filter.id %]
+                                            <option value="[% bookseller.id | html %]" selected="selected">[% bookseller.name | html %]</option>
+                                        [% ELSE %]
+                                            <option value="[% bookseller.id | html %]">[% bookseller.name | html %]</option>
+                                        [% END %]
+                                    [% END %]
+                                </select>
+                            </li></ol
+                        >
+                    </fieldset>
+                    <fieldset class="action"><input type="submit" class="btn btn-primary" value="Filter" /></fieldset>
+                </form>
+                [% INCLUDE 'acquisitions-menu.inc' %]
+[% END %]
+
+[% WRAPPER 'main-container.inc' aside_block=aside %]
                 <h1>[% IF bookseller_filter %][% bookseller_filter.name | html %] :[% END %]Late orders</h1>
                 <div id="acqui_lateorders" class="page-section">
                     [% IF error_claim %]
@@ -270,55 +305,7 @@
                     [% END %]
                 </div>
                 <!-- /#acqui_lateorders -->
-            </main>
-        </div>
-        <!-- /.col-md-10.order-md-2 -->
-
-        <div class="col-md-2 order-sm-2 order-md-1">
-            <aside>
-                <form action="lateorders.pl" method="get">
-                    <fieldset class="brief">
-                        <h4>Filter results:</h4>
-                        [% FOREACH ERROR_LOO IN ERROR_LOOP %]
-                            [% IF ( ERROR_LOO.delay_digits ) %]<p class="error">The number of days ([% ERROR_LOO.bad_delay | html %]) must be a number between 0 and 999.</p>[% END %]
-                        [% END %]
-                        <ol>
-                            <li><label for="delay">Order date:</label><input size="3" maxlength="3" id="delay" type="text" name="delay" value="[% delay | html %]" /> days ago</li>
-                            <li
-                                ><label for="from">Estimated delivery date from: </label>
-                                <input type="text" size="10" id="from" name="estimateddeliverydatefrom" value="[% estimateddeliverydatefrom | html %]" class="flatpickr" data-date_to="to" />
-                                <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
-                            </li>
-                            <li
-                                ><label for="to">To: </label>
-                                <input type="text" size="10" id="to" name="estimateddeliverydateto" value="[% estimateddeliverydateto | html %]" class="flatpickr" />
-                                <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
-                            </li>
-
-                            <li
-                                ><label for="booksellerid">Vendor:</label>
-                                <select id="booksellerid" tabindex="" name="booksellerid">
-                                    <option value=""></option>
-                                    [% FOREACH bookseller IN booksellers %]
-                                        [% IF bookseller.id == bookseller_filter.id %]
-                                            <option value="[% bookseller.id | html %]" selected="selected">[% bookseller.name | html %]</option>
-                                        [% ELSE %]
-                                            <option value="[% bookseller.id | html %]">[% bookseller.name | html %]</option>
-                                        [% END %]
-                                    [% END %]
-                                </select>
-                            </li></ol
-                        >
-                    </fieldset>
-                    <fieldset class="action"><input type="submit" class="btn btn-primary" value="Filter" /></fieldset>
-                </form>
-                [% INCLUDE 'acquisitions-menu.inc' %]
-            </aside>
-        </div>
-        <!-- /.col-md-2.order-md-1 -->
-    </div>
-</div>
-<!-- /.main.container-fluid -->
+[% END %]
 
 <!-- Modal for editing vendor and internal notes -->
 <div class="modal" id="noteEditor" tabindex="-1" role="dialog" aria-labelledby="noteEditorLabel">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
index 7fabc5cf9f..89ff366379 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
@@ -34,11 +34,60 @@
     [% END #/ WRAPPER breadcrumbs %]
 [% END #/ WRAPPER sub-header.inc %]
 
-<div class="main container-fluid">
-    <div class="row">
-        <div class="col-md-10 order-md-2 order-sm-2">
-            <main>
-                [% INCLUDE 'messages.inc' %]
+[% aside = BLOCK %]
+                <form method="get" action="parcels.pl">
+                    <fieldset class="brief">
+                        <h4>Filter</h4>
+                        <ol>
+                            <li> <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" /></li>
+                            <li><label for="filter">Invoice number:</label><input type="text" size="20" name="filter" value="[% filter | html %]" id="filter" /></li>
+                            <li>
+                                <label for="datefrom">From:</label>
+                                <input type="text" size="9" id="datefrom" name="datefrom" value="[% datefrom | html %]" class="flatpickr" />
+                                <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
+                            </li>
+                            <li>
+                                <label for="dateto">To:</label>
+                                <input type="text" size="9" id="dateto" name="dateto" value="[% dateto | html %]" class="flatpickr" />
+                                <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
+                            </li>
+                            <li
+                                ><label for="orderby">Sort by :</label
+                                ><select name="orderby" id="orderby">
+                                    <option value="invoicenumber">Invoice number</option>
+                                    <option value="shipmentdate">Shipment date</option>
+                                    <option value="shipmentdate desc">Shipment date reverse</option>
+                                    <option value="invoicenumber desc">Invoice number reverse</option> </select
+                                ><br />
+                                <label for="resultsperpage">Results per page :</label
+                                ><select name="resultsperpage" id="resultsperpage">
+                                    <option value="20">20</option>
+                                    <option value="30">30</option>
+                                    <option value="50">50</option>
+                                    <option value="100">100</option>
+                                </select></li
+                            >
+                            <li>
+                                <label for="filter_include_closed">
+                                    [% IF filter_include_closed %]
+                                        <input type="checkbox" id="filter_include_closed" value="1" name="filter_include_closed" checked="checked" title="Include closed invoices in the search" />
+                                    [% ELSE %]
+                                        <input type="checkbox" id="filter_include_closed" value="1" name="filter_include_closed" title="Include closed invoices in the search" />
+                                    [% END %]
+                                    Include closed invoices
+                                </label>
+                            </li>
+                        </ol>
+                    </fieldset>
+                    <fieldset class="action">
+                        <input type="submit" class="btn btn-primary" value="Filter" />
+                        <a class="btn btn-default clear_search" href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid | uri %]">Clear</a>
+                    </fieldset>
+                </form>
+
+[% END %]
+
+[% WRAPPER 'main-container.inc' aside_block=aside %]
                 <h1>Receive shipment from vendor <a href="/cgi-bin/koha/acquisition/vendors/[% booksellerid | uri %]">[% name | html %]</a></h1>
 
                 [% IF closed_invoices %]
@@ -204,68 +253,7 @@
                         <fieldset class="action"><input type="submit" class="btn btn-default" value="Next" /> <a class="cancel" href="/cgi-bin/koha/acquisition/vendors/[% booksellerid | html %]">Cancel</a></fieldset>
                     </form>
                 </div>
-            </main>
-        </div>
-        <!-- /.col-md-10.order-md-2 -->
-
-        <div class="col-md-2 order-sm-2 order-md-1">
-            <aside>
-                <form method="get" action="parcels.pl">
-                    <fieldset class="brief">
-                        <h4>Filter</h4>
-                        <ol>
-                            <li> <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" /></li>
-                            <li><label for="filter">Invoice number:</label><input type="text" size="20" name="filter" value="[% filter | html %]" id="filter" /></li>
-                            <li>
-                                <label for="datefrom">From:</label>
-                                <input type="text" size="9" id="datefrom" name="datefrom" value="[% datefrom | html %]" class="flatpickr" />
-                                <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
-                            </li>
-                            <li>
-                                <label for="dateto">To:</label>
-                                <input type="text" size="9" id="dateto" name="dateto" value="[% dateto | html %]" class="flatpickr" />
-                                <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
-                            </li>
-                            <li
-                                ><label for="orderby">Sort by :</label
-                                ><select name="orderby" id="orderby">
-                                    <option value="invoicenumber">Invoice number</option>
-                                    <option value="shipmentdate">Shipment date</option>
-                                    <option value="shipmentdate desc">Shipment date reverse</option>
-                                    <option value="invoicenumber desc">Invoice number reverse</option> </select
-                                ><br />
-                                <label for="resultsperpage">Results per page :</label
-                                ><select name="resultsperpage" id="resultsperpage">
-                                    <option value="20">20</option>
-                                    <option value="30">30</option>
-                                    <option value="50">50</option>
-                                    <option value="100">100</option>
-                                </select></li
-                            >
-                            <li>
-                                <label for="filter_include_closed">
-                                    [% IF filter_include_closed %]
-                                        <input type="checkbox" id="filter_include_closed" value="1" name="filter_include_closed" checked="checked" title="Include closed invoices in the search" />
-                                    [% ELSE %]
-                                        <input type="checkbox" id="filter_include_closed" value="1" name="filter_include_closed" title="Include closed invoices in the search" />
-                                    [% END %]
-                                    Include closed invoices
-                                </label>
-                            </li>
-                        </ol>
-                    </fieldset>
-                    <fieldset class="action">
-                        <input type="submit" class="btn btn-primary" value="Filter" />
-                        <a class="btn btn-default clear_search" href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid | uri %]">Clear</a>
-                    </fieldset>
-                </form>
-            </aside>
-        </div>
-        <!-- /.col-md-2.order-md-1 -->
-    </div>
-    <!-- /.row -->
-</div>
-<!-- /.main.container-fluid -->
+[% END %]
 
 [% MACRO jsinclude BLOCK %]
     [% Asset.js("js/acquisitions-menu.js") | $raw %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
index be89582daf..663ee67438 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
@@ -114,12 +114,59 @@
     [% END #/ WRAPPER breadcrumbs %]
 [% END #/ WRAPPER sub-header.inc %]
 
-<div class="main container-fluid">
-    <div class="row">
-        <div class="col-md-10 order-md-2 order-sm-1">
-            <main>
-                [% INCLUDE 'messages.inc' %]
+[% aside = BLOCK %]
+                [% IF op == 'list' %]
+                    <form action="/cgi-bin/koha/admin/aqbudgets.pl" method="get">
+                        <fieldset class="brief" id="fundfilters">
+                            <h4>Fund filters</h4>
+                            <ol>
+                                <li>
+                                    <label for="filter_budgetbranch2">Library: </label>
+                                    <select name="filter_budgetbranch" id="filter_budgetbranch2">
+                                        <option value=""></option>
+                                        [% PROCESS options_for_libraries libraries => Branches.all( selected => selected_branchcode, unfiltered => 1 ) %]
+                                    </select>
+                                </li>
 
+                                [% IF periods %]
+                                    <li>
+                                        <label for="periods">Budget:</label>
+                                        <select id="periods" name="budget_period_id">
+                                            <option value="">All budgets</option>
+                                            [% FOR period IN periods %]
+                                                [% IF budget_period_id && period.budget_period_id == budget_period_id %]
+                                                    <option value="[% period.budget_period_id | html %]" selected="selected">[% period.budget_period_description | html %]</option>
+                                                [% ELSE %]
+                                                    <option value="[% period.budget_period_id | html %]">[% period.budget_period_description | html %]</option>
+                                                [% END %]
+                                            [% END %]
+                                        </select>
+                                    </li>
+                                [% END %]
+                                <li class="radio">
+                                    <label for="show_mine">
+                                        [% IF ( show_mine ) %]
+                                            <input type="checkbox" id="show_mine" name="show_mine" value="1" checked="checked" />
+                                        [% ELSE %]
+                                            <input type="checkbox" id="show_mine" name="show_mine" value="1" />
+                                        [% END %]
+                                        Show my funds only
+                                    </label>
+                                </li>
+                            </ol>
+                        </fieldset>
+                        <fieldset class="action">
+                            <input type="hidden" name="op" value="list" />
+                            <input type="submit" class="btn btn-primary" name="filter" value="Go" />
+                        </fieldset>
+                    </form>
+                [% END %]
+
+                [% INCLUDE 'acquisitions-menu.inc' %]
+
+[% END %]
+
+[% WRAPPER 'main-container.inc' aside_block=aside %]
                 [% UNLESS op == 'delete_confirm' %][% INCLUDE 'budgets-admin-toolbar.inc' %][% END %]
 
                 [% IF (error_not_authorised_to_modify) %]
@@ -515,67 +562,7 @@
                         </form>
                     </div>
                 [% END %]
-            </main>
-        </div>
-        <!-- /.col-md-10.order-md-2 -->
-
-        <div class="col-md-2 order-sm-2 order-md-1">
-            <aside>
-                [% IF op == 'list' %]
-                    <form action="/cgi-bin/koha/admin/aqbudgets.pl" method="get">
-                        <fieldset class="brief" id="fundfilters">
-                            <h4>Fund filters</h4>
-                            <ol>
-                                <li>
-                                    <label for="filter_budgetbranch2">Library: </label>
-                                    <select name="filter_budgetbranch" id="filter_budgetbranch2">
-                                        <option value=""></option>
-                                        [% PROCESS options_for_libraries libraries => Branches.all( selected => selected_branchcode, unfiltered => 1 ) %]
-                                    </select>
-                                </li>
-
-                                [% IF periods %]
-                                    <li>
-                                        <label for="periods">Budget:</label>
-                                        <select id="periods" name="budget_period_id">
-                                            <option value="">All budgets</option>
-                                            [% FOR period IN periods %]
-                                                [% IF budget_period_id && period.budget_period_id == budget_period_id %]
-                                                    <option value="[% period.budget_period_id | html %]" selected="selected">[% period.budget_period_description | html %]</option>
-                                                [% ELSE %]
-                                                    <option value="[% period.budget_period_id | html %]">[% period.budget_period_description | html %]</option>
-                                                [% END %]
-                                            [% END %]
-                                        </select>
-                                    </li>
-                                [% END %]
-                                <li class="radio">
-                                    <label for="show_mine">
-                                        [% IF ( show_mine ) %]
-                                            <input type="checkbox" id="show_mine" name="show_mine" value="1" checked="checked" />
-                                        [% ELSE %]
-                                            <input type="checkbox" id="show_mine" name="show_mine" value="1" />
-                                        [% END %]
-                                        Show my funds only
-                                    </label>
-                                </li>
-                            </ol>
-                        </fieldset>
-                        <fieldset class="action">
-                            <input type="hidden" name="op" value="list" />
-                            <input type="submit" class="btn btn-primary" name="filter" value="Go" />
-                        </fieldset>
-                    </form>
-                [% END %]
-
-                [% INCLUDE 'acquisitions-menu.inc' %]
-            </aside>
-        </div>
-        <!-- /.col-md-2.order-md-1 -->
-    </div>
-    <!-- /.row -->
-</div>
-<!-- /.main.container-fluid -->
+[% END %]
 
 [% MACRO jsinclude BLOCK %]
     [% Asset.js("js/acq.js") | $raw %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt
index 0ec609d547..2452a8deae 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt
@@ -53,12 +53,105 @@
     [% END #/ WRAPPER breadcrumbs %]
 [% END #/ WRAPPER sub-header.inc %]
 
-<div class="main container-fluid">
-    <div class="row">
-        <div class="col-md-10 order-md-2 order-sm-1">
-            <main>
-                [% INCLUDE 'messages.inc' %]
+[% aside = BLOCK %]
+                <form method="get" action="/cgi-bin/koha/admin/aqplan.pl">
+                    <input type="hidden" name="budget_period_id" value="[% budget_period_id | html %]" />
+                    <fieldset class="brief">
+                        <h4>Filter</h4>
+                        [% BLOCK planning_types %]
+                            [% SWITCH type %]
+                            [% CASE 'MONTHS' %]
+                                [% tp("Budget planning", "by months") | html %]
+                            [% CASE 'ITEMTYPES' %]
+                                [% tp("Budget planning", "by item types") | html %]
+                            [% CASE 'BRANCHES' %]
+                                [% tp("Budget planning", "by libraries") | html %]
+                            [% CASE %]
+                                [% tpx("Budget planning", "by {type}", {type = type}) | html %]
+                            [% END %]
+                        [% END %]
+                        <ol>
+                            <li>
+                                <label for="authcat"> Select planning type:</label>
+                                <select name="authcat" id="authcat">
+                                    [% FOREACH value IN authcat_dropbox.values %]
+                                        [% IF ( value == authcat_dropbox.default ) %]
+                                            <option value="[% value | html %]" selected="selected">[% PROCESS planning_types type=value %]</option>
+                                        [% ELSE %]
+                                            <option value="[% value | html %]">[% PROCESS planning_types type=value %]</option>
+                                        [% END %]
+                                    [% END %]
+                                </select>
+                            </li>
+                            <li class="radio">
+                                [% IF ( show_mine ) %]
+                                    <input type="checkbox" id="show_mine" name="show_mine" value="1" checked="checked" />
+                                [% ELSE %]
+                                    <input type="checkbox" id="show_mine" name="show_mine" value="1" />
+                                [% END %]
+                                <label for="show_mine">Show my funds only</label>
+                            </li>
 
+                            <li class="radio">
+                                [% IF ( show_active ) %]
+                                    <input type="checkbox" id="show_active" name="show_active" value="1" checked="checked" />
+                                [% ELSE %]
+                                    <input type="checkbox" id="show_active" name="show_active" value="1" />
+                                [% END %]
+                                <label for="show_active">Show active funds only</label>
+                            </li>
+
+                            <li class="radio">
+                                [% IF ( show_actual ) %]
+                                    <input type="checkbox" id="show_actual" name="show_actual" value="1" checked="checked" />
+                                [% ELSE %]
+                                    <input type="checkbox" id="show_actual" name="show_actual" value="1" />
+                                [% END %]
+                                <label for="show_actual">Show actual/estimated values</label>
+                            </li>
+                        </ol>
+                    </fieldset>
+                    <fieldset class="action">
+                        <input type="submit" name="option_submit" class="btn btn-primary" value="Submit" />
+                    </fieldset>
+                </form>
+                [% IF ( budget_lines ) %]
+                    <form method="get" action="/cgi-bin/koha/admin/aqplan.pl">
+                        <fieldset class="brief">
+                            <h4>Export</h4>
+                            <ol>
+                                <li><label for="basename">Output to a file named: </label><input type="text" name="basename" id="basename" value="Export" /></li>
+                                <li
+                                    ><label class="inline" for="MIME">Into an application</label>
+                                    <select name="MIME" id="MIME">
+                                        [% FOREACH value IN CGIextChoice %]
+                                            <option value="[% value | html %]">[% value | html %]</option>
+                                        [% END %]
+                                    </select>
+                                    <select name="sep" id="sep">
+                                        [% FOREACH value IN CGIsepChoice %]
+                                            <option value="[% value | html %]">[% value | html %]</option>
+                                        [% END %]
+                                    </select>
+                                </li>
+                            </ol>
+                            <input type="hidden" name="budget_period_id" value="[% budget_period_id | html %]" />
+                            <input type="hidden" name="authcat" value="[% authcat | html %]" />
+                        </fieldset>
+                        <fieldset class="action">
+                            <input type="submit" class="btn btn-primary" value="Submit" />
+                            <input type="hidden" name="budget_period_id" value="[% budget_period_id | html %]" />
+                            <input type="hidden" name="report_name" value="[% report_name | html %]" />
+                            <input type="hidden" name="output" value="file"
+                        /></fieldset>
+                    </form>
+                [% END %]
+
+                [% INCLUDE 'acquisitions-menu.inc' %]
+
+[% END %]
+
+[% WRAPPER 'main-container.inc' aside_block=aside %]
                 [% INCLUDE 'budgets-admin-toolbar.inc' %]
 
                 <form method="post" id="Aform" name="Aform" action="/cgi-bin/koha/admin/aqplan.pl">
@@ -210,113 +303,7 @@
                     </div>
                     <!-- /.page-section -->
                 </form>
-            </main>
-        </div>
-        <!-- /.col-md-10.order-md-2 -->
-
-        <div class="col-md-2 order-sm-2 order-md-1">
-            <aside>
-                <form method="get" action="/cgi-bin/koha/admin/aqplan.pl">
-                    <input type="hidden" name="budget_period_id" value="[% budget_period_id | html %]" />
-                    <fieldset class="brief">
-                        <h4>Filter</h4>
-                        [% BLOCK planning_types %]
-                            [% SWITCH type %]
-                            [% CASE 'MONTHS' %]
-                                [% tp("Budget planning", "by months") | html %]
-                            [% CASE 'ITEMTYPES' %]
-                                [% tp("Budget planning", "by item types") | html %]
-                            [% CASE 'BRANCHES' %]
-                                [% tp("Budget planning", "by libraries") | html %]
-                            [% CASE %]
-                                [% tpx("Budget planning", "by {type}", {type = type}) | html %]
-                            [% END %]
-                        [% END %]
-                        <ol>
-                            <li>
-                                <label for="authcat"> Select planning type:</label>
-                                <select name="authcat" id="authcat">
-                                    [% FOREACH value IN authcat_dropbox.values %]
-                                        [% IF ( value == authcat_dropbox.default ) %]
-                                            <option value="[% value | html %]" selected="selected">[% PROCESS planning_types type=value %]</option>
-                                        [% ELSE %]
-                                            <option value="[% value | html %]">[% PROCESS planning_types type=value %]</option>
-                                        [% END %]
-                                    [% END %]
-                                </select>
-                            </li>
-                            <li class="radio">
-                                [% IF ( show_mine ) %]
-                                    <input type="checkbox" id="show_mine" name="show_mine" value="1" checked="checked" />
-                                [% ELSE %]
-                                    <input type="checkbox" id="show_mine" name="show_mine" value="1" />
-                                [% END %]
-                                <label for="show_mine">Show my funds only</label>
-                            </li>
-
-                            <li class="radio">
-                                [% IF ( show_active ) %]
-                                    <input type="checkbox" id="show_active" name="show_active" value="1" checked="checked" />
-                                [% ELSE %]
-                                    <input type="checkbox" id="show_active" name="show_active" value="1" />
-                                [% END %]
-                                <label for="show_active">Show active funds only</label>
-                            </li>
-
-                            <li class="radio">
-                                [% IF ( show_actual ) %]
-                                    <input type="checkbox" id="show_actual" name="show_actual" value="1" checked="checked" />
-                                [% ELSE %]
-                                    <input type="checkbox" id="show_actual" name="show_actual" value="1" />
-                                [% END %]
-                                <label for="show_actual">Show actual/estimated values</label>
-                            </li>
-                        </ol>
-                    </fieldset>
-                    <fieldset class="action">
-                        <input type="submit" name="option_submit" class="btn btn-primary" value="Submit" />
-                    </fieldset>
-                </form>
-                [% IF ( budget_lines ) %]
-                    <form method="get" action="/cgi-bin/koha/admin/aqplan.pl">
-                        <fieldset class="brief">
-                            <h4>Export</h4>
-                            <ol>
-                                <li><label for="basename">Output to a file named: </label><input type="text" name="basename" id="basename" value="Export" /></li>
-                                <li
-                                    ><label class="inline" for="MIME">Into an application</label>
-                                    <select name="MIME" id="MIME">
-                                        [% FOREACH value IN CGIextChoice %]
-                                            <option value="[% value | html %]">[% value | html %]</option>
-                                        [% END %]
-                                    </select>
-                                    <select name="sep" id="sep">
-                                        [% FOREACH value IN CGIsepChoice %]
-                                            <option value="[% value | html %]">[% value | html %]</option>
-                                        [% END %]
-                                    </select>
-                                </li>
-                            </ol>
-                            <input type="hidden" name="budget_period_id" value="[% budget_period_id | html %]" />
-                            <input type="hidden" name="authcat" value="[% authcat | html %]" />
-                        </fieldset>
-                        <fieldset class="action">
-                            <input type="submit" class="btn btn-primary" value="Submit" />
-                            <input type="hidden" name="budget_period_id" value="[% budget_period_id | html %]" />
-                            <input type="hidden" name="report_name" value="[% report_name | html %]" />
-                            <input type="hidden" name="output" value="file"
-                        /></fieldset>
-                    </form>
-                [% END %]
-
-                [% INCLUDE 'acquisitions-menu.inc' %]
-            </aside>
-        </div>
-        <!-- /.col-md-2.order-md-1 -->
-    </div>
-    <!-- /.row -->
-</div>
-<!-- /.main.container-fluid -->
+[% END %]
 
 [% MACRO jsinclude BLOCK %]
     [% Asset.js("js/acq.js") | $raw %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/float_limits.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/float_limits.tt
index 34f6af907b..749afed819 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/float_limits.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/float_limits.tt
@@ -36,10 +36,7 @@
     [% END #/ WRAPPER breadcrumbs %]
 [% END #/ WRAPPER sub-header.inc %]
 
-<div class="main container-fluid">
-    <div class="row">
-        <div class="col-sm-10 order-sm-1 col-sm-push-2">
-            <main>
+[% WRAPPER 'main-container.inc' aside='admin-menu' %]
                 <h1 class="parameters"> Library float limits </h1>
 
                 [% UNLESS Koha.Preference('UseLibraryFloatLimits') %]
@@ -95,16 +92,7 @@
 
                     <fieldset class="action"> <input type="submit" class="btn btn-primary" value="Save" /> <a href="/cgi-bin/koha/admin/float_limits.pl" class="cancel">Cancel</a> </fieldset>
                 </form>
-            </main>
-        </div>
-        <!-- /.col-sm-10.col-sm-push-2 -->
-
-        <div class="col-sm-2 col-sm-pull-10">
-            <aside> [% INCLUDE 'admin-menu.inc' %] </aside>
-        </div>
-        <!-- /.col-sm-2.col-sm-pull-10 -->
-    </div>
-    <!-- /.row -->
+[% END %]
 
     [% MACRO jsinclude BLOCK %]
         [% Asset.js("js/admin-menu.js") | $raw %]
@@ -122,5 +110,4 @@
         </script>
     [% END %]
 
-    [% INCLUDE 'intranet-bottom.inc' %]</div
->
+    [% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping.tt
index d6558b6ac6..60c244b0b3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping.tt
@@ -14,9 +14,7 @@
 
 <body id="admin_sru_modmapping" class="admin">
 
-<div class="main container-fluid">
-    <main>
-        [% INCLUDE 'messages.inc' %]
+[% WRAPPER 'main-container.inc' %]
         <h1>SRU search field mapping for bibliographic records</h1>
 
         <form id="form01" method="get">
@@ -82,9 +80,7 @@
                 </div>
             </nav>
         </form>
-    </main>
-</div>
-<!-- /.main.container-fluid -->
+[% END %]
 
 [% MACRO jsinclude BLOCK %]
     [% Asset.js("js/admin-menu.js") | $raw %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping_auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping_auth.tt
index eba77b6b06..7e2ca1d3c3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping_auth.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping_auth.tt
@@ -12,9 +12,7 @@
 
 <body id="admin_sru_modmapping" class="admin">
 
-<div class="main container-fluid">
-    <main>
-        [% INCLUDE 'messages.inc' %]
+[% WRAPPER 'main-container.inc' %]
         <h1>SRU search field mapping for authorities</h1>
         <form id="form01" method="get">
             <fieldset class="rows">
@@ -82,9 +80,7 @@
                 </div>
             </nav>
         </form>
-    </main>
-</div>
-<!-- /.main.container-fluid -->
+[% END %]
 
 [% MACRO jsinclude BLOCK %]
     <script nonce="[% Koha.CSPNonce | $raw %]">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt
index ca01b7158f..88ca43598f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt
@@ -38,12 +38,31 @@
     [% END #/ WRAPPER breadcrumbs %]
 [% END #/ WRAPPER sub-header.inc %]
 
-<div class="main container-fluid">
-    <div class="row">
-        <div class="col-md-10 order-md-2 order-sm-1">
-            <main>
-                [% INCLUDE 'messages.inc' %]
+[% aside = BLOCK %]
+                <h3>Z39.50/SRU search</h3>
+                <form method="get" id="quicksearch">
+                    <fieldset class="brief">
+                        <ol>
+                            <li><label for="search-by-keywords">Keywords:</label></li>
+                            <li><input class="search-box" data-qualifier="term" id="search-by-keywords" placeholder="(Ctrl-Alt-K)" /></li>
+                            <li><label for="search-by-author">Author:</label></li>
+                            <li><input class="search-box" data-qualifier="author" id="search-by-author" placeholder="(Ctrl-Alt-A)" /></li>
+                            <li><label for="search-by-isbn">ISBN:</label></li>
+                            <li><input class="search-box" data-qualifier="isbn" id="search-by-isbn" placeholder="(Ctrl-Alt-I)" /></li>
+                            <li><label for="search-by-title">Title:</label></li>
+                            <li><input class="search-box" data-qualifier="title" id="search-by-title" placeholder="(Ctrl-Alt-T)" /></li>
+                            <li><a href="#" id="show-advanced-search" title="Show advanced Z39.50/SRU search (Ctrl-Alt-S)">Advanced &raquo;</a></li>
+                        </ol>
+                    </fieldset>
+                </form>
+                <h3>Clipboard</h3>
+                <fieldset class="brief">
+                    <select id="clipboard" name="clipboard" size="10"> </select>
+                </fieldset>
 
+[% END %]
+
+[% WRAPPER 'main-container.inc' aside_block=aside %]
                 [% IF Koha.Preference('EnableAdvancedCatalogingEditor') %]
                     <div id="toggle-editor">
                         <label for="toggle-editor">Advanced editor: </label>
@@ -115,38 +134,7 @@
                         <div id="status-subfield-info"> </div>
                     </div>
                 </div>
-            </main>
-        </div>
-        <!-- /.col-md-10.order-md-2 -->
-
-        <div class="col-md-2 order-sm-2 order-md-1">
-            <aside>
-                <h3>Z39.50/SRU search</h3>
-                <form method="get" id="quicksearch">
-                    <fieldset class="brief">
-                        <ol>
-                            <li><label for="search-by-keywords">Keywords:</label></li>
-                            <li><input class="search-box" data-qualifier="term" id="search-by-keywords" placeholder="(Ctrl-Alt-K)" /></li>
-                            <li><label for="search-by-author">Author:</label></li>
-                            <li><input class="search-box" data-qualifier="author" id="search-by-author" placeholder="(Ctrl-Alt-A)" /></li>
-                            <li><label for="search-by-isbn">ISBN:</label></li>
-                            <li><input class="search-box" data-qualifier="isbn" id="search-by-isbn" placeholder="(Ctrl-Alt-I)" /></li>
-                            <li><label for="search-by-title">Title:</label></li>
-                            <li><input class="search-box" data-qualifier="title" id="search-by-title" placeholder="(Ctrl-Alt-T)" /></li>
-                            <li><a href="#" id="show-advanced-search" title="Show advanced Z39.50/SRU search (Ctrl-Alt-S)">Advanced &raquo;</a></li>
-                        </ol>
-                    </fieldset>
-                </form>
-                <h3>Clipboard</h3>
-                <fieldset class="brief">
-                    <select id="clipboard" name="clipboard" size="10"> </select>
-                </fieldset>
-            </aside>
-        </div>
-        <!-- /.col-md-2.order-md-1 -->
-    </div>
-    <!-- /.row -->
-</div>
+[% END %]
 
 <div id="advanced-search-ui" class="modal modal-full" tabindex="-1" role="dialog" aria-labelledby="advanced-search-title" aria-hidden="true">
     <div class="modal-dialog modal-xl">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
index dbecad1302..cf92e0f37c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
@@ -55,140 +55,7 @@
     [% END #/ WRAPPER breadcrumbs %]
 [% END #/ WRAPPER sub-header.inc %]
 
-<div class="main container-fluid">
-    <div class="row">
-        <div class="col-md-10 order-md-2 order-sm-1">
-            <main>
-                [% INCLUDE 'messages.inc' %]
-
-                [% IF ( noreport ) %]
-                    <h1>Overdue report</h1>
-                    <p>Please choose one or more filters to proceed.</p>
-                [% ELSE %]
-
-                    [% IF ( overdueloop ) %]
-                        <h2
-                            >[% nnoverdue | html %] [% IF ( noverdue_is_plural ) %]Items[% ELSE %]Item[% END %] overdue as of
-                            [% todaysdate | $KohaDates %][% IF ( isfiltered ) %]<span style="font-size:70%;">(Filtered. <a href="/cgi-bin/koha/circ/overdue.pl">Reset filter</a>)</span>[% END %]</h2
-                        >
-
-                        <p>
-                            [% IF ( isfiltered ) %]
-                                [% SET url_params = '' %]
-                                [% FOR var IN filters.keys %]
-                                    [% url_params = BLOCK %][% url_params | $raw %]&amp;[% var | uri %]=[% filters.$var | uri %][% END %]
-                                [% END %]
-                                <a href="overdue.pl?op=csv[% url_params | $raw %]">Download file of displayed overdues</a>
-                            [% ELSE %]
-                                <a href="overdue.pl?op=csv">Download file of all overdues</a>
-                            [% END %]
-                        </p>
-
-                        <div class="sql"><pre>[% sql | html %]</pre></div>
-                        <div class="page-section searchresults">
-                            <table id="overduest">
-                                <thead>
-                                    <tr>
-                                        <th>Due date</th>
-                                        <th>Patron</th>
-                                        <th>Patron category</th>
-                                        <th>Patron library</th>
-                                        <th class="anti-the">Title</th>
-                                        <th>Home library</th>
-                                        <th>Holding library</th>
-                                        <th>Shelving location</th>
-                                        <th>Checked out on</th>
-                                        <th>Barcode</th>
-                                        <th>Call number</th>
-                                        <th>Item type</th>
-                                        <th>Price</th>
-                                        <th>Non-public note</th>
-                                        [% IF Koha.Preference('ClaimReturnedLostValue') %]
-                                            <th>Return claims</th>
-                                        [% END %]
-                                    </tr>
-                                </thead>
-                                [%- BLOCK subject -%]Overdue:[%- END -%]
-                                <tbody>
-                                    [% FOREACH overdueloo IN overdueloop %]
-                                        <tr>
-                                            <td data-order="[% overdueloo.duedate | html %]">
-                                                [% IF ( overdueloo.overdue ) %]
-                                                    <span class="overdue">[% overdueloo.duedate | $KohaDates %]</span>
-                                                [% ELSE %]
-                                                    [% overdueloo.duedate | $KohaDates %]
-                                                [% END %]
-                                            </td>
-                                            <td>
-                                                [% INCLUDE 'patron-title.inc' borrower=overdueloo.borrower hide_patron_infos_if_needed=1 %]
-                                                [% IF logged_in_user.can_see_patrons_from( overdueloo.branchcode ) %]
-                                                    [% IF ( overdueloo.email ) %]
-                                                        <span class="overdue_email"> [<a href="mailto:[% overdueloo.email | uri %]?subject=[% INCLUDE subject %] [% overdueloo.title | uri %]">email</a>] </span>
-                                                    [% END %]
-                                                    <span class="overdue_phone">
-                                                        [% IF ( overdueloo.phone ) %]
-                                                            ([% overdueloo.phone | html %])
-                                                        [% ELSIF ( overdueloo.mobile ) %]
-                                                            ([% overdueloo.mobile | html %])
-                                                        [% ELSIF ( overdueloo.phonepro ) %]
-                                                            ([% overdueloo.phonepro | html %])
-                                                        [% END %]
-                                                    </span>
-                                                [% END %]
-                                            </td>
-                                            <td>[% Categories.GetName( overdueloo.borrower.categorycode ) | html %]</td>
-                                            <td>[% Branches.GetName( overdueloo.borrower.branchcode ) | html %]</td>
-                                            <td
-                                                >[% INCLUDE 'biblio-title.inc' biblio=overdueloo link = 1 %]
-                                                [% IF ( overdueloo.author ) %], by [% overdueloo.author | html %][% END %][% IF ( overdueloo.enumchron ) %], [% overdueloo.enumchron | html %][% END %]</td
-                                            >
-                                            <td>[% Branches.GetName( overdueloo.homebranchcode ) | html %]</td>
-                                            <td>[% Branches.GetName( overdueloo.holdingbranchcode ) | html %]</td>
-                                            <td>[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => overdueloo.location ) | html %]</td>
-                                            <td data-order="[% overdueloo.datelastborrowed | html %]">[% overdueloo.datelastborrowed | $KohaDates %]</td>
-                                            <td
-                                                ><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% overdueloo.biblionumber | uri %]&amp;itemnumber=[% overdueloo.itemnum | uri %]#item[% overdueloo.itemnum | uri %]"
-                                                    >[% overdueloo.barcode | html %]</a
-                                                ></td
-                                            >
-                                            <td>[% overdueloo.itemcallnumber | html %]</td>
-                                            <td>[% ItemTypes.GetDescription( overdueloo.itemtype ) | html %]</td>
-                                            <td>[% overdueloo.replacementprice | $Price %]</td>
-                                            <td>[% overdueloo.itemnotes_nonpublic | html %]</td>
-                                            [% IF Koha.Preference('ClaimReturnedLostValue') %]
-                                                <td>
-                                                    [% IF ( overdueloo.return_claim_created_on ) %]
-                                                        <span class="badge text-bg-info">[% overdueloo.return_claim_created_on | $KohaDates with_hours => 1 %]</span>
-                                                    [% ELSE %]
-                                                        <a class="btn btn-default btn-xs claim-returned-btn" data-itemnumber="[% overdueloo.itemnum | html %]"> <i class="fa fa-exclamation-circle"></i> Claim returned </a>
-                                                    [% END %]
-                                                </td>
-                                            [% END %]
-                                        </tr>
-                                    [% END %]
-                                </tbody>
-                            </table>
-                        </div>
-
-                        <!-- Claims Returned Modal -->
-                        [% PROCESS 'modal-claims-display' %]
-                    [% ELSE %]
-                        <h1>Overdue report</h1>
-                        [% IF ( isfiltered ) %]
-                            <p>There are no overdues matching your search. <a href="/cgi-bin/koha/circ/overdue.pl">Reset filter</a></p>
-                        [% ELSE %]
-                            <p>There are no overdues.</p>
-                        [% END %]
-                    [% END %]
-                    <!-- overdueloop -->
-                [% END %]
-                <!-- noreport -->
-            </main>
-        </div>
-        <!-- /.col-md-10.order-md-2 -->
-
-        <div class="col-md-2 order-sm-2 order-md-1">
-            <aside>
+[% aside = BLOCK %]
                 <form method="post" action="/cgi-bin/koha/circ/overdue.pl">
                     [% INCLUDE 'csrf-token.inc' %]
                     <fieldset class="brief">
@@ -332,13 +199,133 @@
                         <input type="hidden" name="op" value="cud-apply filter" />
                     </fieldset>
                 </form>
-            </aside>
-        </div>
-        <!-- /.col-md-2.order-md-1 -->
-    </div>
-    <!-- /.row -->
-</div>
-<!-- /.main.container-fluid -->
+
+[% END %]
+
+[% WRAPPER 'main-container.inc' aside_block=aside %]
+                [% IF ( noreport ) %]
+                    <h1>Overdue report</h1>
+                    <p>Please choose one or more filters to proceed.</p>
+                [% ELSE %]
+
+                    [% IF ( overdueloop ) %]
+                        <h2
+                            >[% nnoverdue | html %] [% IF ( noverdue_is_plural ) %]Items[% ELSE %]Item[% END %] overdue as of
+                            [% todaysdate | $KohaDates %][% IF ( isfiltered ) %]<span style="font-size:70%;">(Filtered. <a href="/cgi-bin/koha/circ/overdue.pl">Reset filter</a>)</span>[% END %]</h2
+                        >
+
+                        <p>
+                            [% IF ( isfiltered ) %]
+                                [% SET url_params = '' %]
+                                [% FOR var IN filters.keys %]
+                                    [% url_params = BLOCK %][% url_params | $raw %]&amp;[% var | uri %]=[% filters.$var | uri %][% END %]
+                                [% END %]
+                                <a href="overdue.pl?op=csv[% url_params | $raw %]">Download file of displayed overdues</a>
+                            [% ELSE %]
+                                <a href="overdue.pl?op=csv">Download file of all overdues</a>
+                            [% END %]
+                        </p>
+
+                        <div class="sql"><pre>[% sql | html %]</pre></div>
+                        <div class="page-section searchresults">
+                            <table id="overduest">
+                                <thead>
+                                    <tr>
+                                        <th>Due date</th>
+                                        <th>Patron</th>
+                                        <th>Patron category</th>
+                                        <th>Patron library</th>
+                                        <th class="anti-the">Title</th>
+                                        <th>Home library</th>
+                                        <th>Holding library</th>
+                                        <th>Shelving location</th>
+                                        <th>Checked out on</th>
+                                        <th>Barcode</th>
+                                        <th>Call number</th>
+                                        <th>Item type</th>
+                                        <th>Price</th>
+                                        <th>Non-public note</th>
+                                        [% IF Koha.Preference('ClaimReturnedLostValue') %]
+                                            <th>Return claims</th>
+                                        [% END %]
+                                    </tr>
+                                </thead>
+                                [%- BLOCK subject -%]Overdue:[%- END -%]
+                                <tbody>
+                                    [% FOREACH overdueloo IN overdueloop %]
+                                        <tr>
+                                            <td data-order="[% overdueloo.duedate | html %]">
+                                                [% IF ( overdueloo.overdue ) %]
+                                                    <span class="overdue">[% overdueloo.duedate | $KohaDates %]</span>
+                                                [% ELSE %]
+                                                    [% overdueloo.duedate | $KohaDates %]
+                                                [% END %]
+                                            </td>
+                                            <td>
+                                                [% INCLUDE 'patron-title.inc' borrower=overdueloo.borrower hide_patron_infos_if_needed=1 %]
+                                                [% IF logged_in_user.can_see_patrons_from( overdueloo.branchcode ) %]
+                                                    [% IF ( overdueloo.email ) %]
+                                                        <span class="overdue_email"> [<a href="mailto:[% overdueloo.email | uri %]?subject=[% INCLUDE subject %] [% overdueloo.title | uri %]">email</a>] </span>
+                                                    [% END %]
+                                                    <span class="overdue_phone">
+                                                        [% IF ( overdueloo.phone ) %]
+                                                            ([% overdueloo.phone | html %])
+                                                        [% ELSIF ( overdueloo.mobile ) %]
+                                                            ([% overdueloo.mobile | html %])
+                                                        [% ELSIF ( overdueloo.phonepro ) %]
+                                                            ([% overdueloo.phonepro | html %])
+                                                        [% END %]
+                                                    </span>
+                                                [% END %]
+                                            </td>
+                                            <td>[% Categories.GetName( overdueloo.borrower.categorycode ) | html %]</td>
+                                            <td>[% Branches.GetName( overdueloo.borrower.branchcode ) | html %]</td>
+                                            <td
+                                                >[% INCLUDE 'biblio-title.inc' biblio=overdueloo link = 1 %]
+                                                [% IF ( overdueloo.author ) %], by [% overdueloo.author | html %][% END %][% IF ( overdueloo.enumchron ) %], [% overdueloo.enumchron | html %][% END %]</td
+                                            >
+                                            <td>[% Branches.GetName( overdueloo.homebranchcode ) | html %]</td>
+                                            <td>[% Branches.GetName( overdueloo.holdingbranchcode ) | html %]</td>
+                                            <td>[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => overdueloo.location ) | html %]</td>
+                                            <td data-order="[% overdueloo.datelastborrowed | html %]">[% overdueloo.datelastborrowed | $KohaDates %]</td>
+                                            <td
+                                                ><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% overdueloo.biblionumber | uri %]&amp;itemnumber=[% overdueloo.itemnum | uri %]#item[% overdueloo.itemnum | uri %]"
+                                                    >[% overdueloo.barcode | html %]</a
+                                                ></td
+                                            >
+                                            <td>[% overdueloo.itemcallnumber | html %]</td>
+                                            <td>[% ItemTypes.GetDescription( overdueloo.itemtype ) | html %]</td>
+                                            <td>[% overdueloo.replacementprice | $Price %]</td>
+                                            <td>[% overdueloo.itemnotes_nonpublic | html %]</td>
+                                            [% IF Koha.Preference('ClaimReturnedLostValue') %]
+                                                <td>
+                                                    [% IF ( overdueloo.return_claim_created_on ) %]
+                                                        <span class="badge text-bg-info">[% overdueloo.return_claim_created_on | $KohaDates with_hours => 1 %]</span>
+                                                    [% ELSE %]
+                                                        <a class="btn btn-default btn-xs claim-returned-btn" data-itemnumber="[% overdueloo.itemnum | html %]"> <i class="fa fa-exclamation-circle"></i> Claim returned </a>
+                                                    [% END %]
+                                                </td>
+                                            [% END %]
+                                        </tr>
+                                    [% END %]
+                                </tbody>
+                            </table>
+                        </div>
+
+                        <!-- Claims Returned Modal -->
+                        [% PROCESS 'modal-claims-display' %]
+                    [% ELSE %]
+                        <h1>Overdue report</h1>
+                        [% IF ( isfiltered ) %]
+                            <p>There are no overdues matching your search. <a href="/cgi-bin/koha/circ/overdue.pl">Reset filter</a></p>
+                        [% ELSE %]
+                            <p>There are no overdues.</p>
+                        [% END %]
+                    [% END %]
+                    <!-- overdueloop -->
+                [% END %]
+                <!-- noreport -->
+[% END %]
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'calendar.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingbookings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingbookings.tt
index 8331e2abb3..c4ad9db16e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingbookings.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingbookings.tt
@@ -33,24 +33,7 @@
     [% END #/ WRAPPER breadcrumbs %]
 [% END #/ WRAPPER sub-header.inc %]
 
-<div class="main container-fluid">
-    <div class="row">
-        <!-- Results -->
-        <div class="col-md-10 order-md-2 order-sm1">
-            <main>
-                [% INCLUDE 'messages.inc' %]
-                <h1>Items required for bookings between <span id="from_date">[% from | $KohaDates %]</span> and <span id="to_date">[% to | $KohaDates %]</span></h1>
-                <h2>Reported on [% todaysdate | $KohaDates %]</h2>
-                <p>The following items have not been collected for bookings.</p>
-                <div id="searchresults">
-                    <table id="bookingst"></table>
-                </div>
-            </main>
-        </div>
-
-        <!-- Filters & Navigation -->
-        <div class="col-md-2 order-sm-2 order-md-1">
-            <aside>
+[% aside = BLOCK %]
                 <form id="bookingsf">
                     <fieldset class="brief">
                         <h4>Refine results</h4>
@@ -103,12 +86,17 @@
                 </form>
 
                 [% INCLUDE 'circ-nav.inc' %]
-            </aside>
-        </div>
-    </div>
-    <!-- /.row -->
-</div>
-<!-- /.main.container-fluid -->
+
+[% END %]
+
+[% WRAPPER 'main-container.inc' aside_block=aside %]
+                <h1>Items required for bookings between <span id="from_date">[% from | $KohaDates %]</span> and <span id="to_date">[% to | $KohaDates %]</span></h1>
+                <h2>Reported on [% todaysdate | $KohaDates %]</h2>
+                <p>The following items have not been collected for bookings.</p>
+                <div id="searchresults">
+                    <table id="bookingst"></table>
+                </div>
+[% END %]
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'calendar.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
index 8e25f9ee62..d71a0b2bc8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
@@ -34,12 +34,38 @@
     [% END #/ WRAPPER breadcrumbs %]
 [% END #/ WRAPPER sub-header.inc %]
 
-<div class="main container-fluid">
-    <div class="row">
-        <div class="col-md-10 order-md-2 order-sm-1">
-            <main>
-                [% INCLUDE 'messages.inc' %]
+[% aside = BLOCK %]
+                <div id="filters">
+                    <form action="/cgi-bin/koha/circ/pendingreserves.pl" method="get">
+                        <fieldset class="brief">
+                            <h4>Refine results</h4>
+                            <ol>
+                                <li>
+                                    <label for="from"> Start date: </label>
+                                    <input type="text" size="10" id="from" name="from" value="[% from | html %]" class="flatpickr" data-date_to="to" />
+                                </li>
+                                <li
+                                    ><label for="to"> End date: </label>
+                                    <input type="text" size="10" id="to" name="to" value="[% to | html %]" class="flatpickr" />
+                                </li>
+                            </ol>
 
+                            [% IF ( HoldsToPullEndDate ) %]
+                                <p><em>(Inclusive, default is [% HoldsToPullStartDate | html %] days ago to [% HoldsToPullEndDate | html %] days ahead. Set other date ranges as needed.)</em></p>
+                            [% ELSE %]
+                                <p><em>(Inclusive, default is [% HoldsToPullStartDate | html %] days ago to today. Set other date ranges as needed.)</em></p>
+                            [% END %]
+                        </fieldset>
+
+                        <fieldset class="action">
+                            <input type="submit" name="run_report" value="Submit" class="btn btn-primary" />
+                        </fieldset>
+                    </form>
+                </div>
+
+[% END %]
+
+[% WRAPPER 'main-container.inc' aside_block=aside %]
                 [% FOR m IN messages %]
                     <div class="alert alert-[% m.type | html %]">
                         [% SWITCH m.code %]
@@ -251,46 +277,7 @@
                         <strong>No items found.</strong>
                     [% END %]
                 </div>
-            </main>
-        </div>
-        <!-- /.col-md-10.order-md-2 -->
-
-        <div class="col-md-2 order-sm-2 order-md-1">
-            <aside>
-                <div id="filters">
-                    <form action="/cgi-bin/koha/circ/pendingreserves.pl" method="get">
-                        <fieldset class="brief">
-                            <h4>Refine results</h4>
-                            <ol>
-                                <li>
-                                    <label for="from"> Start date: </label>
-                                    <input type="text" size="10" id="from" name="from" value="[% from | html %]" class="flatpickr" data-date_to="to" />
-                                </li>
-                                <li
-                                    ><label for="to"> End date: </label>
-                                    <input type="text" size="10" id="to" name="to" value="[% to | html %]" class="flatpickr" />
-                                </li>
-                            </ol>
-
-                            [% IF ( HoldsToPullEndDate ) %]
-                                <p><em>(Inclusive, default is [% HoldsToPullStartDate | html %] days ago to [% HoldsToPullEndDate | html %] days ahead. Set other date ranges as needed.)</em></p>
-                            [% ELSE %]
-                                <p><em>(Inclusive, default is [% HoldsToPullStartDate | html %] days ago to today. Set other date ranges as needed.)</em></p>
-                            [% END %]
-                        </fieldset>
-
-                        <fieldset class="action">
-                            <input type="submit" name="run_report" value="Submit" class="btn btn-primary" />
-                        </fieldset>
-                    </form>
-                </div>
-            </aside>
-        </div>
-        <!-- /.col-md-2.order-md-1 -->
-    </div>
-    <!-- /.row -->
-</div>
-<!-- /.main.container-fluid -->
+[% END %]
 
 [% INCLUDE 'hold-group-modal.inc' %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt
index 6015dcd123..ff069b6a6c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt
@@ -45,12 +45,57 @@
     [% END #/ WRAPPER breadcrumbs %]
 [% END #/ WRAPPER sub-header.inc %]
 
-<div class="main container-fluid">
-    <div class="row">
-        <div class="col-md-10 order-md-2 order-sm-1">
-            <main>
-                [% INCLUDE 'messages.inc' %]
+[% aside = BLOCK %]
+                <form action="/cgi-bin/koha/circ/reserveratios.pl" method="get">
+                    <fieldset class="brief">
+                        <h4>Refine results:</h4>
+                        <ol>
+                            <li>
+                                <label for="ratio">Hold ratio (greater than or equal to):</label>
+                                <input type="text" size="5" id="ratio" name="ratio" value="[% ratio | html %]" />
+                            </li>
 
+                            <li class="checkbox">
+                                [% IF include_ordered %]
+                                    <input id="include_ordered" name="include_ordered" type="checkbox" checked="checked" />
+                                [% ELSE %]
+                                    <input id="include_ordered" name="include_ordered" type="checkbox" />
+                                [% END %]
+                                <label for="include_ordered">Include ordered</label>
+                            </li>
+
+                            <li class="checkbox">
+                                [% IF include_suspended %]
+                                    <input id="include_suspended" name="include_suspended" type="checkbox" checked="checked" />
+                                [% ELSE %]
+                                    <input id="include_suspended" name="include_suspended" type="checkbox" />
+                                [% END %]
+                                <label for="include_suspended">Include suspended</label>
+                            </li>
+
+                            <li>
+                                <label for="from">Start date:</label>
+                                <input type="text" size="10" id="from" name="from" value="[% from | html %]" class="flatpickr" data-date_to="to" />
+                            </li>
+
+                            <li>
+                                <label for="to">End date:</label>
+                                <input size="10" id="to" name="to" value="[% to | html %]" type="text" class="flatpickr" />
+                            </li>
+                        </ol>
+                        (inclusive)
+
+                        <fieldset class="action"><input type="submit" value="Go" class="submit" /></fieldset>
+                    </fieldset>
+                    [% IF ( CAN_user_acquisition && basketno && booksellerid ) %]
+                        <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
+                        <input type="hidden" name="basketno" value="[% basketno | html %]" />
+                    [% END %]
+                </form>
+
+[% END %]
+
+[% WRAPPER 'main-container.inc' aside_block=aside %]
                 <h1>Hold ratios to calculate items needed</h1>
                 <h3>Calculated on [% todaysdate | $KohaDates %]. From [% from | $KohaDates %] to [% to | $KohaDates %]</h3>
                 <p>These items have a hold ratio &ge; [% ratio | html %].</p>
@@ -151,65 +196,7 @@
                 [% ELSE %]
                     <strong>No items found.</strong>
                 [% END %]
-            </main>
-        </div>
-        <!-- /.col-md-10.order-md-2 -->
-
-        <div class="col-md-2 order-sm-2 order-md-1">
-            <aside>
-                <form action="/cgi-bin/koha/circ/reserveratios.pl" method="get">
-                    <fieldset class="brief">
-                        <h4>Refine results:</h4>
-                        <ol>
-                            <li>
-                                <label for="ratio">Hold ratio (greater than or equal to):</label>
-                                <input type="text" size="5" id="ratio" name="ratio" value="[% ratio | html %]" />
-                            </li>
-
-                            <li class="checkbox">
-                                [% IF include_ordered %]
-                                    <input id="include_ordered" name="include_ordered" type="checkbox" checked="checked" />
-                                [% ELSE %]
-                                    <input id="include_ordered" name="include_ordered" type="checkbox" />
-                                [% END %]
-                                <label for="include_ordered">Include ordered</label>
-                            </li>
-
-                            <li class="checkbox">
-                                [% IF include_suspended %]
-                                    <input id="include_suspended" name="include_suspended" type="checkbox" checked="checked" />
-                                [% ELSE %]
-                                    <input id="include_suspended" name="include_suspended" type="checkbox" />
-                                [% END %]
-                                <label for="include_suspended">Include suspended</label>
-                            </li>
-
-                            <li>
-                                <label for="from">Start date:</label>
-                                <input type="text" size="10" id="from" name="from" value="[% from | html %]" class="flatpickr" data-date_to="to" />
-                            </li>
-
-                            <li>
-                                <label for="to">End date:</label>
-                                <input size="10" id="to" name="to" value="[% to | html %]" type="text" class="flatpickr" />
-                            </li>
-                        </ol>
-                        (inclusive)
-
-                        <fieldset class="action"><input type="submit" value="Go" class="submit" /></fieldset>
-                    </fieldset>
-                    [% IF ( CAN_user_acquisition && basketno && booksellerid ) %]
-                        <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
-                        <input type="hidden" name="basketno" value="[% basketno | html %]" />
-                    [% END %]
-                </form>
-            </aside>
-        </div>
-        <!-- /.col-md-2.order-md-1 -->
-    </div>
-    <!-- /.row -->
-</div>
-<!-- /.main.container-fluid -->
+[% END %]
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'calendar.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
index a0bf075e82..60de9b48ac 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
@@ -60,19 +60,18 @@
     [% END #/ WRAPPER breadcrumbs %]
 [% END #/ WRAPPER sub-header.inc %]
 
-<div class="main container-fluid">
-    <div class="row">
-        <div class="col-sm-12">
-            <main>
-                <div class="row">
-                    [% IF ( total || Koha.Preference('CircSidebar') ) %]
-                        [% SET div_class='col-md-10 order-md-2 order-sm-1' %]
-                    [% ELSE %]
-                        [% SET div_class='col-md-10 offset-md-1 col-lg-8 offset-lg-2' %]
-                    [% END %]
-                    <div class="[% div_class | html %]">
-                        [% INCLUDE 'messages.inc' %]
+[% aside = BLOCK %]
+                            [%~ IF ( total || Koha.Preference('CircSidebar') ) %]
+                                [% IF ( total ) %]
+                                    [% PROCESS filter_form %]
+                                [% END %]
+                                [% IF Koha.Preference('CircSidebar') %]
+                                    [% INCLUDE 'circ-nav.inc' %]
+                                [% END %]
+                            [% END ~%]
+[% END %]
 
+[% WRAPPER 'main-container.inc' aside_block=aside %]
                         <h1>Holds queue</h1>
 
                         [% IF ( run_report ) %]
@@ -304,30 +303,7 @@
                             [% branchlimit = Branches.GetLoggedInBranchcode %]
                             [% PROCESS filter_form %]
                         [% END %]
-                    </div>
-                    <!-- /.col-md-10.order-md-2 -->
-                    [% IF ( total || Koha.Preference('CircSidebar') ) %]
-                        <div class="col-md-2 order-sm-2 order-md-1">
-                            <aside>
-                                [% IF ( total ) %]
-                                    [% PROCESS filter_form %]
-                                [% END %]
-                                [% IF Koha.Preference('CircSidebar') %]
-                                    [% INCLUDE 'circ-nav.inc' %]
-                                [% END %]
-                            </aside>
-                        </div>
-                        <!-- /.col-md-2.order-md-1 -->
-                    [% END %]
-                </div>
-                <!-- /.row -->
-            </main>
-        </div>
-        <!-- /.col-sm-12 -->
-    </div>
-    <!-- /.row -->
-</div>
-<!-- /.main.container-fluid -->
+[% END %]
 
 [% BLOCK filter_form %]
     <form method="get" name="f" action="/cgi-bin/koha/circ/view_holdsqueue.pl">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
index 8e2e37300d..62dcbb5cba 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
@@ -40,11 +40,11 @@
     [% END #/ WRAPPER breadcrumbs %]
 [% END #/ WRAPPER sub-header.inc %]
 
-<div class="main container-fluid">
-    <div class="row">
-        <div class="col-md-10 order-md-2 order-sm-1">
-            <main>
-                [% INCLUDE 'messages.inc' %]
+[% aside = BLOCK %]
+            [% PROCESS patron_search_filters categories => categories, libraries => libraries, filters => ['search_field', 'search_type', 'category', 'branch'], search_filter => searchmember %]
+[% END %]
+
+[% WRAPPER 'main-container.inc' aside_block=aside %]
 
                 [% IF CAN_user_tools_manage_patron_lists %]
                     <div id="patron_list_dialog" class="alert alert-info"> Added <span class="patrons-length"></span> patrons to <a></a>. </div>
@@ -132,18 +132,7 @@
                 [%- FOREACH block IN StaffPatronsHome.content -%]
                     <div class="page-section"> [%- block.content | $raw -%] </div>
                 [%- END -%]
-            </main>
-        </div>
-        <!-- /.col-md-10.order-md-2 -->
-
-        <div class="col-md-2 order-sm-2 order-md-1">
-            [% PROCESS patron_search_filters categories => categories, libraries => libraries, filters => ['search_field', 'search_type', 'category', 'branch'], search_filter => searchmember %]
-        </div>
-        <!-- /.col-md-2 order-sm-2 order-md-1 -->
-    </div>
-    <!-- /.row -->
-</div>
-<!-- /.main.container-fluid -->
+[% END %]
 
 <!-- New Patron List Modal -->
 <div class="modal" id="new-patron-list" tabindex="-1" role="dialog" aria-labelledby="new-patron-listLabel">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
index cb0a99c273..6cd46e4c32 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -63,9 +63,10 @@
     [% END #/ WRAPPER breadcrumbs %]
 [% END #/ WRAPPER sub-header.inc %]
 
-<div class="main container-fluid">
-    <div class="row">
-        [% IF borrower_data.messages %]
+[% SET asides = [] %]
+[% IF op != 'add_form' %][% asides.push('circ-menu') %][% END %]
+
+[% messages_block = BLOCK %]
             [% FOR message IN borrower_data.messages %]
                 [% SWITCH message.error %]
                 [% CASE 'error_on_insert_patron' %]
@@ -76,16 +77,9 @@
                     <div class="alert alert-warning">Unhandled error: [% message.error | html %]</div>
                 [% END %]
             [% END %]
-        [% END %]
-        [% IF ( op == 'add_form' ) %]
-            [% SET div_class = 'col-md-10 offset-md-1 col-lg-8 offset-lg-2' %]
-        [% ELSE %]
-            [% SET div_class = 'col-md-10 order-md-2 order-sm-1' %]
-        [% END %]
-        <div class="[% div_class | html %]">
-            <main class="clearfix">
-                [% INCLUDE 'messages.inc' %]
+[% END %]
 
+[% WRAPPER 'main-container.inc' asides=asides messages_block=messages_block %]
                 [% IF error_alert %]
                     [% IF ( error_alert == "no_email" ) %]
                         <div class="alert alert-warning">This member has no email</div>
@@ -1584,21 +1578,7 @@
                         </form>
                     [% END %]
                 [% END # /UNLESS ( no_add ) %]
-            </main>
-        </div>
-        <!-- /.col-md-10.order-md-2 -->
-
-        [% UNLESS ( op == 'add_form' ) %]
-            <div class="col-md-2 order-sm-2 order-md-1">
-                <aside> [% INCLUDE 'circ-menu.inc' %] </aside>
-            </div>
-            <!-- /.col-md-2.order-md-1 -->
-        [% END %]
-    </div>
-    <!-- /.row -->
-</div>
-<!-- /.main.container-fluid -->
-
+[% END %]
 <div id="categoryChangeModal" class="modal" tabindex="-1" role="dialog" aria-labelledby="categoryChangeModalLabel" aria-hidden="true">
     <div class="modal-dialog">
         <div class="modal-content">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt
index 773fe66794..cf43d43b55 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt
@@ -42,14 +42,17 @@
     [% END #/ WRAPPER breadcrumbs %]
 [% END #/ WRAPPER sub-header.inc %]
 
-[% IF ( method == 'tool' ) %]
-    [% SET 'dynamicaside' = 'tools-menu' %]
-[% ELSIF ( method == 'report' ) %]
-    [% SET 'dynamicaside' = 'reports-menu' %]
-[% ELSE %]
-    [% SET 'dynamicaside' = 'admin-menu' %]
+[% aside = BLOCK %]
+    [% IF ( method == 'tool' ) %]
+        [% INCLUDE 'tools-menu.inc' %]
+    [% ELSIF ( method == 'report' ) %]
+        [% INCLUDE 'reports-menu.inc' %]
+    [% ELSE %]
+        [% INCLUDE 'admin-menu.inc' %]
+    [% END %]
 [% END %]
-[% WRAPPER 'main-container.inc' aside=dynamicaside %]
+
+[% WRAPPER 'main-container.inc' aside_block=aside %]
     <h1>Plugins</h1>
 
     <div class="details">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
index 3657ffb185..b32b4deab4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
@@ -124,12 +124,30 @@
     [% END #/ WRAPPER breadcrumbs %]
 [% END #/ WRAPPER sub-header.inc %]
 
-<div class="main container-fluid">
-    <div class="row">
-        <div class="col-md-10 order-md-2 order-sm-1">
-            <main>
-                [% INCLUDE 'messages.inc' %]
+[% aside = BLOCK %]
+                [% INCLUDE 'serials-menu.inc' %]
+                <div id="serialmenu" class="sidebar_menu">
+                    <h5>Serial links</h5>
+                    <ul>
+                        [% FOREACH subscription IN subscriptions %]
+                            <li
+                                ><a href="serials-collection.pl?subscriptionid=[% subscription.subscriptionid | uri %]" title="Serial collection for [% subscription.subscriptionid | html %]"
+                                    >Serial collection #[% subscription.subscriptionid | html %]</a
+                                ></li
+                            >
+                            <li><a href="subscription-detail.pl?subscriptionid=[% subscription.subscriptionid | uri %]" title="Detail of the subscription">Subscription #[% subscription.subscriptionid | html %]</a></li>
+                            [% IF ( subscription.abouttoexpire ) %]
+                                [% UNLESS subscription.closed %]
+                                    <li><a href="#" onclick="javascript:popup([% subscription.subscriptionid | html %])">Renew #[% subscription.subscriptionid | html %]</a></li>
+                                [% END %]
+                            [% END %]
+                        [% END %]
+                        <li><a href="[% PROCESS biblio_a_href biblionumber => biblionumber %]" title="Go to [% bibliotitle | html %]">Show bibliographic record</a></li>
+                    </ul>
+                </div>
+[% END %]
 
+[% WRAPPER 'main-container.inc' aside_block=aside %]
                 <div class="btn-group"><input type="button" value="Generate next" href="#generate_next" class="btn btn-default btn-sm" data-bs-toggle="modal" /></div>
                 [% INCLUDE 'modals/generate_next.inc' referrer="serials-edit" %]
 
@@ -616,38 +634,6 @@
                         [% END %]
                     </fieldset>
                 </form>
-            </main>
-        </div>
-        <!-- /.col-md-10.order-md-2 -->
-
-        <div class="col-md-2 order-sm-2 order-md-1">
-            <aside>
-                [% INCLUDE 'serials-menu.inc' %]
-                <div id="serialmenu" class="sidebar_menu">
-                    <h5>Serial links</h5>
-                    <ul>
-                        [% FOREACH subscription IN subscriptions %]
-                            <li
-                                ><a href="serials-collection.pl?subscriptionid=[% subscription.subscriptionid | uri %]" title="Serial collection for [% subscription.subscriptionid | html %]"
-                                    >Serial collection #[% subscription.subscriptionid | html %]</a
-                                ></li
-                            >
-                            <li><a href="subscription-detail.pl?subscriptionid=[% subscription.subscriptionid | uri %]" title="Detail of the subscription">Subscription #[% subscription.subscriptionid | html %]</a></li>
-                            [% IF ( subscription.abouttoexpire ) %]
-                                [% UNLESS subscription.closed %]
-                                    <li><a href="#" onclick="javascript:popup([% subscription.subscriptionid | html %])">Renew #[% subscription.subscriptionid | html %]</a></li>
-                                [% END %]
-                            [% END %]
-                        [% END %]
-                        <li><a href="[% PROCESS biblio_a_href biblionumber => biblionumber %]" title="Go to [% bibliotitle | html %]">Show bibliographic record</a></li>
-                    </ul>
-                </div>
-            </aside>
-        </div>
-        <!-- /.col-md-2.order-md-1 -->
-    </div>
-    <!-- /.row -->
-</div>
-<!-- /.main.container-fluid -->
+[% END %]
 
 [% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt
index 6fd33903e3..b63c0798e7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt
@@ -42,12 +42,21 @@
     [% END #/ WRAPPER breadcrumbs %]
 [% END #/ WRAPPER sub-header.inc %]
 
-<div class="main container-fluid">
-    <div class="row">
-        <div class="col-md-10 order-md-2 order-sm-1">
-            <main>
-                [% INCLUDE 'messages.inc' %]
+[% aside = BLOCK %]
+                <div id="list-menu" class="sidebar_menu">
+                    <ul>
+                        <li><a href="/cgi-bin/koha/tags/review.pl?approved=1">Approved tags</a></li>
+                        <li><a href="/cgi-bin/koha/tags/review.pl?approved=-1">Rejected tags</a></li>
+                        <li><a href="/cgi-bin/koha/tags/review.pl?approved=0">Pending tags</a></li>
+                        <li><a href="/cgi-bin/koha/tags/review.pl?approved=all">All tags</a></li>
+                    </ul>
+                </div>
+                <!-- /.sidebar_menu -->
+                [% INCLUDE 'tools-menu.inc' %]
 
+[% END %]
+
+[% WRAPPER 'main-container.inc' aside_block=aside %]
                 <h1>[% tx("Results for tag '{tag}'", { tag = tag }) | html %]</h1>
 
                 [% IF ( titles ) %]
@@ -124,29 +133,7 @@
                 [% ELSE %]
                     <div class="alert alert-info">There are no titles tagged with the term <em>[% tag | html %]</em></div>
                 [% END %]
-            </main>
-        </div>
-        <!-- /.col-md-10.order-md-2 -->
-
-        <div class="col-md-2 order-sm-2 order-md-1">
-            <aside>
-                <div id="list-menu" class="sidebar_menu">
-                    <ul>
-                        <li><a href="/cgi-bin/koha/tags/review.pl?approved=1">Approved tags</a></li>
-                        <li><a href="/cgi-bin/koha/tags/review.pl?approved=-1">Rejected tags</a></li>
-                        <li><a href="/cgi-bin/koha/tags/review.pl?approved=0">Pending tags</a></li>
-                        <li><a href="/cgi-bin/koha/tags/review.pl?approved=all">All tags</a></li>
-                    </ul>
-                </div>
-                <!-- /.sidebar_menu -->
-                [% INCLUDE 'tools-menu.inc' %]
-            </aside>
-        </div>
-        <!-- /.col-md-2.order-md-1 -->
-    </div>
-    <!-- /.row -->
-</div>
-<!-- /.main.container-fluid -->
+[% END %]
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'datatables.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt
index a73afc68a5..9666865434 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt
@@ -124,49 +124,8 @@
     [% END #/ WRAPPER breadcrumbs %]
 [% END #/ WRAPPER sub-header.inc %]
 
-[% IF op == 'add_form' %]
-    [% SET div_class="col-md-10 offset-md-1 col-lg-8 offset-lg-2" %]
-[% ELSE %]
-    [% SET div_class="col-md-10 order-md-2 order-sm-1" %]
-[% END %]
-<div class="main container-fluid">
-    <div class="row">
-        <div class="[% div_class | html %]">
-            <main>
-                [% INCLUDE 'messages.inc' %]
-
-                [% FOR m IN messages %]
-                    <div class="alert alert-[% m.type | html %]">
-                        [% SWITCH m.code %]
-                        [% CASE 'error_on_update' %]
-                            <span>An error occurred when updating this content. Perhaps it already exists.</span>
-                        [% CASE 'error_on_insert' %]
-                            <span>An error occurred when adding this content. Check the logs for details.</span>
-                        [% CASE 'error_on_delete' %]
-                            <span>An error occurred when deleting this content. Check the logs for details.</span>
-                        [% CASE 'success_on_update' %]
-                            <span>Content updated successfully.</span>
-                        [% CASE 'success_on_insert' %]
-                            <span>Content added successfully.</span>
-                        [% CASE 'success_on_delete' %]
-                            <span>Content deleted successfully.</span>
-                        [% CASE %]
-                            <span>[% m.code | html %]</span>
-                        [% END %]
-                    </div>
-                [% END %]
-
-                [% IF op == 'add_form' %]
-                    [% PROCESS add_form %]
-                [% ELSE %]
-                    [% PROCESS list %]
-                [% END %]
-            </main>
-        </div>
-        <!-- /.col-md-10.order-md-2 -->
-        [% IF op != 'add_form' %]
-            <div class="col-md-2 order-sm-2 order-md-1">
-                <aside>
+[% aside = BLOCK %]
+        [%~ IF op != 'add_form' %]
                     <div id="news-filter">
                         <form action="/cgi-bin/koha/tools/additional-contents.pl" method="get">
                             <h4>Filter</h4>
@@ -200,14 +159,39 @@
                     </div>
 
                     [% INCLUDE 'tools-menu.inc' %]
-                </aside>
-            </div>
-            <!-- /.col-md-2.order-md-1 -->
-        [% END %]
-    </div>
-    <!-- /.row -->
-</div>
-<!-- /.main.container-fluid -->
+        [% END ~%]
+[% END %]
+
+[% messages_block = BLOCK %]
+                [% FOR m IN messages %]
+                    <div class="alert alert-[% m.type | html %]">
+                        [% SWITCH m.code %]
+                        [% CASE 'error_on_update' %]
+                            <span>An error occurred when updating this content. Perhaps it already exists.</span>
+                        [% CASE 'error_on_insert' %]
+                            <span>An error occurred when adding this content. Check the logs for details.</span>
+                        [% CASE 'error_on_delete' %]
+                            <span>An error occurred when deleting this content. Check the logs for details.</span>
+                        [% CASE 'success_on_update' %]
+                            <span>Content updated successfully.</span>
+                        [% CASE 'success_on_insert' %]
+                            <span>Content added successfully.</span>
+                        [% CASE 'success_on_delete' %]
+                            <span>Content deleted successfully.</span>
+                        [% CASE %]
+                            <span>[% m.code | html %]</span>
+                        [% END %]
+                    </div>
+                [% END %]
+[% END %]
+
+[% WRAPPER 'main-container.inc' aside_block=aside messages_block=messages_block %]
+                [% IF op == 'add_form' %]
+                    [% PROCESS add_form %]
+                [% ELSE %]
+                    [% PROCESS list %]
+                [% END %]
+[% END %]
 
 [% BLOCK add_form %]
     <h1>[% PROCESS page_heading %]</h1>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt
index f270985e84..2a0eb9c0a5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt
@@ -50,11 +50,7 @@
     [% END #/ WRAPPER breadcrumbs %]
 [% END #/ WRAPPER sub-header.inc %]
 
-<div class="main container-fluid">
-    <main>
-        <div class="row">
-            <div class="col-sm-10 col-sm-push-1">
-                [% INCLUDE 'messages.inc' %]
+[% WRAPPER 'main-container.inc' %]
                 <h1>Compare matched records</h1>
 
                 <div class="page-section col-sm-12">
@@ -86,11 +82,7 @@
                 <fieldset class="action">
                     <a class="btn btn-primary" href="/cgi-bin/koha/tools/manage-marc-import.pl?import_batch_id=[% batchid | uri %]">Return to staged MARC batch [% batchid | html %]</a>
                 </fieldset>
-            </div>
-        </div>
-    </main>
-</div>
-<!-- /.main.container-fluid -->
+[% END %]
 
 [% MACRO jsinclude BLOCK %]
     [% Asset.js("js/tools-menu.js") | $raw %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt
index 8ac2f4bae3..d62e973be9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt
@@ -105,12 +105,33 @@
     [% END #/ WRAPPER breadcrumbs %]
 [% END #/ WRAPPER sub-header.inc %]
 
-<div class="main container-fluid">
-    <div class="row">
-        <div class="col-md-10 order-md-2 order-sm-1">
-            <main>
-                [% INCLUDE 'messages.inc' %]
+[% aside = BLOCK %]
+                [% IF ( op == 'manage_stages' || op == 'manage_items' ) %]
+                    <div id="stockrotation-menu" class="sidebar_menu">
+                        <ul>
+                            [% SET item_class = "" %]
+                            [% IF op == 'manage_stages' %]
+                                [% item_class = "active" %]
+                            [% END %]
+                            <li class="[% item_class | html %]">
+                                <a href="/cgi-bin/koha/tools/stockrotation.pl?op=manage_stages&amp;rota_id=[% rota_id | uri %]">Manage stages</a>
+                            </li>
+                            [% SET item_class = "" %]
+                            [% IF op == 'manage_items' %]
+                                [% item_class = "active" %]
+                            [% END %]
+                            <li class="[% item_class | html %]">
+                                <a href="/cgi-bin/koha/tools/stockrotation.pl?op=manage_items&amp;rota_id=[% rota_id | uri %]">Manage items</a>
+                            </li>
+                        </ul>
+                    </div>
+                    <!-- /.sidebar_menu -->
+                [% END %]
+                [% INCLUDE 'cat-menu.inc' %]
 
+[% END %]
+
+[% WRAPPER 'main-container.inc' aside_block=aside %]
                 <div id="stockrotation">
                     [% IF no_op_set %]
 
@@ -679,41 +700,7 @@
                         <p><a href="?op=manage_items&amp;rota_id=[% rota_id | uri %]">Return to rota</a></p>
                     [% END %]
                 </div>
-            </main>
-        </div>
-        <!-- /.col-md-10.order-md-2 -->
-
-        <div class="col-md-2 order-sm-2 order-md-1">
-            <aside>
-                [% IF ( op == 'manage_stages' || op == 'manage_items' ) %]
-                    <div id="stockrotation-menu" class="sidebar_menu">
-                        <ul>
-                            [% SET item_class = "" %]
-                            [% IF op == 'manage_stages' %]
-                                [% item_class = "active" %]
-                            [% END %]
-                            <li class="[% item_class | html %]">
-                                <a href="/cgi-bin/koha/tools/stockrotation.pl?op=manage_stages&amp;rota_id=[% rota_id | uri %]">Manage stages</a>
-                            </li>
-                            [% SET item_class = "" %]
-                            [% IF op == 'manage_items' %]
-                                [% item_class = "active" %]
-                            [% END %]
-                            <li class="[% item_class | html %]">
-                                <a href="/cgi-bin/koha/tools/stockrotation.pl?op=manage_items&amp;rota_id=[% rota_id | uri %]">Manage items</a>
-                            </li>
-                        </ul>
-                    </div>
-                    <!-- /.sidebar_menu -->
-                [% END %]
-                [% INCLUDE 'cat-menu.inc' %]
-            </aside>
-        </div>
-        <!-- /.col-md-2.order-md-1 -->
-    </div>
-    <!-- /.row -->
-</div>
-<!-- /.main.container-fluid -->
+[% END %]
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'datatables.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt
index 1d322954e3..9a0b6ebd04 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt
@@ -294,17 +294,18 @@
     [% END #/ WRAPPER sub-header.inc %]
 [% END %]
 
-[% IF plugin %]
-    [% SET div_class = 'col-sm-12' %]
-[% ELSE %]
-    [% SET div_class = 'col-md-10 order-md-2 order-sm-1' %]
-[% END %]
-<div class="main container-fluid">
-    <div class="row">
-        <div class="[% div_class | html %]">
-            <main>
-                [% INCLUDE 'messages.inc' %]
+[% aside = BLOCK %]
+        [% IF !plugin %]
+                    [% IF op == 'report' %]
+                        [% PROCESS form_browse %]
+                        [% PROCESS form_search %]
+                    [% END %]
 
+                    [% INCLUDE 'tools-menu.inc' %]
+        [% END %]
+[% END %]
+
+[% WRAPPER 'main-container.inc' aside_block=aside %]
                 <h1>Uploads</h1>
                 <div class="alert alert-warning" id="myalerts" style="display:none;"></div>
 
@@ -335,26 +336,7 @@
                         [% PROCESS newsearch %]
                     [% END %]
                 [% END %]
-            </main>
-        </div>
-        <!-- /.col-md-10.order-md-2 -->
-        [% IF !plugin %]
-            <div class="col-md-2 order-sm-2 order-md-1">
-                <aside>
-                    [% IF op == 'report' %]
-                        [% PROCESS form_browse %]
-                        [% PROCESS form_search %]
-                    [% END %]
-
-                    [% INCLUDE 'tools-menu.inc' %]
-                </aside>
-            </div>
-            <!-- /.col-md-2.order-md-1 -->
-        [% END %]
-    </div>
-    <!-- /.row -->
-</div>
-<!-- /.main.container-fluid -->
+[% END %]
 
 [% MACRO jsinclude BLOCK %]
     [% Asset.js("js/tools-menu.js") | $raw %]