diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorder.tt
index 7ac2e23f23..20e28e953f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorder.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorder.tt
@@ -40,5 +40,6 @@
           </div>
         </form>
       [% END %]
+    </div> <!-- /.container-fluid -->
 
 [% INCLUDE "intranet-bottom.inc" %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
index 16efc80b81..06949b61ba 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
@@ -598,5 +598,6 @@
                 [% END # /IF ( batch_details ) %]
             </div> [% # /div.col-sm-6 %]
         </div> [% # /div.row %]
+    </div> <!-- /.container-fluid -->
 
 [% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
index 8278005b2f..01a9d75ba3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
@@ -369,6 +369,7 @@
             </aside>
         </div>
     </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'datatables.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt
index 8a61815b19..d8a9d7b4f5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt
@@ -51,5 +51,6 @@
             </aside>
         </div>
     </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt
index 26bd4606c7..ff8405c46b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt
@@ -92,5 +92,6 @@
     </aside>
 </div> <!-- /.col-md-2.order-md-1 -->
 </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/vendor_issues.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/vendor_issues.tt
index d1bb35e794..ede5edcb07 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/vendor_issues.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/vendor_issues.tt
@@ -219,6 +219,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% Asset.js("js/acquisitions-menu.js") | $raw %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/curbside_pickup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/curbside_pickup.tt
index b211da4e6e..1c56c847e3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/curbside_pickup.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/curbside_pickup.tt
@@ -184,6 +184,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% Asset.js("js/admin-menu.js") | $raw %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_provider_domains.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_provider_domains.tt
index 9931faf2ae..e82c7cf46e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_provider_domains.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_provider_domains.tt
@@ -325,7 +325,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
-
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% Asset.js("js/admin-menu.js") | $raw %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_providers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_providers.tt
index 3099c50c03..ec48f2cd3f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_providers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_providers.tt
@@ -397,6 +397,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 
 [% MACRO jsinclude BLOCK %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/ill_batch_statuses.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/ill_batch_statuses.tt
index a8d41d04a2..3b93a4adba 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/ill_batch_statuses.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/ill_batch_statuses.tt
@@ -158,6 +158,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
     </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% Asset.js("js/admin-menu.js") | $raw %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_order_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_order_accounts.tt
index 4759d6aec2..dc8af9d4ae 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_order_accounts.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_order_accounts.tt
@@ -295,6 +295,7 @@ MARC order accounts
             </aside>
         </div> <!-- /.col-sm-2.col-sm-pull-10 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% Asset.js("js/admin-menu.js") | $raw %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_servers.tt
index e4162e41a1..779bbe81d3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_servers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_servers.tt
@@ -186,6 +186,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% Asset.js("js/admin-menu.js") | $raw %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/record_sources.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/record_sources.tt
index 3ceff70493..8b1b0f206a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/record_sources.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/record_sources.tt
@@ -20,7 +20,7 @@
     [% INCLUDE 'prefs-admin-search.inc' %]
 [% END %]
 
-<div id="record-source"> <!-- this is closed in intranet-bottom.inc -->
+<div id="record-source"></div>
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'calendar.inc' %] <!-- FIXME: this shouldn't be needed -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt
index dffd3e7c23..1c33a8f3d0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt
@@ -252,6 +252,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% Asset.js("js/admin-menu.js") | $raw %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/search_filters.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/search_filters.tt
index 16fc0796d3..1560b74477 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/search_filters.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/search_filters.tt
@@ -67,6 +67,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
     <div id="edit_search_filter_modal" class="modal" role="dialog" aria-hidden="true" aria-labelledby="edit_search_filter_modal_label">
         <div class="modal-dialog modal-lg">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/bookings/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/bookings/list.tt
index 6a1061403f..76716100e8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/bookings/list.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/bookings/list.tt
@@ -68,6 +68,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
     </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
     [% INCLUDE modals/cancel_booking.inc %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
index 799a26e6c8..fab93ca4be 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
@@ -1273,5 +1273,6 @@ $(document).ready(function(){
 
         </div> <!-- /.col-md-10.offset-md-1 -->
     </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
index a41569fe99..a4974874f7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
@@ -404,6 +404,7 @@
             </main>
         </div> <!-- /.col-sm-12 -->
     </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/cataloging-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/cataloging-home.tt
index 0bfd275638..43664dc8fd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/cataloging-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/cataloging-home.tt
@@ -228,6 +228,7 @@
 
             </div>
         </div>
+    </div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
 <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt
index 20b3d8bdd8..d1bf694cfb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt
@@ -68,6 +68,7 @@
                 </aside>
             </div> <!-- /.col-sm-2 order-sm-2 order-md-1 -->
         </div> <!-- /.row -->
+    </div> <!-- /.main.container-fluid -->
 
         [% INCLUDE 'modals/display_ticket.inc' %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt
index f9dfcd973c..6cddc7e3c1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt
@@ -79,4 +79,7 @@
 	[% END %]
     [% END %]
 [% END %]
+        </div> <!-- /.col-md-10.offset-md-1.col-lg-8.offset-lg-2 -->
+    </div> <!-- /.row -->
+</div> <!-- /.container-fluid -->
 [% INCLUDE 'intranet-bottom.inc' %]
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 641743e9ce..9d6fce2474 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt
@@ -140,5 +140,6 @@
                 </div> <!-- /.col-md-2.order-md-1 -->
             [% END %]
         </div> <!-- /.row -->
+    </div> <!-- /.main.container-fluid -->
 
 [% 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 7f10546a90..7a9864a3bd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt
@@ -293,6 +293,7 @@
                 </div> <!-- /.col-md-2 order-sm-2 order-md-1 -->
             [% END %]
         </div> <!-- /.row -->
+    </div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'select2.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 656dfd4d1f..f43831508d 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
@@ -184,5 +184,6 @@
                 </div>
             </div>
         </div>
+    </div> <!-- /.main.container-fluid -->
 
 [% INCLUDE 'intranet-bottom.inc' %]
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 cfa7249b86..3397042978 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
@@ -495,6 +495,7 @@
             </main>
         </div>
     </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% Asset.js("lib/dayjs/plugin/isSameOrAfter.js") | $raw %]
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 073ef57e68..3be5dc41c3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingbookings.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingbookings.tt
@@ -106,8 +106,8 @@
                     [% INCLUDE 'circ-nav.inc' %]
                 </aside>
             </div>
-        </div>
-        <!-- /.row -->
+        </div> <!-- /.row -->
+    </div> <!-- /.main.container-fluid -->
 
         [% MACRO jsinclude BLOCK %]
         [% INCLUDE 'calendar.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt
index fd36a77f88..6a23f57c98 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt
@@ -54,5 +54,6 @@
         <div class="pagebreak"></div>
         [% END %]
     [% END %]
+    </div> <!-- /#receipt -->
 
 [% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/invalid-course.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/invalid-course.tt
index 166b0fcba5..a10587bc21 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/invalid-course.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/invalid-course.tt
@@ -36,5 +36,6 @@
 
         </div>
     </div>
+</div> <!-- /.main.container-fluid -->
 
 [% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/errorpage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/errorpage.tt
index aca96436fc..f22c4ac071 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/errorpage.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/errorpage.tt
@@ -50,5 +50,6 @@
 
             </div> <!-- /.col-md-8 -->
         </div> <!-- /.row -->
+    </div> <!-- /.main.container-fluid -->
 
 [% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/alert-subscriptions.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/alert-subscriptions.tt
index 30521c9908..933c186937 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/alert-subscriptions.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/alert-subscriptions.tt
@@ -98,6 +98,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'str/members-menu.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt
index 05f487f025..555561f320 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt
@@ -92,6 +92,7 @@
     </div>
     </div>
 </div>
+</div> <!-- /.container-fluid -->
 
     <nav class="navbar navbar-default fixed-bottom">
         <div class="container-fluid">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/enqueue_koc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/enqueue_koc.tt
index f66393eaea..b5f3da992c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/enqueue_koc.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/enqueue_koc.tt
@@ -48,5 +48,6 @@
             </div> <!-- /.page-section -->
         </div>
     </div>
+</div> <!-- /.main.container-fluid -->
 
 [% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt
index 33238bdb52..b31c9320e2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt
@@ -44,5 +44,6 @@
             </aside>
         </div> <!-- .col-sm-2.order-sm-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt
index 3cdab42ea0..f0e97ec11b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt
@@ -164,6 +164,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'greybox.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt
index 5282c640e8..e32d424496 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt
@@ -115,7 +115,7 @@
                 </fieldset>
             </form>
             [% END %]
-    </div>
+    </div> <!-- /.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'greybox.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-disabled.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-disabled.tt
index 816e33e0ae..5e6d71d1a5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-disabled.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-disabled.tt
@@ -39,5 +39,6 @@
                 [% END %]
             </div>
         </div>
+    </div> <!-- /.container-fluid -->
 
 [% INCLUDE 'intranet-bottom.inc' %]
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 86187d44a1..cce5ccacfc 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
@@ -267,6 +267,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% Asset.js("js/tools-menu.js") | $raw %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt
index c576b51b28..cca7fc72d9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt
@@ -69,5 +69,6 @@
 
             </div>
         </div>
+    </div> <!-- /.main.container-fluid -->
 
 [% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt
index 43d2564645..f3693b24e7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt
@@ -183,6 +183,7 @@
         </aside>
     </div>
 </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 <!-- Email receipt modal -->
 <div class="modal" id="emailReceiptModal" tabindex="-1" role="dialog" aria-labelledby="emailReceiptLabel">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
index e449fef31c..3121464440 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
@@ -285,6 +285,7 @@
             </aside>
         </div>
     </div><!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
     <!-- Confirm cashup modal -->
     <div class="modal" id="confirmCashupModal" tabindex="-1" role="dialog" aria-labelledby="confirmCashupLabel">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt
index be750d4e5e..4e9b8f7891 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt
@@ -148,8 +148,8 @@
                 </aside>
             </div>
 
-        </div>
-        <!-- /.row -->
+        </div> <!-- /.row -->
+    </div> <!-- /.main.container-fluid -->
 
         <!-- Confirm cashup modal -->
         <div class="modal" id="confirmCashupModal" tabindex="-1" role="dialog" aria-labelledby="confirmCashupLabel">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_old_queue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_old_queue.tt
index 9488a6580b..f343cc9102 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_old_queue.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_old_queue.tt
@@ -59,7 +59,7 @@
         [% END %]
 
     </div> <!-- /.row -->
-</div>
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'datatables.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_overdue.tt
index 61bbb246e8..09dfaa54aa 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_overdue.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_overdue.tt
@@ -71,7 +71,7 @@
         [% END %]
 
     </div> <!-- /.row -->
-</div>
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'columns_settings.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_queue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_queue.tt
index 112bdaa7fb..db0546e72d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_queue.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_queue.tt
@@ -71,7 +71,7 @@
         [% END %]
 
     </div> <!-- /.row -->
-</div>
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'datatables.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_to_pull.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_to_pull.tt
index b2af89c052..730a6cf0a7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_to_pull.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_to_pull.tt
@@ -159,7 +159,7 @@
         [% END %]
 
     </div> <!-- /.row -->
-</div>
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'datatables.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_waiting.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_waiting.tt
index a2adf81e9b..6e2f385651 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_waiting.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_waiting.tt
@@ -160,6 +160,7 @@
         [% END %]
 
     </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'datatables.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt
index e0cc08369a..ab3888fdad 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt
@@ -341,6 +341,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'calendar.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt
index 97b933b791..7bfc2a49af 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt
@@ -229,6 +229,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'calendar.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt
index e65914b3ed..f3f1e82bb2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt
@@ -153,6 +153,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'calendar.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt
index a53f6212c5..93d8f13477 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt
@@ -331,6 +331,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'calendar.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt
index de68d3cedd..f0437f91ed 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt
@@ -211,6 +211,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'datatables.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt
index 4e83c3e0df..59d4a927c5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt
@@ -223,6 +223,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'calendar.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt
index 70e20b5be3..2af8a4ee41 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt
@@ -338,6 +338,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'calendar.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt
index 660ec26ad9..0841b8aee2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt
@@ -325,6 +325,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'calendar.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
index cdba5aad88..e9d3cdcdb0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
@@ -1501,6 +1501,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
     </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
     <!-- Runtime Parameters Modal -->
     <div class="modal" id="runtime_parameters" tabindex="-1" role="dialog" aria-labelledby="runtime_parametersLabel">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt
index 98f58de4c7..f4e6fcc1f7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt
@@ -266,7 +266,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
-
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'calendar.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt
index b9bdf2931a..e6cfa5aa9c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt
@@ -406,6 +406,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'calendar.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt
index 48baa773a7..ec24bc54e4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt
@@ -203,6 +203,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'datatables.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt
index b280d104d4..13cd7aeafb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt
@@ -105,6 +105,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% IF ( do_it ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt
index 3073fe35cb..e4e994afd2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt
@@ -170,6 +170,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'datatables.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt
index 591608e743..741985ca55 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt
@@ -357,6 +357,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'calendar.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt
index 551efed083..e677101b2d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt
@@ -165,6 +165,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
 [% INCLUDE 'datatables.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
index 22bd8a8ab9..21f681da6f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
@@ -1478,6 +1478,7 @@
             [% INCLUDE 'csrf-token.inc' %]
         </form>
     </div>
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'datatables.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt
index 41613af467..a7acfdb7c5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt
@@ -140,6 +140,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% Asset.js("js/tools-menu.js") | $raw %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt
index 4ffc6f2efb..d2b6969f07 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt
@@ -160,6 +160,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% Asset.js("js/tools-menu.js") | $raw %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt
index 0ddb8571fb..620f089727 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt
@@ -189,6 +189,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% Asset.js("js/tools-menu.js") | $raw %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt
index 4daac7af84..a1d6d1fc7d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt
@@ -87,6 +87,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'datatables.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/transferCollection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/transferCollection.tt
index 17aa5632a6..a8755aaa77 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/transferCollection.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/transferCollection.tt
@@ -102,6 +102,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% Asset.js("js/tools-menu.js") | $raw %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tt
index 6f03b3a2f8..d98002392c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tt
@@ -51,6 +51,7 @@
         </fieldset>
     </div>
 </nav>
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
   <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search.tt
index 6940821358..bf4f111438 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search.tt
@@ -32,5 +32,6 @@
             </div>
         </nav>
     </form>
+</div> <!-- /.main.container-fluid -->
 
 [% INCLUDE 'intranet-bottom.inc' popup_window=1 %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt
index e00a8eb259..de0b48b51f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt
@@ -152,6 +152,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'calendar.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt
index 8972144c20..dedfe88b6f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt
@@ -238,6 +238,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'calendar.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt
index 8292fa5292..6d75ad60dc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt
@@ -78,6 +78,7 @@
         </fieldset>
     </div>
 </nav>
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt
index 9ed4b94dad..4ab00d128a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt
@@ -63,6 +63,7 @@
         </fieldset>
     </div>
 </nav>
+</div> <!-- /.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt
index c82d16c102..fcc6f55318 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt
@@ -87,6 +87,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
      <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt
index ca9572fb3d..c62f7c7f70 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt
@@ -141,6 +141,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 [% MACRO jsinclude BLOCK %]
     <script>
         $(document).ready(function(){
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
index 25de1031a8..f2fd895dee 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
@@ -338,6 +338,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'datatables.inc' %]
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 cdb1b2dfff..dddb239117 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
@@ -538,5 +538,6 @@ $(document).ready(function() {
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt
index a1468d0695..b570a9df6c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt
@@ -54,7 +54,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
-</div>
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'calendar.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
index 8305cebeaf..6e7b892e67 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
@@ -309,6 +309,7 @@
                 </aside>
             </div> <!-- /.col-md-2.order-md-1 -->
         </div> <!-- /.row -->
+    </div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'calendar.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt
index 92ef18ee25..595d8563d1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt
@@ -172,6 +172,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
     </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
     [% Asset.js("js/additional-fields-entry.js") | $raw %]
     [% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tt
index 691f7be272..e0404eb5aa 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tt
@@ -61,5 +61,6 @@
         </div>
     </nav>
 </form>
+</div> <!-- /.main.container-fluid -->
 
 [% INCLUDE 'intranet-bottom.inc' popup_window=1 %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
index 53b43ff26e..cb61de5333 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
@@ -435,6 +435,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt
index ac0966b036..fbbe061492 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt
@@ -212,6 +212,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-history.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-history.tt
index d3ff9b71a6..f38c500b32 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-history.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-history.tt
@@ -95,6 +95,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'calendar.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt
index e9fbe2d539..517b7cd052 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt
@@ -337,6 +337,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% IF (daily_options) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt
index 13402548fa..4258a9631a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt
@@ -69,5 +69,6 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
index 8c2fcf15db..f9873a7cda 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
@@ -320,6 +320,7 @@
 
                 </div> <!-- /.col-md-8 offset-md-2 -->
             </div> <!-- /.row -->
+        </div> <!-- /.main.container-fluid -->
     [% ELSE # IF op == "show" %]
 
         [% IF op == 'save' %]
@@ -1267,6 +1268,7 @@
             [% END # /UNLESS ( op == 'show' ) %]
         [% END # /UNLESS op == 'save' %]
         </div> <!-- /.row -->
+    </div> <!-- /.main.container-fluid -->
 
     [% END # /IF op == "show" %]
 
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 a14552675e..e6a59ef84e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt
@@ -116,6 +116,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'datatables.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt
index 7a8cb64ed9..322a9b9cd1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt
@@ -313,6 +313,7 @@
                 </aside>
             </div> <!-- /.col-sm-2 order-sm-2 order-md-1 -->
         </div> <!-- /.row -->
+    </div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'datatables.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/access_files.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/access_files.tt
index 48f404aac6..7f8c4cd3d8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/access_files.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/access_files.tt
@@ -73,7 +73,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
     </div> <!-- /.row -->
-
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% Asset.js("js/tools-menu.js") | $raw %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt
index f24a88dc99..38a96c03a4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt
@@ -285,6 +285,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% Asset.js("js/automatic_item_modification_by_age.js") | $raw %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt
index b2b3161f21..5c3ff93d4f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt
@@ -260,6 +260,7 @@
                 </fieldset> <!-- /.action -->
             [% END %]
         </form>
+    </div> <!-- /.main.container-fluid -->
 
     [% MACRO jsinclude BLOCK %]
         [% Asset.js("lib/jquery/plugins/humanmsg.js") | $raw %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt
index 1afd94ba83..a17668dea0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt
@@ -99,5 +99,6 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt
index cdfb20d0fb..bd7e4f602c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt
@@ -257,6 +257,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'datatables.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt
index 0571a26bfb..049b8688bf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt
@@ -253,6 +253,7 @@
                 </aside>
             </div> <!-- /.col-md-2.order-md-1 -->
         </div> <!-- /.row -->
+    </div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% Asset.js("js/tools-menu.js") | $raw %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt
index e23050d091..7eb92d3ff5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt
@@ -299,6 +299,7 @@
                 </aside>
             </div> <!-- /.col-md-2.order-md-1 -->
         </div> <!-- /.row -->
+    </div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'datatables.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tt
index 07ee23b2a0..5ab0f88958 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tt
@@ -274,6 +274,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% Asset.js("js/tools-menu.js") | $raw %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt
index 377c0df9fe..20cc4aa521 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt
@@ -349,6 +349,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% Asset.js("js/tools-menu.js") | $raw %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt
index e016fb2335..dd35ece5d8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt
@@ -347,6 +347,7 @@
             </aside>
         </div> <!-- .col-sm-2.order-sm-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'calendar.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
index c6fc995716..49ebcb090b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
@@ -401,6 +401,7 @@
             </aside>
         </div> <!-- .col-sm-2.order-sm-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'calendar.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt
index 74435bfe9e..cf6a262bc8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt
@@ -449,6 +449,7 @@
             </aside>
         </div> <!-- .col-sm-2.order-sm-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'calendar.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt
index 86ef5690c5..32e4c736b6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt
@@ -409,6 +409,7 @@
             </aside>
         </div> <!-- .col-md-2 order-sm-2 order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'datatables.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
index bde0c920f1..53e90c4fb8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
@@ -604,6 +604,7 @@
             </div> <!-- /.col-md-2.order-md-1 -->
         </div> <!-- /.row -->
     [% END %]
+</div> <!-- /.main.container-fluid -->
 
 [% BLOCK message_templates %]
     [% WRAPPER accordion panelgroup_id="${lang}" %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
index 9ab8d7c9f8..eabb1846fc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
@@ -444,6 +444,7 @@
                 </aside>
             </div> <!-- .col-sm-2.order-sm-1 -->
         </div> <!-- /.row -->
+    </div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% Asset.js("lib/jquery/plugins/humanmsg.js") | $raw %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt
index 9b1b3ed628..3059893816 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt
@@ -383,6 +383,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'datatables.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt
index ed7cd00492..22c9f3cf60 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt
@@ -480,6 +480,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'calendar.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt
index 69973c1a56..f5e6229ef9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt
@@ -174,6 +174,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% Asset.js("js/tools-menu.js") | $raw %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/page.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/page.tt
index 7092097d24..5a632b9825 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/page.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/page.tt
@@ -67,7 +67,7 @@
                 </aside>
             </div> <!-- /.col-md-2.order-md-1 -->
         </div> <!-- /.row -->
-
+    </div> <!-- /.main.container-fluid -->
 [% MACRO jsinclude BLOCK %]
     [% Asset.js("js/tools-menu.js") | $raw %]
 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt
index 3ba8dfdfdc..4b62b4c612 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt
@@ -174,6 +174,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% Asset.js("js/tools-menu.js") | $raw %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/preview_letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/preview_letter.tt
index 7740d95287..105c593747 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/preview_letter.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/preview_letter.tt
@@ -80,7 +80,7 @@
                     </div>
                 </div>
             [% END %]
-        </div> <!-- /.main -->
+        </div> <!-- /.main.container-fluid -->
 
     </body>
 </html>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/problem-reports.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/problem-reports.tt
index 878bfdc8eb..586bb3fe91 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/problem-reports.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/problem-reports.tt
@@ -142,6 +142,7 @@
         </div> <!-- /.col-md-2.order-md-1 -->
 
     </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'calendar.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt
index 76367fb3c0..ed333e6b89 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt
@@ -99,6 +99,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% Asset.js("js/tools-menu.js") | $raw %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt
index 461d4b9816..afe1e1b7d7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt
@@ -172,6 +172,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% Asset.js("js/tools-menu.js") | $raw %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tt
index 1ea48ad54f..779dc1b852 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tt
@@ -122,6 +122,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% Asset.js("js/tools-menu.js") | $raw %]
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 edfe917fda..125ecc652e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt
@@ -78,6 +78,7 @@
         </div>
     </div>
     </main>
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% Asset.js("js/tools-menu.js") | $raw %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt
index 1ae924484e..a2d4f9f89c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt
@@ -259,6 +259,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% Asset.js("lib/jquery/plugins/humanmsg.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 ecf8094386..15fa05cbab 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt
@@ -661,6 +661,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
     </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'datatables.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt
index c63b73cbc8..a26bdcdb18 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt
@@ -199,5 +199,6 @@
             </div> <!-- /.row -->
         </div> <!-- /.col-md-10 -->
     </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt
index 35f04089d7..0091bb5046 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt
@@ -302,6 +302,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     <script>
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 5dfdafdcce..b14a9eda42 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt
@@ -347,7 +347,7 @@
         </div> <!-- .col-sm-12 -->
      </div> <!-- /.row -->
 [% END %]
-
+</div> <!-- /.main.container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
     [% Asset.js("js/tools-menu.js") | $raw %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
index 1998abf264..e4764e44e1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
@@ -344,6 +344,7 @@
             </aside>
         </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 <div class="modal" id="compareInfo" tabindex="-1" role="dialog" aria-labelledby="compareInfoLabel">
     <div class="modal-dialog modal-lg">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tt
index 03c06326d1..577868e5a9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tt
@@ -124,6 +124,7 @@
         </nav>
     </form>
 [% END %]
+</div> <!-- /.container-fluid -->
 
 [% SET popup_window = 1 %]
 [% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/downloadshelf.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/downloadshelf.tt
index 12df9cff84..57bced5b7c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/downloadshelf.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/downloadshelf.tt
@@ -49,6 +49,7 @@
     <input type="submit" name="save" class="btn btn-primary" value="Save" />  <a class="cancel close" href="#">Cancel</a>
     </fieldset>
     </form>
+</div> <!-- /#export -->
 
 [% END %]
 </body>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
index 926afb5c1f..c46c64ba12 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
@@ -562,6 +562,7 @@
         </main>
     </div> <!-- /.col-md-10.order-md-2 -->
 </div> <!-- /.row -->
+</div> <!-- /.main.container-fluid -->
 
 [% IF ( can_add_biblios ) %]
     <!-- Modal -->