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 4ee918ba25..96989f2767 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/main-container.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/main-container.inc
@@ -19,6 +19,7 @@
                         [% CASE 'admin-menu' %][% INCLUDE 'admin-menu.inc' %]
                         [% CASE 'biblio-view-menu' %][% INCLUDE 'biblio-view-menu.inc' %]
                         [% CASE 'cat-menu' %][% INCLUDE 'cat-menu.inc' %]
+                        [% CASE 'circ-nav' %][% INCLUDE 'circ-nav.inc' %]
                         [% CASE 'facets' %][% INCLUDE 'facets.inc' %]
                         [% CASE 'vendor-menu' %][% INCLUDE 'vendor-menu.inc' %]
                         [% CASE 'subscriptions-search' %][% INCLUDE 'subscriptions-search.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt
index 9b8087ba4f..b5fe10b322 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt
@@ -14,7 +14,7 @@
     [% t("Koha") | html %]
 [% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
-<style>p { margin-top: 0; } [id^="article-menu-"] { display: none; } [id^="article-menu-"]:before { content: "|"; } .starthidden { display:none; }</style>
+<style>p { margin-top: 0; } [id^="article-menu-"] { display: none; } [id^="article-menu-"]:before { content: "|"; }</style>
 </head>
 
 [% BLOCK actions %]
@@ -153,17 +153,8 @@
         [% END #/ WRAPPER breadcrumbs %]
     [% END #/ WRAPPER sub-header.inc %]
 
-    <div class="main container-fluid starthidden">
-        <div class="row">
-
-                [% INCLUDE 'messages.inc' %]
-                [% IF 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 %]">
+    [% SET aside = Koha.Preference('CircSidebar') ? 'circ-nav' : '' %]
+    [% WRAPPER 'main-container.inc' aside=aside %]
 
                 <h1>Article requests</h1>
                 [% PROCESS urls_modal %]
@@ -517,17 +508,8 @@
                         [% END # /tab_panel#article-requests-processing %]
                     [% END # /WRAPPER tab_panels %]
                 [% END # /WRAPPER tabs %]
-            </div>
 
-            [% IF Koha.Preference('CircSidebar') %]
-            <div class="col-md-2 order-sm-2 order-md-1">
-                <aside>
-                    [% INCLUDE 'circ-nav.inc' %]
-                </aside>
-            </div>
-            [% END %]
-        </div>
-    </div> <!-- /.main.container-fluid -->
+[% END %]
     [% PROCESS cancel_modal %]
 
 [% MACRO jsinclude BLOCK %]
@@ -602,7 +584,6 @@
             }));
             active_datatable = requested_datatable;
             activateBatchActions( active_tab );
-            $(".starthidden").show();
         });
 
         function activateBatchActions( active_tab ){
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt
index 712ca6c447..5f58c3f908 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt
@@ -41,11 +41,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' %]
+[% WRAPPER 'main-container.inc' aside='biblio-view-menu' %]
 
                 <h1>
                     [% IF ( author ) %]
@@ -94,16 +90,7 @@
     </table>
 </div> <!-- /.page-section -->
 
-            </main>
-        </div> <!-- /.col-md-10.order-md-2 -->
-
-        <div class="col-md-2 order-sm-2 order-md-1">
-            <aside>
-                [% INCLUDE 'biblio-view-menu.inc' %]
-            </aside>
-        </div> <!-- /.col-md-2.order-md-1 -->
-     </div> <!-- /.row -->
-</div> <!-- /.main.container-fluid -->
+[% END %]
 
 [% MACRO jsinclude BLOCK %]
     <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt
index 9d6fce2474..965507e56b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt
@@ -28,15 +28,8 @@
     [% END #/ WRAPPER breadcrumbs %]
 [% END #/ WRAPPER sub-header.inc %]
 
-<div class="main container-fluid">
-    <div class="row">
-        [% IF Koha.Preference('CircSidebar') %]
-            <div class="col-md-10 order-md-2 order-sm-1">
-        [% ELSE %]
-            <div class="col-md-10 offset-md-1 col-lg-8 offset-lg-2">
-        [% END %]
-            <main>
-                [% INCLUDE 'messages.inc' %]
+[% SET aside = Koha.Preference('CircSidebar') ? 'circ-nav' : '' %]
+[% WRAPPER 'main-container.inc' aside=aside %]
 
 <h1>Circulation: Overdues at [% Branches.GetLoggedInBranchname | html %]</h1>
 
@@ -129,17 +122,5 @@
         </div>
     [% END %]
 
-                </main>
-            </div> <!-- /.col-md-10.order-md-2 -->
-
-            [% IF Koha.Preference('CircSidebar') %]
-                <div class="col-md-2 order-sm-2 order-md-1">
-                    <aside>
-                        [% INCLUDE 'circ-nav.inc' %]
-                    </aside>
-                </div> <!-- /.col-md-2.order-md-1 -->
-            [% END %]
-        </div> <!-- /.row -->
-    </div> <!-- /.main.container-fluid -->
-
+[% END %]
 [% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt
index 7a9864a3bd..4a492ca25a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt
@@ -52,15 +52,8 @@
         [% END #/ WRAPPER breadcrumbs %]
     [% END #/ WRAPPER sub-header.inc %]
 
-    <div class="main container-fluid">
-        <div class="row">
-            [% IF Koha.Preference('CircSidebar') %]
-                <div class="col-md-10 order-md-2 order-sm-1">
-            [% ELSE %]
-                <div class="col-md-10 offset-md-1 col-lg-8 offset-lg-2">
-            [% END %]
-                <main>
-                    [% INCLUDE 'messages.inc' %]
+    [% SET aside = Koha.Preference('CircSidebar') ? 'circ-nav' : '' %]
+    [% WRAPPER 'main-container.inc' aside=aside %]
 
                     [% IF ( found ) %]
                         [% BLOCK transfer_hidden_fields %]
@@ -282,19 +275,7 @@
                             </div> <!-- /.page-section -->
                         [% END # /IF trsfitemloop%]
                     [% END # /IF found %]
-                </main>
-            </div> <!-- /.col-md-10... -->
-
-            [% IF Koha.Preference('CircSidebar') %]
-                <div class="col-md-2 order-sm-2 order-md-1">
-                    <aside>
-                        [% INCLUDE 'circ-nav.inc' %]
-                    </aside>
-                </div> <!-- /.col-md-2 order-sm-2 order-md-1 -->
-            [% END %]
-        </div> <!-- /.row -->
-    </div> <!-- /.main.container-fluid -->
-
+[% END %]
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'select2.inc' %]
     <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt
index 73d9e1ecb7..0bb357b2df 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt
@@ -31,20 +31,8 @@
     [% 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 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' %]
-
+[% SET aside = Koha.Preference('CircSidebar') ? 'circ-nav' : '' %]
+[% WRAPPER 'main-container.inc' aside=aside %]
             <h1>Checkout notes</h1>
 
             <div class="alert alert-warning" id="error" style="display:none;"></div>
@@ -122,20 +110,7 @@
                 <div class="alert alert-info">There are currently no checkout notes.</div>
             [% END %] <!-- notes -->
 
-                    </div>
-                    [% IF Koha.Preference('CircSidebar') %]
-                        <div class="col-md-2 order-sm-2 order-md-1">
-                            <aside>
-                                [% INCLUDE 'circ-nav.inc' %]
-                            </aside>
-                        </div> <!-- /.col-md-2.order-md-1 -->
-                    [% END %]
-
-                </div> <!-- /.row -->
-            </main>
-        </div> <!-- /.col-sm-12 -->
-    </div> <!-- /.row -->
-</div> <!-- /.main.container-fluid -->
+[% END %]
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'calendar.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt
index f43831508d..0ceb512cfa 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt
@@ -22,10 +22,7 @@
     [% END #/ WRAPPER breadcrumbs %]
 [% END #/ WRAPPER sub-header.inc %]
 
-    <div class="main container-fluid">
-        <div class="row">
-            <div class="col-md-10 offset-md-1 col-lg-8 offset-lg-2">
-                [% INCLUDE 'messages.inc' %]
+[% WRAPPER 'main-container.inc' %]
 
                 <h1>Circulation</h1>
 
@@ -182,8 +179,5 @@
                             </div>
                     </div>
                 </div>
-            </div>
-        </div>
-    </div> <!-- /.main.container-fluid -->
-
+[% END %]
 [% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
index 678b72b244..f07df29ed1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -50,11 +50,10 @@
         [% END #/ WRAPPER breadcrumbs %]
     [% END #/ WRAPPER sub-header.inc %]
 
-    <div class="main container-fluid">
-        <main>
-            <div class="row">
-                <div class="col-md-10 order-md-2 order-sm-1">
-                    [% INCLUDE 'messages.inc' %]
+    [% SET asides = [] %]
+    [% IF Koha.Preference('CircSidebar') && !( borrowernumber && patron ) %][% asides.push('circ-nav') %][% END %]
+    [% IF borrowernumber && patron %][% asides.push('circ-menu') %][% END %]
+    [% WRAPPER 'main-container.inc' asides=asides %]
 
                     [% IF patron %]
                         [% INCLUDE 'members-toolbar.inc' %]
@@ -941,31 +940,7 @@
                 [% ELSIF borrowernumber # IF patron %]
                     <div class="alert alert-info">Patron not found. <a href="/cgi-bin/koha/members/members-home.pl">Return to search</a></div>
                 [% END # /IF patron %]
-
-                </div> <!-- /.col-md-10.order-md-2 -->
-
-                [% IF Koha.Preference('CircSidebar') %]
-                    [% IF not( borrowernumber and patron ) %]
-                        <div class="col-md-2 order-sm-2 order-md-1">
-                            <aside>
-                                [% INCLUDE 'circ-nav.inc' %]
-                            </aside>
-                        </div> <!-- /.col-md-2.order-md-1 -->
-                    [% END %]
-                [% END %]
-
-                [% IF borrowernumber and patron %]
-                    <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 -->
-        </main>
-    </div> <!-- /.main.container-fluid -->
-
+    [% END %]
         [% IF Koha.Preference('ClaimReturnedLostValue') || Koha.Preference('BundleLostValue') %]
             [% INCLUDE 'modals/resolve_return_claim.inc' %]
         [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
index d3e2175ee0..c2aa0f53ef 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
@@ -42,16 +42,8 @@
     [% END #/ WRAPPER breadcrumbs %]
 [% END #/ WRAPPER sub-header.inc %]
 
-<div class="main container-fluid">
-    <div class="row">
-        [% IF patron %]
-            [% 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 %]">
-            <main>
-                [% INCLUDE 'messages.inc' %]
+[% SET aside = Koha.Preference('CircSidebar') ? 'circ-nav' : '' %]
+[% WRAPPER 'main-container.inc' aside=aside %]
                 [% IF patron %]
                     [% INCLUDE 'members-toolbar.inc' %]
                 [% END %]
@@ -161,17 +153,7 @@
     <div class="alert alert-info">This patron does not exist. <a href="/cgi-bin/koha/members/members-home.pl">Find another patron?</a></div>
 [% END %]
 
-                  </main>
-                      </div> <!-- /.col-md-10.order-md-2 -->
-                      [% IF patron %]
-                          <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 %]
 
 [% BLOCK checkouts_table %]
 <div class="page-section">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt
index c362c20c78..d406751938 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt
@@ -82,19 +82,8 @@
     [% END %]
 [% END %]
 
-<div class="main container-fluid">
-    <div class="row">
-        <div class="col-sm-12">
-            <main>
-                [% INCLUDE 'messages.inc' %]
-                <div class="row">
-                [% IF Koha.Preference('CircSidebar') %]
-                    [% SET div_class = 'col-md-10 order-md-2 order-sm-1' %]
-                [% ELSE %]
-                    [% SET div_class = 'col-sm-12' %]
-                [% END %]
-                <div class="[% div_class | html %]">
-
+[% SET aside = Koha.Preference('CircSidebar') ? 'circ-nav' : '' %]
+[% WRAPPER 'main-container.inc' aside=aside %]
                 <h1>Curbside pickups</h1>
 
                 [% UNLESS policy.enabled %]
@@ -484,19 +473,7 @@
                     [% END # /WRAPPER tab_panels %]
                 [% END # /WRAPPER tabs %]
 
-                </div>
-                [% IF Koha.Preference('CircSidebar') %]
-                        <div class="col-md-2 order-sm-2 order-md-1">
-                            <aside>
-                                [% INCLUDE 'circ-nav.inc' %]
-                            </aside>
-                        </div> <!-- /.col-md-2.order-md-1 -->
-                [% END %]
-                </div>
-            </main>
-        </div>
-    </div> <!-- /.row -->
-</div> <!-- /.main.container-fluid -->
+[% END %]
 
 [% MACRO jsinclude BLOCK %]
     [% Asset.js("lib/dayjs/plugin/isSameOrAfter.js") | $raw %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt
index 34fe18ef77..7b3994d199 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt
@@ -31,19 +31,8 @@
     [% 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 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' %]
+[% SET aside = Koha.Preference('CircSidebar') ? 'circ-nav' : '' %]
+[% WRAPPER 'main-container.inc' aside=aside %]
 
         <h1>Pending on-site checkouts</h1>
         [% IF pending_onsite_checkouts %]
@@ -87,20 +76,7 @@
           <h3>No pending on-site checkout.</h3>
         [% END %]
 
-                </div>
-                    [% IF Koha.Preference('CircSidebar') %]
-                            <div class="col-md-2 order-sm-2 order-md-1">
-                                <aside>
-                                    [% INCLUDE 'circ-nav.inc' %]
-                                </aside>
-                            </div> <!-- /.col-md-2.order-md-1 -->
-                    [% END %]
-                </div>
-
-            </main>
-        </div> <!-- /.col-sm-12 -->
-    </div> <!-- /.row -->
-</div> <!-- /.main.container-fluid -->
+[% END %]
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'datatables.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt
index 0771a36589..98224219e7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt
@@ -31,20 +31,8 @@
     [% 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 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' %]
-
+[% SET aside = Koha.Preference('CircSidebar') ? 'circ-nav' : '' %]
+[% WRAPPER 'main-container.inc' aside=aside %]
                 [% IF error %]
                     <div class="alert alert-warning">
                         <h1>Cannot renew:</h1>
@@ -246,20 +234,7 @@
                 </form>
             [% END %]
 
-                </div> <!-- /.col-md-10.order-md-2 -->
-                    [% IF Koha.Preference('CircSidebar') %]
-                            <div class="col-md-2 order-sm-2 order-md-1">
-                                <aside>
-                                    [% INCLUDE 'circ-nav.inc' %]
-                                </aside>
-                            </div> <!-- /.col-md-2.order-md-1 -->
-                    [% END %]
-                        </div> <!-- /.row -->
-
-            </main>
-        </div> <!-- /.col-sm-12 -->
-    </div> <!-- /.row -->
-</div> <!-- /.main.container-fluid -->
+[% END %]
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'calendar.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt
index 55123d2540..ebea690bf0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt
@@ -92,11 +92,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' %]
+[% WRAPPER 'main-container.inc' aside='biblio-view-menu' %]
 
                     <h1>Request article from [% INCLUDE 'biblio-title.inc' link = 1 %]</h1>
                     [% IF error_message %]
@@ -350,17 +346,7 @@
                         </fieldset>
                         [% PROCESS cancel_modal %]
                     [% END %]
-
-            </main>
-        </div> <!-- /.col-md-10.order-md-2 -->
-
-        <div class="col-md-2 order-sm-2 order-md-1">
-            <aside>
-                [% INCLUDE 'biblio-view-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/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
index ffdf709a97..14e722d741 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
@@ -55,19 +55,8 @@
         [% 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 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' %]
+    [% SET aside = Koha.Preference('CircSidebar') ? 'circ-nav' : '' %]
+    [% WRAPPER 'main-container.inc' aside=aside %]
 
                         [% BLOCK all_checkin_messages %]
                             [% IF hold_auto_filled %]
@@ -1384,20 +1373,8 @@
                             </div><!-- /.page-section -->
                         [% END # /IF riloop %]
 
-                    </div>
-                    [% IF Koha.Preference('CircSidebar') %]
-                            <div class="col-md-2 order-sm-2 order-md-1">
-                                <aside>
-                                    [% INCLUDE 'circ-nav.inc' %]
-                                </aside>
-                            </div> <!-- /.col-md-2.order-md-1 -->
-                    [% END %]
-                    </div> <!-- /.row -->
 
-                </main>
-            </div> <!-- /.col-sm-12 -->
-        </div> <!-- /.row -->
-    </div> <!-- /.main.container-fluid -->
+    [% END %]
 
     [% IF ( ReturnClaims ) %]
         [% INCLUDE 'modals/resolve_return_claim.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt
index df4cf10291..121a5e31e3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt
@@ -37,18 +37,8 @@
     [% 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 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' %]
+[% SET aside = Koha.Preference('CircSidebar') ? 'circ-nav' : '' %]
+[% WRAPPER 'main-container.inc' aside=aside %]
                     <h1>Set library</h1>
                     <form method="post" action="/cgi-bin/koha/circ/set-library.pl" id="set-library-form">
                         [% INCLUDE 'csrf-token.inc' %]
@@ -103,18 +93,6 @@
                         </div>
                     </form>
                     <!-- /updated -->
-                    </div> <!-- /.col-md-10... -->
-                    [% IF Koha.Preference('CircSidebar') %]
-                        <div class="col-md-2 order-sm-2 order-md-1">
-                            <aside>
-                                [% INCLUDE 'circ-nav.inc' %]
-                            </aside>
-                        </div> <!-- /.col-md-2 order-sm-2 order-md-1 -->
-                    [% END %]
-                </div> <!-- /.row -->
-            </main>
-        </div> <!-- /.col-sm-12 -->
-    </div> <!-- /.row -->
-</div> <!-- /.main.container-fluid -->
+[% END %]
 
 [% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfers_to_send.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfers_to_send.tt
index e9d476ffc3..b23c211621 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfers_to_send.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfers_to_send.tt
@@ -32,19 +32,8 @@
     [% END #/ WRAPPER breadcrumbs %]
 [% END #/ WRAPPER sub-header.inc %]
 
-<div class="main container-fluid">
-    <div class="row">
-        <div class="col-sm-12">
-            <main>
-                [% INCLUDE 'messages.inc' %]
-                <div class="row">
-
-                    [% IF 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 %]">
+[% SET aside = Koha.Preference('CircSidebar') ? 'circ-nav' : '' %]
+[% WRAPPER 'main-container.inc' aside=aside %]
 
                         <h1>Transfers requested of your library as of [% show_date | $KohaDates %]</h1>
 
@@ -101,21 +90,7 @@
                         <p>No transfers to send</p>
                         [% END %]
 
-                    </div> <!-- /.col-sm-10.col-sm-push-2 OR /.col-md-10 offset-md-1 col-lg-8 offset-lg-2-->
-
-                    [% IF Koha.Preference('CircSidebar') %]
-                    <div class="col-md-2 order-sm-2 order-md-1">
-                        <aside>
-                            [% INCLUDE 'circ-nav.inc' %]
-                        </aside>
-                    </div> <!-- /.col-md-2.order-md-1 -->
-                    [% END %]
-
-                </div> <!-- /.row -->
-            </main>
-        </div> <!-- /.col-sm-12 -->
-    </div> <!-- /.row -->
-</div> <!-- /.main.container-fluid -->
+[% END %]
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'datatables.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt
index 6233d7f377..cfe81f67e5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt
@@ -30,19 +30,8 @@
     [% 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 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' %]
+[% SET aside = Koha.Preference('CircSidebar') ? 'circ-nav' : '' %]
+[% WRAPPER 'main-container.inc' aside=aside %]
 
         <h1>Transfers made to your library as of [% show_date | $KohaDates %]</h1>
 	[% IF ( branchesloop ) %]
@@ -106,20 +95,7 @@
         <p>No transfers to receive</p>
     [% END %]
 
-                </div> <!-- /.col-md-10.order-md-2 -->
-                    [% IF Koha.Preference('CircSidebar') %]
-                            <div class="col-md-2 order-sm-2 order-md-1">
-                                <aside>
-                                    [% INCLUDE 'circ-nav.inc' %]
-                                </aside>
-                            </div> <!-- /.col-md-2.order-md-1 -->
-                    [% END %]
-                </div> <!-- /.row -->
-
-            </main>
-        </div> <!-- /.col-sm-12 -->
-    </div> <!-- /.row -->
-</div> <!-- /.main.container-fluid -->
+[% END %]
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'datatables.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
index 74d6bd7388..7a9fb6abfd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
@@ -32,19 +32,8 @@
     [% 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 Koha.Preference('CircSidebar') %]
-                        [% SET div_class='col-md-10 order-md-2 order-sm-1' %]
-                    [% ELSE %]
-                        [% SET div_class='col-sm-12' %]
-                    [% END %]
-                    <div class="[% div_class | html %]">
-                    [% INCLUDE 'messages.inc' %]
+[% SET aside = Koha.Preference('CircSidebar') ? 'circ-nav' : '' %]
+[% WRAPPER 'main-container.inc' aside=aside %]
 
                         <h1>Holds awaiting pickup for your library on: [% show_date | $KohaDates %]</h1>
                         <h2>
@@ -161,22 +150,7 @@
                             [% END # /WRAPPER tabs %]
 
                         [% END # /IF ( cancel_result ) %]
-                    </div> <!-- /.col-md-10.order-md-2 -->
-
-                    [% IF Koha.Preference('CircSidebar') %]
-                        <div class="col-md-2 order-sm-2 order-md-1">
-                            <aside>
-                                [% INCLUDE 'circ-nav.inc' %]
-                            </aside>
-                        </div> <!-- /.col-md-2.order-md-1 -->
-                    [% END %]
-                </div> <!-- /.row -->
-
-            </main>
-        </div> <!-- /.col-sm-12 -->
-    </div> <!-- /.row -->
-</div> <!-- /.main.container-fluid -->
-
+    [% END %]
     <div id="cancelModal" class="modal" tabindex="-1" role="dialog" aria-hidden="true">
         <div class="modal-dialog">
             <div class="modal-content">