diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt
index 5722e19d29..50b8a554c6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt
@@ -112,15 +112,13 @@
 [% END #/ WRAPPER sub-header.inc %]
 
 [% IF op == 'add_form' %]
-<div class="main container-fluid">
-    <div class="row">
-        <div class="col-md-10 offset-md-1 col-lg-8 offset-lg-2">
+    [% SET div_class="col-md-10 offset-md-1 col-lg-8 offset-lg-2" %]
 [% ELSE %]
+    [% SET div_class="col-md-10 order-md-2 order-sm-1" %]
+[% END %]
 <div class="main container-fluid">
     <div class="row">
-        <div class="col-md-10 order-md-2 order-sm-1">
-[% END %]
-
+        <div class="[% div_class | html %]">
 <main>
     [% INCLUDE 'messages.inc' %]
 
@@ -153,8 +151,8 @@
 
 </main>
 
+        </div> <!-- /.col-md-10.order-md-2 -->
         [% IF op != 'add_form' %]
-            </div> <!-- /.col-md-10.order-md-2 -->
 
             <div class="col-md-2 order-sm-2 order-md-1">
                 <aside>
@@ -401,7 +399,7 @@
                     <tbody>
                         [% FOREACH c IN additional_contents%]
                             [% SET default_localization = c.default_localization %]
-                            [% IF ( c.is_expired ) %]<tr class="expired">[% ELSE %]<tr>[% END %]
+                            <tr [% IF c.is_expired %]class="expired"[% END %]>
                             <td>
                                 <input type="checkbox" name="ids" value="[% c.id | html %]" />
                             </td>