From dbd85697ac07f02ef7367bfdbf26cef14ec2142b Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Wed, 30 Aug 2023 16:31:03 +0000
Subject: [PATCH] Bug 34661: Update UNIMARC cataloging plugins with consistent
 footers

This patch updates UNIMARC cataloging plugin templates so that they have
consistent fixed footers in the plugin popup window. Plugins for the
following UNIMARC fields have been updated:

000 (Leader) 123$f    128$a    181$b
100$a        123$g    128$b    182$2
105$a        123$i    128$c    182$a
106$a        123$j    130$a    182$c
110$a        124$a    135$a    183$2
115$a        124$b    140$a    183$a
115$b        124$c    141$a    210$c
116$a        124$d    146$a    225$a
117$a        124$e    146$c    225$a
120$a        124$f    146$d    283$2
121$a        124$g    146$e    283$a
121$b        125$a    146$f    325$h
122$a        125$b    146$h    325$j
123$a        126$a    146$i
123$d        126$b    181$2
123$e        127$a    181$a

Most of these will be pre-configured in a test system with default
UNIMARC data. In KTD you can use the 'reset_all_unimarc' command.

Go to Cataloging -> New record and test the plugin link for each of the
fields listed above.

  - In each case, confirm that the correct popup window is shown when
    you click the plugin link.
  - Confirm that clicking the "Cancel" button closes the window without
    copying any data to the field in the MARC editor.
    * Note that if the plugin is also triggered by cursor focus in the
      input field, some data may be automatically filled anyway.
  - Confirm that filing in data and clicking "Submit" will copy the
    correct information into the field.

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 .../value_builder/unimarc_field_100.tt        | 19 +++++++++++-----
 .../unimarc_field_100_authorities.tt          | 19 +++++++++++-----
 .../value_builder/unimarc_field_105.tt        | 19 +++++++++++-----
 .../value_builder/unimarc_field_106.tt        | 19 +++++++++++-----
 .../value_builder/unimarc_field_110.tt        | 18 ++++++++++-----
 .../value_builder/unimarc_field_115a.tt       | 18 ++++++++++-----
 .../value_builder/unimarc_field_115b.tt       | 18 ++++++++++-----
 .../value_builder/unimarc_field_116.tt        | 18 ++++++++++-----
 .../value_builder/unimarc_field_117.tt        | 19 +++++++++++-----
 .../value_builder/unimarc_field_120.tt        | 19 +++++++++++-----
 .../value_builder/unimarc_field_121a.tt       | 19 +++++++++++-----
 .../value_builder/unimarc_field_121b.tt       | 19 +++++++++++-----
 .../value_builder/unimarc_field_122.tt        | 19 +++++++++++-----
 .../value_builder/unimarc_field_123a.tt       | 19 +++++++++++-----
 .../value_builder/unimarc_field_123defg.tt    | 19 +++++++++++-----
 .../value_builder/unimarc_field_123i_j.tt     | 19 +++++++++++-----
 .../value_builder/unimarc_field_124a.tt       | 19 +++++++++++-----
 .../value_builder/unimarc_field_124b.tt       | 19 +++++++++++-----
 .../value_builder/unimarc_field_124c.tt       | 19 +++++++++++-----
 .../value_builder/unimarc_field_124d.tt       | 19 +++++++++++-----
 .../value_builder/unimarc_field_124e.tt       | 19 +++++++++++-----
 .../value_builder/unimarc_field_124f.tt       | 19 +++++++++++-----
 .../value_builder/unimarc_field_124g.tt       | 19 +++++++++++-----
 .../value_builder/unimarc_field_125a.tt       | 19 +++++++++++-----
 .../value_builder/unimarc_field_125b.tt       | 19 +++++++++++-----
 .../value_builder/unimarc_field_126a.tt       | 19 +++++++++++-----
 .../value_builder/unimarc_field_126b.tt       | 19 +++++++++++-----
 .../value_builder/unimarc_field_127.tt        | 19 +++++++++++-----
 .../value_builder/unimarc_field_128a.tt       | 19 +++++++++++-----
 .../value_builder/unimarc_field_128b.tt       | 19 +++++++++++-----
 .../value_builder/unimarc_field_128c.tt       | 19 +++++++++++-----
 .../value_builder/unimarc_field_130.tt        | 19 +++++++++++-----
 .../value_builder/unimarc_field_135a.tt       | 19 +++++++++++-----
 .../value_builder/unimarc_field_140.tt        | 18 +++++++++++----
 .../value_builder/unimarc_field_141.tt        | 19 +++++++++++-----
 .../value_builder/unimarc_field_146a.tt       | 21 ++++++++++--------
 .../value_builder/unimarc_field_146b.tt       | 22 ++++++++++---------
 .../value_builder/unimarc_field_146c.tt       | 22 ++++++++++---------
 .../value_builder/unimarc_field_146d.tt       | 22 ++++++++++---------
 .../value_builder/unimarc_field_146e.tt       | 21 ++++++++++--------
 .../value_builder/unimarc_field_146f.tt       | 21 ++++++++++--------
 .../value_builder/unimarc_field_146h.tt       | 21 ++++++++++--------
 .../value_builder/unimarc_field_146i.tt       | 21 ++++++++++--------
 .../value_builder/unimarc_field_181-2.tt      | 19 +++++++++++-----
 .../value_builder/unimarc_field_181a.tt       | 19 +++++++++++-----
 .../value_builder/unimarc_field_181b.tt       | 19 +++++++++++-----
 .../value_builder/unimarc_field_181c.tt       | 19 +++++++++++-----
 .../value_builder/unimarc_field_182-2.tt      | 19 +++++++++++-----
 .../value_builder/unimarc_field_182a.tt       | 19 +++++++++++-----
 .../value_builder/unimarc_field_182c.tt       | 19 +++++++++++-----
 .../value_builder/unimarc_field_183-2.tt      | 19 +++++++++++-----
 .../value_builder/unimarc_field_183a.tt       | 19 +++++++++++-----
 .../value_builder/unimarc_field_210c_bis.tt   | 18 +++++++++------
 .../value_builder/unimarc_field_225a.tt       | 19 +++++++++++-----
 .../value_builder/unimarc_field_225a_bis.tt   | 13 ++++++++---
 .../value_builder/unimarc_field_283-2.tt      | 19 +++++++++++-----
 .../value_builder/unimarc_field_283a.tt       | 11 +++++++++-
 .../value_builder/unimarc_field_325h.tt       | 11 +++++++++-
 .../value_builder/unimarc_field_325j.tt       | 11 +++++++++-
 .../value_builder/unimarc_field_700-4.tt      | 11 +++++++++-
 .../value_builder/unimarc_leader.tt           | 19 +++++++++++-----
 .../unimarc_leader_authorities.tt             | 19 +++++++++++-----
 62 files changed, 824 insertions(+), 329 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_100.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_100.tt
index 685e6500b9..41101a7eb3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_100.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_100.tt
@@ -10,8 +10,8 @@
 
 <body id="cat_unimarc_field_100" class="cat value_builder">
     <h1>UNIMARC field 100 builder</h1>
-    <div class="page-section">
-        <form name="f_pop" action="">
+    <form name="f_pop" action="">
+        <div class="page-section">
             <table>
                 <tr>
                     <td><label for="f1">Date entered on file</label></td>
@@ -823,9 +823,17 @@
                     </td>
                 </tr>
             </table>
-            <p><input type="button" value="OK" class="btn btn-primary" onclick="report();" /> <a href="#" class="cancel close">Cancel</a> </p>
-        </form>
-    </div> <!-- /.page-section -->
+        </div> <!-- /.page-section -->
+
+        <nav class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container-fluid">
+                <fieldset class="action">
+                    <input type="button" class="btn btn-primary" onclick="report();" value="Save" />
+                    <button class="btn btn-default close_window">Cancel</button>
+                </fieldset>
+            </div>
+        </nav>
+    </form>
 
 [% MACRO jsinclude BLOCK %]
     <script>
@@ -852,7 +860,6 @@
             self.close();
             return false;
         }
-    //]]>
     </script>
 [% END %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_100_authorities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_100_authorities.tt
index 02d2342059..98257fce21 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_100_authorities.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_100_authorities.tt
@@ -10,8 +10,8 @@
 
 <body id="cat_unimarc_field_100" class="cat value_builder">
     <h1>UNIMARC field 100 builder</h1>
-    <div class="page-section">
-        <form name="f_pop" action="">
+    <form name="f_pop" action="">
+        <div class="page-section">
             <table>
                 <tr>
                     <td><label for="f1">Date entered on file</label></td>
@@ -353,9 +353,18 @@
                     </td>
                 </tr>
             </table>
-            <p><input type="button" value="OK" class="btn btn-primary" onclick="report();" /> <a href="#" class="cancel close">Cancel</a> </p>
-        </form>
-    </div> <!-- /.page-section -->
+        </div> <!-- /.page-section -->
+
+        <nav class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container-fluid">
+                <fieldset class="action">
+                    <input type="button" class="btn btn-primary" onclick="report();" value="Save" />
+                    <button class="btn btn-default close_window">Cancel</button>
+                </fieldset>
+            </div>
+        </nav>
+
+    </form>
 
 [% MACRO jsinclude BLOCK %]
     <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_105.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_105.tt
index 00d42620e3..878c0fd57f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_105.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_105.tt
@@ -10,8 +10,8 @@
 
 <body id="cat_unimarc_field_105" class="cat value_builder">
     <h1>UNIMARC field 105 builder</h1>
-    <div class="page-section">
-        <form name="f_pop" action="">
+    <form name="f_pop" action="">
+        <div class="page-section">
             <table>
                 <tr>
                     <td><label for="f1">Illustration codes 1:</label></td>
@@ -1138,9 +1138,18 @@
                         </td>
                     </tr>
             </table>
-            <fieldset class="action"><input type="button" class="btn btn-primary" value="OK"  onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
-        </form>
-    </div> <!-- /.page-section -->
+        </div> <!-- /.page-section -->
+
+        <nav class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container-fluid">
+                <fieldset class="action">
+                    <input type="button" class="btn btn-primary" onclick="report();" value="Save" />
+                    <button class="btn btn-default close_window">Cancel</button>
+                </fieldset>
+            </div>
+        </nav>
+
+    </form>
 
 [% MACRO jsinclude BLOCK %]
     <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_106.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_106.tt
index 455f88dbd8..b6bb9bb3cc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_106.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_106.tt
@@ -12,8 +12,8 @@
 
 <body id="cat_unimarc_field_106" class="cat value_builder">
     <h1>UNIMARC field 106 builder</h1>
-    <div class="page-section">
-        <form name="f_pop" action="">
+    <form name="f_pop" action="">
+        <div class="page-section">
             <table>
                 <tr>
                     <td><label for="f1">Form of item: Coded data: Medium designator (not repeatable)</label></td>
@@ -90,9 +90,18 @@
                     </td>
                 </tr>
             </table>
-            <fieldset class="action"><input type="button" class="btn btn-primary" value="OK"  onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
-        </form>
-    </div> <!-- /.page-section -->
+        </div> <!-- /.page-section -->
+
+        <nav class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container-fluid">
+                <fieldset class="action">
+                    <input type="button" class="btn btn-primary" onclick="report();" value="Save" />
+                    <button class="btn btn-default close_window">Cancel</button>
+                </fieldset>
+            </div>
+        </nav>
+
+    </form>
 
 [% MACRO jsinclude BLOCK %]
     <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_110.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_110.tt
index d6b68720a2..cd156a6293 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_110.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_110.tt
@@ -12,8 +12,8 @@
 
 <body id="cat_unimarc_field_110" class="cat value_builder">
     <h1>UNIMARC field 110 builder</h1>
-    <div class="page-section">
-        <form name="f_pop" action="">
+    <form name="f_pop" action="">
+        <div class="page-section">
             <table>
                 <tr>
                     <td><label for="f1">Type of continuing resource designator</label></td>
@@ -648,9 +648,17 @@
                     </td>
                 </tr>
             </table>
-            <fieldset class="action"><input type="button" class="btn btn-primary" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
-        </form>
-    </div> <!-- /.page-section -->
+        </div> <!-- /.page-section -->
+
+        <nav class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container-fluid">
+                <fieldset class="action">
+                    <input type="button" class="btn btn-primary" onclick="report();" value="Save" />
+                    <button class="btn btn-default close_window">Cancel</button>
+                </fieldset>
+            </div>
+        </nav>
+    </form>
 
 [% MACRO jsinclude BLOCK %]
     <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_115a.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_115a.tt
index 0f854d36bc..76beb5aa6d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_115a.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_115a.tt
@@ -11,8 +11,8 @@
 </head>
 <body id="cat_unimarc_field_115a" class="cat value_builder">
     <h1>UNIMARC field 115a builder</h1>
-    <div class="page-section">
-        <form name="f_pop" action="">
+    <form name="f_pop" action="">
+        <div class="page-section">
             <table>
                 <tr>
                     <td><label for="f1">Type of material</label></td>
@@ -1195,9 +1195,17 @@
                     </td>
                 </tr>
             </table>
-            <fieldset class="action"><input type="button" class="btn btn-primary" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
-        </form>
-    </div> <!-- /.page-section -->
+        </div> <!-- /.page-section -->
+
+        <nav class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container-fluid">
+                <fieldset class="action">
+                    <input type="button" class="btn btn-primary" onclick="report();" value="Save" />
+                    <button class="btn btn-default close_window">Cancel</button>
+                </fieldset>
+            </div>
+        </nav>
+    </form>
 
 [% MACRO jsinclude BLOCK %]
     <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_115b.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_115b.tt
index fc8dd37e7f..ff24f43949 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_115b.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_115b.tt
@@ -12,8 +12,8 @@
 
 <body id="cat_unimarc_field_115b" class="cat value_builder">
     <h1>UNIMARC field 115b builder</h1>
-    <div class="page-section">
-        <form name="f_pop" action="">
+    <form name="f_pop" action="">
+        <div class="page-section">
             <table>
                 <tr>
                     <td><label for="f1">Generation</label></td>
@@ -642,9 +642,17 @@
                     <td><label for="f10">Year</label> <input type="text" name="f10" id="f10" maxlength="4" size="5" value="[% f10 | html %]" /> <label for="f11">Month</label> <input type="text" name="f11" id="f11" maxlength="2" size="3" value="[% f11 | html %]" /></td>
                 </tr>
             </table>
-            <fieldset class="action"><input type="button" class="btn btn-primary" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
-        </form>
-    </div> <!-- /.page-section -->
+        </div> <!-- /.page-section -->
+
+        <nav class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container-fluid">
+                <fieldset class="action">
+                    <input type="button" class="btn btn-primary" onclick="report();" value="Save" />
+                    <button class="btn btn-default close_window">Cancel</button>
+                </fieldset>
+            </div>
+        </nav>
+    </form>
 
 [% MACRO jsinclude BLOCK %]
     <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_116.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_116.tt
index a8c92a9132..112f003b78 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_116.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_116.tt
@@ -13,8 +13,8 @@
 
 <body id="cat_unimarc_field_116" class="cat value_builder">
     <h1>UNIMARC field 116 builder</h1>
-    <div class="page-section">
-        <form name="f_pop" action="">
+    <form name="f_pop" action="">
+        <div class="page-section">
             <table>
                 <tr>
                     <td><label for="f1">Specific material designation</label></td>
@@ -1594,9 +1594,17 @@
                     </td>
                 </tr>
             </table>
-            <fieldset class="action"><input type="button" class="btn btn-primary" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
-        </form>
-    </div> <!-- /.page-section -->
+        </div> <!-- /.page-section -->
+
+        <nav class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container-fluid">
+                <fieldset class="action">
+                    <input type="button" class="btn btn-primary" onclick="report();" value="Save" />
+                    <button class="btn btn-default close_window">Cancel</button>
+                </fieldset>
+            </div>
+        </nav>
+    </form>
 
 [% MACRO jsinclude BLOCK %]
     <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_117.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_117.tt
index a7bef23713..91ead50d92 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_117.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_117.tt
@@ -12,8 +12,8 @@
 
 <body id="cat_unimarc_field_117" class="cat value_builder">
     <h1>UNIMARC field 117 builder</h1>
-    <div class="page-section">
-        <form name="f_pop" action="">
+    <form name="f_pop" action="">
+        <div class="page-section">
             <table>
                 <tr>
                     <td><label for="f1">Specific material designation</label></td>
@@ -816,9 +816,18 @@
                     </td>
                 </tr>
             </table>
-            <fieldset class="action"><input type="button" class="btn btn-primary" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
-        </form>
-    </div> <!-- /.page-section -->
+        </div> <!-- /.page-section -->
+
+        <nav class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container-fluid">
+                <fieldset class="action">
+                    <input type="button" class="btn btn-primary" onclick="report();" value="Save" />
+                    <button class="btn btn-default close_window">Cancel</button>
+                </fieldset>
+            </div>
+        </nav>
+
+    </form>
 
 [% MACRO jsinclude BLOCK %]
     <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_120.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_120.tt
index b3b9228148..fffc21a860 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_120.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_120.tt
@@ -12,8 +12,8 @@
 
 <body id="cat_unimarc_field_120" class="cat value_builder">
     <h1>UNIMARC field 120 builder</h1>
-    <div class="page-section">
-        <form name="f_pop" action="">
+    <form name="f_pop" action="">
+        <div class="page-section">
             <table>
                 <tr>
                     <td><label for="f1">Color indicator</label></td>
@@ -1129,9 +1129,18 @@
                         </select>
                     </td></tr>
             </table>
-            <fieldset class="action"><input type="button" class="btn btn-primary" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
-        </form>
-    </div> <!-- /.page-section -->
+        </div> <!-- /.page-section -->
+
+        <nav class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container-fluid">
+                <fieldset class="action">
+                    <input type="button" class="btn btn-primary" onclick="report();" value="Save" />
+                    <button class="btn btn-default close_window">Cancel</button>
+                </fieldset>
+            </div>
+        </nav>
+
+    </form>
 
 [% MACRO jsinclude BLOCK %]
     <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_121a.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_121a.tt
index e35cc5e94c..6def4f5762 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_121a.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_121a.tt
@@ -12,8 +12,8 @@
 
 <body id="cat_unimarc_field_121a" class="cat value_builder">
     <h1>UNIMARC field 121a builder</h1>
-    <div class="page-section">
-        <form name="f_pop" action="">
+    <form name="f_pop" action="">
+        <div class="page-section">
             <table>
                 <tr>
                     <td><label for="f1">Physical dimension</label></td>
@@ -342,9 +342,18 @@
                     </td>
                 </tr>
             </table>
-            <fieldset class="action"><input type="button" class="btn btn-primary" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
-        </form>
-    </div> <!-- /.page-section -->
+        </div> <!-- /.page-section -->
+
+        <nav class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container-fluid">
+                <fieldset class="action">
+                    <input type="button" class="btn btn-primary" onclick="report();" value="Save" />
+                    <button class="btn btn-default close_window">Cancel</button>
+                </fieldset>
+            </div>
+        </nav>
+
+    </form>
 
 [% MACRO jsinclude BLOCK %]
     <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_121b.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_121b.tt
index f9d39aee4e..7965663a64 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_121b.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_121b.tt
@@ -12,8 +12,8 @@
 
 <body id="cat_unimarc_field_121b" class="cat value_builder">
     <h1>UNIMARC field 121b builder</h1>
-    <div class="page-section">
-        <form name="f_pop" action="">
+    <form name="f_pop" action="">
+        <div class="page-section">
             <table>
                 <tr>
                     <td><label for="f1">Altitude of sensor</label></td>
@@ -251,9 +251,18 @@
                     </td>
                 </tr>
             </table>
-            <fieldset class="action"><input type="button" class="btn btn-primary" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
-        </form>
-    </div> <!-- /.page-section -->
+        </div> <!-- /.page-section -->
+
+        <nav class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container-fluid">
+                <fieldset class="action">
+                    <input type="button" class="btn btn-primary" onclick="report();" value="Save" />
+                    <button class="btn btn-default close_window">Cancel</button>
+                </fieldset>
+            </div>
+        </nav>
+
+    </form>
 
 [% MACRO jsinclude BLOCK %]
     <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_122.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_122.tt
index 0112adce3d..925321ee39 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_122.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_122.tt
@@ -12,8 +12,8 @@
 
 <body id="cat_unimarc_field_122" class="cat value_builder">
     <h1>UNIMARC field 122 builder</h1>
-    <div class="page-section">
-        <form name="f_pop" action="">
+    <form name="f_pop" action="">
+        <div class="page-section">
             <table>
                 <tr>
                     <td><label for="f1">Era identifier</label></td>
@@ -46,9 +46,18 @@
                             <td><input type="text" name="f5" id="f5" maxlength="2" size="3" value="[% f5 | html %]" /></td>
                 </tr>
             </table>
-            <fieldset class="action"><input type="button" class="btn btn-primary" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
-        </form>
-    </div> <!-- /.page-section -->
+        </div> <!-- /.page-section -->
+
+        <nav class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container-fluid">
+                <fieldset class="action">
+                    <input type="button" class="btn btn-primary" onclick="report();" value="Save" />
+                    <button class="btn btn-default close_window">Cancel</button>
+                </fieldset>
+            </div>
+        </nav>
+
+    </form>
 
 [% MACRO jsinclude BLOCK %]
     <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123a.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123a.tt
index a1169a88da..b780023f61 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123a.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123a.tt
@@ -11,8 +11,8 @@
 </head>
 <body id="cat_unimarc_field_123a" class="cat value_builder">
     <h1>UNIMARC field 123a builder</h1>
-    <div class="page-section">
-        <form name="f_pop" action="">
+    <form name="f_pop" action="">
+        <div class="page-section">
             <table>
                 <tr>
                     <td><label for="f1">Type of scale:</label></td>
@@ -36,9 +36,18 @@
                         </select>
                     </td></tr>
             </table>
-            <fieldset class="action"><input type="button" class="btn btn-primary" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
-        </form>
-    </div> <!-- /.page-section -->
+        </div> <!-- /.page-section -->
+
+        <nav class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container-fluid">
+                <fieldset class="action">
+                    <input type="button" class="btn btn-primary" onclick="report();" value="Save" />
+                    <button class="btn btn-default close_window">Cancel</button>
+                </fieldset>
+            </div>
+        </nav>
+
+    </form>
 
 [% MACRO jsinclude BLOCK %]
     <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123defg.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123defg.tt
index 0f11150bfb..b4c979b369 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123defg.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123defg.tt
@@ -11,8 +11,8 @@
 </head>
 <body id="cat_unimarc_field_123d/e/f/g" class="cat value_builder">
     <h1>UNIMARC field 123d/e/f/g builder</h1>
-    <div class="page-section">
-        <form name="f_pop" action="">
+    <form name="f_pop" action="">
+        <div class="page-section">
             <table>
                 <tr>
                     <td><label for="f1">Hemisphere:</label></td>
@@ -52,9 +52,18 @@
                     <td><input type="text" name="f4" id="f4" maxlength="2" size="3" value="[% f4 | html %]" /></td>
                 </tr>
             </table>
-            <fieldset class="action"><input type="button" class="btn btn-primary" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
-        </form>
-    </div> <!-- /.page-section -->
+        </div> <!-- /.page-section -->
+
+        <nav class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container-fluid">
+                <fieldset class="action">
+                    <input type="button" class="btn btn-primary" onclick="report();" value="Save" />
+                    <button class="btn btn-default close_window">Cancel</button>
+                </fieldset>
+            </div>
+        </nav>
+
+    </form>
 
 [% MACRO jsinclude BLOCK %]
     <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123i_j.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123i_j.tt
index e7860353b1..7944b7f1d5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123i_j.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123i_j.tt
@@ -11,8 +11,8 @@
 </head>
 <body id="cat_unimarc_field_123ij" class="cat value_builder">
     <h1>UNIMARC field 123i/j builder</h1>
-    <div class="page-section">
-        <form name="f_pop" action="">
+    <form name="f_pop" action="">
+        <div class="page-section">
             <table>
                 <tr>
                     <td><label for="f1">Hemisphere:</label></td>
@@ -42,9 +42,18 @@
                     <td><input type="text" name="f4" id="f4" maxlength="2" size="3" value="[% f4 | html %]" /></td>
                 </tr>
             </table>
-            <fieldset class="action"><input type="button" class="btn btn-primary" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
-        </form>
-    </div> <!-- /.page-section -->
+        </div> <!-- /.page-section -->
+
+        <nav class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container-fluid">
+                <fieldset class="action">
+                    <input type="button" class="btn btn-primary" onclick="report();" value="Save" />
+                    <button class="btn btn-default close_window">Cancel</button>
+                </fieldset>
+            </div>
+        </nav>
+
+    </form>
 
 [% MACRO jsinclude BLOCK %]
     <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124a.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124a.tt
index a2094c9eae..1409332881 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124a.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124a.tt
@@ -12,8 +12,8 @@
 
 <body id="cat_unimarc_field_124a" class="cat value_builder">
     <h1>UNIMARC field 124a builder</h1>
-    <div class="page-section">
-        <form name="f_pop" action="">
+    <form name="f_pop" action="">
+        <div class="page-section">
             <table>
                 <tr>
                     <td><label for="f1">Character of image:</label></td>
@@ -37,9 +37,18 @@
                         </select>
                     </td></tr>
             </table>
-            <fieldset class="action"><input type="button" class="btn btn-primary" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
-        </form>
-    </div> <!-- /.page-section -->
+        </div> <!-- /.page-section -->
+
+        <nav class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container-fluid">
+                <fieldset class="action">
+                    <input type="button" class="btn btn-primary" onclick="report();" value="Save" />
+                    <button class="btn btn-default close_window">Cancel</button>
+                </fieldset>
+            </div>
+        </nav>
+
+    </form>
 
 [% MACRO jsinclude BLOCK %]
     <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124b.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124b.tt
index 7cf6188cd9..b65f4331f5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124b.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124b.tt
@@ -12,8 +12,8 @@
 
 <body id="cat_unimarc_field_124b" class="cat value_builder">
     <h1>UNIMARC field 124b builder</h1>
-    <div class="page-section">
-        <form name="f_pop" action="">
+    <form name="f_pop" action="">
+        <div class="page-section">
             <table>
                 <tr>
                     <td><label for="f1">Form of cartographic item:</label></td>
@@ -78,9 +78,18 @@
                         </select>
                     </td></tr>
             </table>
-            <fieldset class="action"><input type="button" class="btn btn-primary" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
-        </form>
-    </div> <!-- /.page-section -->
+        </div> <!-- /.page-section -->
+
+        <nav class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container-fluid">
+                <fieldset class="action">
+                    <input type="button" class="btn btn-primary" onclick="report();" value="Save" />
+                    <button class="btn btn-default close_window">Cancel</button>
+                </fieldset>
+            </div>
+        </nav>
+
+    </form>
 
 [% MACRO jsinclude BLOCK %]
     <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124c.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124c.tt
index 6e00e10ec9..3eb876d83b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124c.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124c.tt
@@ -12,8 +12,8 @@
 
 <body id="cat_unimarc_field_124c" class="cat value_builder">
     <h1>UNIMARC field 124c builder</h1>
-    <div class="page-section">
-        <form name="f_pop" action="">
+    <form name="f_pop" action="">
+        <div class="page-section">
             <table>
                 <tr>
                     <td><label for="f1">  Presentation technique for photographic or non-photographic image:</label></td>
@@ -133,9 +133,18 @@
                         </select>
                     </td></tr>
             </table>
-            <fieldset class="action"><input type="button" class="btn btn-primary" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
-        </form>
-    </div> <!-- /.page-section -->
+        </div> <!-- /.page-section -->
+
+        <nav class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container-fluid">
+                <fieldset class="action">
+                    <input type="button" class="btn btn-primary" onclick="report();" value="Save" />
+                    <button class="btn btn-default close_window">Cancel</button>
+                </fieldset>
+            </div>
+        </nav>
+
+    </form>
 
 [% MACRO jsinclude BLOCK %]
     <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124d.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124d.tt
index 2bde0e6dfa..a4f6274d9b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124d.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124d.tt
@@ -12,8 +12,8 @@
 
 <body id="cat_unimarc_field_124d" class="cat value_builder">
     <h1>UNIMARC field 124d builder</h1>
-    <div class="page-section">
-        <form name="f_pop" action="">
+    <form name="f_pop" action="">
+        <div class="page-section">
             <table>
                 <tr>
                     <td><label for="f1">Position of platform for photographic or remote sensing image:</label></td>
@@ -37,9 +37,18 @@
                         </select>
                     </td></tr>
             </table>
-            <fieldset class="action"><input type="button" class="btn btn-primary" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
-        </form>
-    </div> <!-- /.page-section -->
+        </div> <!-- /.page-section -->
+
+        <nav class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container-fluid">
+                <fieldset class="action">
+                    <input type="button" class="btn btn-primary" onclick="report();" value="Save" />
+                    <button class="btn btn-default close_window">Cancel</button>
+                </fieldset>
+            </div>
+        </nav>
+
+    </form>
 
 [% MACRO jsinclude BLOCK %]
     <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124e.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124e.tt
index 3d1e7fe2ea..e9697915c1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124e.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124e.tt
@@ -12,8 +12,8 @@
 
 <body id="cat_unimarc_field_124e" class="cat value_builder">
     <h1>UNIMARC field 124e builder</h1>
-    <div class="page-section">
-        <form name="f_pop" action="">
+    <form name="f_pop" action="">
+        <div class="page-section">
             <table>
                 <tr>
                     <td><label for="f1">Category of satellite for remote sensing image:</label></td>
@@ -38,9 +38,18 @@
                         </select>
                     </td></tr>
             </table>
-            <fieldset class="action"><input type="button" class="btn btn-primary" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
-        </form>
-    </div> <!-- /.page-section -->
+        </div> <!-- /.page-section -->
+
+        <nav class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container-fluid">
+                <fieldset class="action">
+                    <input type="button" class="btn btn-primary" onclick="report();" value="Save" />
+                    <button class="btn btn-default close_window">Cancel</button>
+                </fieldset>
+            </div>
+        </nav>
+
+    </form>
 
 [% MACRO jsinclude BLOCK %]
     <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124f.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124f.tt
index b43d4b9c26..ca390765ef 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124f.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124f.tt
@@ -12,8 +12,8 @@
 
 <body id="cat_unimarc_field_124f" class="cat value_builder">
     <h1>UNIMARC field 124f builder</h1>
-    <div class="page-section">
-        <form name="f_pop" action="">
+    <form name="f_pop" action="">
+        <div class="page-section">
             <table>
                 <tr>
                     <td><label for="f1">Name of satellite for remote sensing image:</label></td>
@@ -112,9 +112,18 @@
                         </select>
                     </td></tr>
             </table>
-            <fieldset class="action"><input type="button" class="btn btn-primary" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
-        </form>
-    </div> <!-- /.page-section -->
+        </div> <!-- /.page-section -->
+
+        <nav class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container-fluid">
+                <fieldset class="action">
+                    <input type="button" class="btn btn-primary" onclick="report();" value="Save" />
+                    <button class="btn btn-default close_window">Cancel</button>
+                </fieldset>
+            </div>
+        </nav>
+
+    </form>
 
 [% MACRO jsinclude BLOCK %]
     <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124g.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124g.tt
index 4f05e10817..5d46bd5a7c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124g.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124g.tt
@@ -12,8 +12,8 @@
 
 <body id="cat_unimarc_field_124g" class="cat value_builder">
     <h1>UNIMARC field 124g builder</h1>
-    <div class="page-section">
-        <form name="f_pop" action="">
+    <form name="f_pop" action="">
+        <div class="page-section">
             <table>
                 <tr>
                     <td><label for="f1">Recording technique for remote sensing image:</label></td>
@@ -73,9 +73,18 @@
                         </select>
                     </td></tr>
             </table>
-            <fieldset class="action"><input type="button" class="btn btn-primary" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
-        </form>
-    </div> <!-- /.page-section -->
+        </div> <!-- /.page-section -->
+
+        <nav class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container-fluid">
+                <fieldset class="action">
+                    <input type="button" class="btn btn-primary" onclick="report();" value="Save" />
+                    <button class="btn btn-default close_window">Cancel</button>
+                </fieldset>
+            </div>
+        </nav>
+
+    </form>
 
 [% MACRO jsinclude BLOCK %]
     <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125a.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125a.tt
index 591e8d13a3..ba20268da0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125a.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125a.tt
@@ -12,8 +12,8 @@
 
 <body id="cat_unimarc_field_125a" class="cat value_builder">
     <h1>UNIMARC field 125a builder</h1>
-    <div class="page-section">
-        <form name="f_pop" action="">
+    <form name="f_pop" action="">
+        <div class="page-section">
             <table>
                 <tr>
                     <td><label for="f1">Type of score:</label></td>
@@ -139,9 +139,18 @@
                         </select>
                     </td></tr>
             </table>
-            <fieldset class="action"><input type="button" class="btn btn-primary" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
-        </form>
-    </div> <!-- /.page-section -->
+        </div> <!-- /.page-section -->
+
+        <nav class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container-fluid">
+                <fieldset class="action">
+                    <input type="button" class="btn btn-primary" onclick="report();" value="Save" />
+                    <button class="btn btn-default close_window">Cancel</button>
+                </fieldset>
+            </div>
+        </nav>
+
+    </form>
 
 [% MACRO jsinclude BLOCK %]
     <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125b.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125b.tt
index c61e416f34..6b22cce981 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125b.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125b.tt
@@ -12,8 +12,8 @@
 
 <body id="unimarc_field_125b" class="cat value_builder">
     <h1>UNIMARC field 125b builder</h1>
-    <div class="page-section">
-        <form name="f_pop" action="">
+    <form name="f_pop" action="">
+        <div class="page-section">
             <table>
                 <tr>
                     <td><label for="f1">Literary text indicator:</label></td>
@@ -132,9 +132,18 @@
                         </select>
                     </td></tr>
             </table>
-            <fieldset class="action"><input type="button" class="btn btn-primary" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
-        </form>
-    </div> <!-- /.page-section -->
+        </div> <!-- /.page-section -->
+
+        <nav class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container-fluid">
+                <fieldset class="action">
+                    <input type="button" class="btn btn-primary" onclick="report();" value="Save" />
+                    <button class="btn btn-default close_window">Cancel</button>
+                </fieldset>
+            </div>
+        </nav>
+
+    </form>
 
 [% MACRO jsinclude BLOCK %]
     <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126a.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126a.tt
index 219c2adbc8..0e9b343f09 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126a.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126a.tt
@@ -12,8 +12,8 @@
 
 <body id="cat_unimarc_field_126a" class="cat value_builder">
     <h1>UNIMARC field 126a builder</h1>
-    <div class="page-section">
-        <form name="f_pop" action="">
+    <form name="f_pop" action="">
+        <div class="page-section">
             <table>
                 <tr>
                     <td><label for="f1">Form of release:</label></td>
@@ -1033,9 +1033,18 @@
                         </select>
                     </td></tr>
             </table>
-            <fieldset class="action"><input type="button" class="btn btn-primary" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
-        </form>
-    </div> <!-- /.page-section -->
+        </div> <!-- /.page-section -->
+
+        <nav class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container-fluid">
+                <fieldset class="action">
+                    <input type="button" class="btn btn-primary" onclick="report();" value="Save" />
+                    <button class="btn btn-default close_window">Cancel</button>
+                </fieldset>
+            </div>
+        </nav>
+
+    </form>
 
 [% MACRO jsinclude BLOCK %]
     <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126b.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126b.tt
index d6e20c6c4d..8ac536b52b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126b.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126b.tt
@@ -12,8 +12,8 @@
 
 <body id="cat_unimarc_field_126b" class="cat value_builder">
     <h1>UNIMARC field 126b builder</h1>
-    <div class="page-section">
-        <form name="f_pop" action="">
+    <form name="f_pop" action="">
+        <div class="page-section">
             <table>
                 <tr>
                     <td><label for="f1">Kind of disc, cylinder or tape:</label></td>
@@ -176,9 +176,18 @@
                         </select>
                     </td></tr>
             </table>
-            <fieldset class="action"><input type="button" class="btn btn-primary" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
-        </form>
-    </div> <!-- /.page-section -->
+        </div> <!-- /.page-section -->
+
+        <nav class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container-fluid">
+                <fieldset class="action">
+                    <input type="button" class="btn btn-primary" onclick="report();" value="Save" />
+                    <button class="btn btn-default close_window">Cancel</button>
+                </fieldset>
+            </div>
+        </nav>
+
+    </form>
 
 [% MACRO jsinclude BLOCK %]
     <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_127.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_127.tt
index 0c880dc76b..8dc1f9ff20 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_127.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_127.tt
@@ -12,8 +12,8 @@
 
 <body id="cat_unimarc_field_127" class="cat value_builder">
     <h1>UNIMARC field 127 builder</h1>
-    <div class="page-section">
-        <form name="f_pop" action="">
+    <form name="f_pop" action="">
+        <div class="page-section">
             <table>
                 <tr><th colspan="9">(Complete with 0 on the left)</th></tr>
                 <tr><td><label for="f1">Hours:</label></td>
@@ -30,9 +30,18 @@
                         value="[% f3 | html %]" /></td>
                 </tr>
             </table>
-            <fieldset class="action"><input type="button" class="btn btn-primary" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
-        </form>
-    </div> <!-- /.page-section -->
+        </div> <!-- /.page-section -->
+
+        <nav class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container-fluid">
+                <fieldset class="action">
+                    <input type="button" class="btn btn-primary" onclick="report();" value="Save" />
+                    <button class="btn btn-default close_window">Cancel</button>
+                </fieldset>
+            </div>
+        </nav>
+
+    </form>
 
 [% MACRO jsinclude BLOCK %]
     <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128a.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128a.tt
index 09877a5f89..c9eed78526 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128a.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128a.tt
@@ -12,8 +12,8 @@
 
 <body id="cat_unimarc_field_128a" class="cat value_builder">
     <h1>UNIMARC field 128a builder</h1>
-    <div class="page-section">
-        <form name="f_pop" action="">
+    <form name="f_pop" action="">
+        <div class="page-section">
             <table>
                 <tr>
                     <td><label for="f1">Form of musical work:</label></td>
@@ -372,9 +372,18 @@
                         </select>
                     </td></tr>
             </table>
-            <fieldset class="action"><input type="button" class="btn btn-primary" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
-        </form>
-    </div> <!-- /.page-section -->
+        </div> <!-- /.page-section -->
+
+        <nav class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container-fluid">
+                <fieldset class="action">
+                    <input type="button" class="btn btn-primary" onclick="report();" value="Save" />
+                    <button class="btn btn-default close_window">Cancel</button>
+                </fieldset>
+            </div>
+        </nav>
+
+    </form>
 [% MACRO jsinclude BLOCK %]
     <script>
         var dateformat = "[% Koha.Preference('dateformat') | html %]";
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128b.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128b.tt
index 43843a32a4..5b8ef87813 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128b.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128b.tt
@@ -12,8 +12,8 @@
 
 <body id="cat_unimarc_field_128b" class="cat value_builder">
     <h1>UNIMARC field 128b builder</h1>
-    <div class="page-section">
-        <form name="f_pop" action="">
+    <form name="f_pop" action="">
+        <div class="page-section">
             <table>
                 <tr>
                     <td><label for="f1">Instruments or voices for ensemble:</label></td>
@@ -468,9 +468,18 @@
                         </select>
                     </td></tr>
             </table>
-            <fieldset class="action"><input type="button" class="btn btn-primary" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
-        </form>
-    </div> <!-- /.page-section -->
+        </div> <!-- /.page-section -->
+
+        <nav class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container-fluid">
+                <fieldset class="action">
+                    <input type="button" class="btn btn-primary" onclick="report();" value="Save" />
+                    <button class="btn btn-default close_window">Cancel</button>
+                </fieldset>
+            </div>
+        </nav>
+
+    </form>
 [% MACRO jsinclude BLOCK %]
     <script>
         var dateformat = "[% Koha.Preference('dateformat') | html %]";
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128c.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128c.tt
index 0cac5fa335..a1b8d1a480 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128c.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128c.tt
@@ -12,8 +12,8 @@
 
 <body id="cat_unimarc_field_128c" class="cat value_builder">
     <h1>UNIMARC field 128c builder</h1>
-    <div class="page-section">
-        <form name="f_pop" action="">
+    <form name="f_pop" action="">
+        <div class="page-section">
             <table>
                 <tr>
                     <td><label for="f1">Instruments or voices for soloists</label></td>
@@ -462,9 +462,18 @@
                         </select>
                     </td></tr>
             </table>
-            <fieldset class="action"><input type="button" class="btn btn-primary" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
-        </form>
-    </div> <!-- /.page-section -->
+        </div> <!-- /.page-section -->
+
+        <nav class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container-fluid">
+                <fieldset class="action">
+                    <input type="button" class="btn btn-primary" onclick="report();" value="Save" />
+                    <button class="btn btn-default close_window">Cancel</button>
+                </fieldset>
+            </div>
+        </nav>
+
+    </form>
 
 [% MACRO jsinclude BLOCK %]
     <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_130.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_130.tt
index 127526c113..b89564d987 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_130.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_130.tt
@@ -12,8 +12,8 @@
 
 <body id="cat_unimarc_field_130" class="cat value_builder">
     <h1>UNIMARC field 130 builder</h1>
-    <div class="page-section">
-        <form name="f_pop" action="">
+    <form name="f_pop" action="">
+        <div class="page-section">
             <table>
                 <tr>
                     <td><label for="f1">Specific material designation:</label></td>
@@ -332,9 +332,18 @@
                         </select>
                     </td></tr>
             </table>
-            <fieldset class="action"><input type="button" class="btn btn-primary" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
-        </form>
-    </div> <!-- /.page-section -->
+        </div> <!-- /.page-section -->
+
+        <nav class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container-fluid">
+                <fieldset class="action">
+                    <input type="button" class="btn btn-primary" onclick="report();" value="Save" />
+                    <button class="btn btn-default close_window">Cancel</button>
+                </fieldset>
+            </div>
+        </nav>
+
+    </form>
 
 [% MACRO jsinclude BLOCK %]
     <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_135a.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_135a.tt
index 4e9fb2736c..18a5d81e9a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_135a.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_135a.tt
@@ -10,8 +10,8 @@
 
 <body id="cat_unimarc_field_135a" class="cat value_builder">
     <h1>UNIMARC field 135a builder</h1>
-    <div class="page-section">
-        <form name="f_pop" action="">
+    <form name="f_pop" action="">
+        <div class="page-section">
             <table>
                 <tr>
                     <td><label for="f1">Type of electronic resource:</label></td>
@@ -61,9 +61,18 @@
                         </select>
                     </td></tr>
             </table>
-            <p><input type="button" class="btn btn-primary" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></p>
-        </form>
-    </div> <!-- /.page-section -->
+        </div> <!-- /.page-section -->
+
+        <nav class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container-fluid">
+                <fieldset class="action">
+                    <input type="button" class="btn btn-primary" onclick="report();" value="Save" />
+                    <button class="btn btn-default close_window">Cancel</button>
+                </fieldset>
+            </div>
+        </nav>
+
+    </form>
 
 [% MACRO jsinclude BLOCK %]
     <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_140.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_140.tt
index 518228b3e4..03d91bdd27 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_140.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_140.tt
@@ -12,7 +12,8 @@
 
 <body id="cat_unimarc_field_140" class="cat value_builder">
     <h1>UNIMARC field 140 builder</h1>
-        <form name="f_pop" action="">
+    <form name="f_pop" action="">
+        <div class="page-section">
         <table>
             <tr>
                 <td><label for="f1">Illustration - Book 1:</label></td>
@@ -1727,9 +1728,18 @@
                 </td>
             </tr>
         </table>
-        <fieldset class="action"><input type="button" class="btn btn-primary" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
-        </form>
-    </div> <!-- /.page-section -->
+        </div> <!-- /.page-section -->
+
+        <nav class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container-fluid">
+                <fieldset class="action">
+                    <input type="button" class="btn btn-primary" onclick="report();" value="Save" />
+                    <button class="btn btn-default close_window">Cancel</button>
+                </fieldset>
+            </div>
+        </nav>
+
+    </form>
 
 [% MACRO jsinclude BLOCK %]
     <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_141.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_141.tt
index f906a28620..ac2634f909 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_141.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_141.tt
@@ -12,8 +12,8 @@
 
 <body id="cat_unimarc_field_141" class="cat value_builder">
     <h1>UNIMARC field 141 builder</h1>
-    <div class="page-section">
-        <form name="f_pop" action="">
+    <form name="f_pop" action="">
+        <div class="page-section">
             <table>
                 <tr>
                     <td><label for="f1">Binding material 1:</label></td>
@@ -371,9 +371,18 @@
                         </select>
                     </td></tr>
             </table>
-            <fieldset class="action"><input type="button" class="btn btn-primary" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
-        </form>
-    </div> <!-- /.page-section -->
+        </div> <!-- /.page-section -->
+
+        <nav class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container-fluid">
+                <fieldset class="action">
+                    <input type="button" class="btn btn-primary" onclick="report();" value="Save" />
+                    <button class="btn btn-default close_window">Cancel</button>
+                </fieldset>
+            </div>
+        </nav>
+
+    </form>
 
 [% MACRO jsinclude BLOCK %]
     <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_146a.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_146a.tt
index 8d9d86b64f..841306e00b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_146a.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_146a.tt
@@ -13,8 +13,8 @@
     <div class="container-fluid">
         <h1>Framework plugin for UNIMARC 146$a</h1>
 
-        <div class="page-section">
-            <form class="form-horizontal" id="form">
+        <form class="form-horizontal" id="form">
+            <div class="page-section">
                 <input type="hidden" id="id" name="id" value="[% id | html %]">
 
                 <div class="form-group">
@@ -31,15 +31,18 @@
                         </select>
                     </div>
                 </div>
+            </div> <!-- /.page-section -->
 
-                <div class="form-group">
-                    <div class="col-sm-offset-2 col-sm-10">
-                        <button type="submit" class="btn btn-primary">OK</button>
-                        <a href="#" class="cancel close">Cancel</a>
-                    </div>
+            <nav class="navbar navbar-default navbar-fixed-bottom">
+                <div class="container-fluid">
+                    <fieldset class="action">
+                        <input type="submit" class="btn btn-primary" value="Save" />
+                        <button class="btn btn-default close_window">Cancel</button>
+                    </fieldset>
                 </div>
-            </form>
-        </div> <!-- /.page-section -->
+            </nav>
+
+        </form>
     </div>
 
     <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_146b.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_146b.tt
index c1afe2fa99..3893ebf09e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_146b.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_146b.tt
@@ -13,8 +13,8 @@
     <div class="container-fluid">
         <h1>Framework plugin for UNIMARC 146$b</h1>
 
-        <div class="page-section">
-            <form class="form-horizontal" id="form">
+        <form class="form-horizontal" id="form">
+            <div class="page-section">
                 <input type="hidden" id="id" name="id" value="[% id | html %]">
 
                 <div class="form-group">
@@ -106,16 +106,18 @@
                         </select>
                     </div>
                 </div>
+            </div>
 
-                <div class="form-group">
-                    <div class="col-sm-offset-3 col-sm-9">
-                        <button type="submit" class="btn btn-primary">OK</button>
-                        <a href="#" class="cancel close">Cancel</a>
-                    </div>
+            <nav class="navbar navbar-default navbar-fixed-bottom">
+                <div class="container-fluid">
+                    <fieldset class="action">
+                        <input type="submit" class="btn btn-primary" value="Save" />
+                        <button class="btn btn-default close_window">Cancel</button>
+                    </fieldset>
                 </div>
-            </form>
-        </div> <!-- /.page-section -->
-    </div>
+            </nav>
+
+        </form>
 
     [% INCLUDE 'select2.inc' %]
     <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_146c.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_146c.tt
index bd5c530d24..f955199d0f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_146c.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_146c.tt
@@ -13,8 +13,8 @@
     <div class="container-fluid">
         <h1>Framework plugin for UNIMARC 146$c</h1>
 
-        <div class="page-section">
-            <form class="form-horizontal" id="form">
+        <form class="form-horizontal" id="form">
+            <div class="page-section">
                 <input type="hidden" id="id" name="id" value="[% id | html %]">
 
                 <div class="form-group">
@@ -106,16 +106,18 @@
                         </select>
                     </div>
                 </div>
+            </div> <!-- /.page-section -->
 
-                <div class="form-group">
-                    <div class="col-sm-offset-3 col-sm-9">
-                        <button type="submit" class="btn btn-primary">OK</button>
-                        <a href="#" class="cancel close">Cancel</a>
-                    </div>
+            <nav class="navbar navbar-default navbar-fixed-bottom">
+                <div class="container-fluid">
+                    <fieldset class="action">
+                        <input type="submit" class="btn btn-primary" value="Save" />
+                        <button class="btn btn-default close_window">Cancel</button>
+                    </fieldset>
                 </div>
-            </form>
-        </div> <!-- /.page-section -->
-    </div>
+            </nav>
+
+        </form>
 
     [% INCLUDE 'select2.inc' %]
     <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_146d.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_146d.tt
index b969be5cad..a5dc164f6b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_146d.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_146d.tt
@@ -13,8 +13,8 @@
     <div class="container-fluid">
         <h1>Framework plugin for UNIMARC 146$d</h1>
 
-        <div class="page-section">
-            <form class="form-horizontal" id="form">
+        <form class="form-horizontal" id="form">
+            <div class="page-section">
                 <input type="hidden" id="id" name="id" value="[% id | html %]">
 
                 <div class="form-group">
@@ -83,16 +83,18 @@
                         </select>
                     </div>
                 </div>
+            </div> <!-- /.page-section -->
 
-                <div class="form-group">
-                    <div class="col-sm-offset-3 col-sm-9">
-                        <button type="submit" class="btn btn-primary">OK</button>
-                        <a href="#" class="cancel close">Cancel</a>
-                    </div>
+            <nav class="navbar navbar-default navbar-fixed-bottom">
+                <div class="container-fluid">
+                    <fieldset class="action">
+                        <input type="submit" class="btn btn-primary" value="Save" />
+                        <button class="btn btn-default close_window">Cancel</button>
+                    </fieldset>
                 </div>
-            </form>
-        </div> <!-- /.page-section -->
-    </div>
+            </nav>
+
+        </form>
 
     [% INCLUDE 'select2.inc' %]
     <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_146e.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_146e.tt
index d237361aa8..2afd3e78b0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_146e.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_146e.tt
@@ -13,8 +13,8 @@
     <div class="container-fluid">
         <h1>Framework plugin for UNIMARC 146$e</h1>
 
-        <div class="page-section">
-            <form class="form-horizontal" id="form">
+        <form class="form-horizontal" id="form">
+            <div class="page-section">
                 <input type="hidden" id="id" name="id" value="[% id | html %]">
 
                 <div class="form-group">
@@ -106,15 +106,18 @@
                         </select>
                     </div>
                 </div>
+            </div> <!-- /.page-section -->
 
-                <div class="form-group">
-                    <div class="col-sm-offset-3 col-sm-9">
-                        <button type="submit" class="btn btn-primary">OK</button>
-                        <a href="#" class="cancel close">Cancel</a>
-                    </div>
+            <nav class="navbar navbar-default navbar-fixed-bottom">
+                <div class="container-fluid">
+                    <fieldset class="action">
+                        <input type="submit" class="btn btn-primary" value="Save" />
+                        <button class="btn btn-default close_window">Cancel</button>
+                    </fieldset>
                 </div>
-            </form>
-        </div> <!-- /.page-section -->
+            </nav>
+
+        </form>
     </div>
 
     [% INCLUDE 'select2.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_146f.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_146f.tt
index 87794deff7..3152836a50 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_146f.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_146f.tt
@@ -13,8 +13,8 @@
     <div class="container-fluid">
         <h1>Framework plugin for UNIMARC 146$f</h1>
 
-        <div class="page-section">
-            <form class="form-horizontal" id="form">
+        <form class="form-horizontal" id="form">
+            <div class="page-section">
                 <input type="hidden" id="id" name="id" value="[% id | html %]">
 
                 <div class="form-group">
@@ -106,15 +106,18 @@
                         </select>
                     </div>
                 </div>
+            </div> <!-- /.page-section -->
 
-                <div class="form-group">
-                    <div class="col-sm-offset-3 col-sm-9">
-                        <button type="submit" class="btn btn-primary">OK</button>
-                        <a href="#" class="cancel close">Cancel</a>
-                    </div>
+            <nav class="navbar navbar-default navbar-fixed-bottom">
+                <div class="container-fluid">
+                    <fieldset class="action">
+                        <input type="submit" class="btn btn-primary" value="Save" />
+                        <button class="btn btn-default close_window">Cancel</button>
+                    </fieldset>
                 </div>
-            </form>
-        </div> <!-- /.page-section -->
+            </nav>
+
+        </form>
     </div>
 
     [% INCLUDE 'select2.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_146h.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_146h.tt
index 48b5e2eebb..a29e20857d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_146h.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_146h.tt
@@ -13,8 +13,8 @@
     <div class="container-fluid">
         <h1>Framework plugin for UNIMARC 146$h</h1>
 
-        <div class="page-section">
-            <form class="form-horizontal" id="form">
+        <form class="form-horizontal" id="form">
+            <div class="page-section">
                 <input type="hidden" id="id" name="id" value="[% id | html %]">
 
                 <div class="form-group">
@@ -40,15 +40,18 @@
                         </select>
                     </div>
                 </div>
+            </div> <!-- /.page-section -->
 
-                <div class="form-group">
-                    <div class="col-sm-offset-2 col-sm-10">
-                        <button type="submit" class="btn btn-primary">OK</button>
-                        <a href="#" class="cancel close">Cancel</a>
-                    </div>
+            <nav class="navbar navbar-default navbar-fixed-bottom">
+                <div class="container-fluid">
+                    <fieldset class="action">
+                        <input type="submit" class="btn btn-primary" value="Save" />
+                        <button class="btn btn-default close_window">Cancel</button>
+                    </fieldset>
                 </div>
-            </form>
-        </div> <!-- /.page-section -->
+            </nav>
+
+        </form>
     </div>
 
     <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_146i.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_146i.tt
index 25514c1c6a..a74c28e872 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_146i.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_146i.tt
@@ -13,8 +13,8 @@
     <div class="container-fluid">
         <h1>Framework plugin for UNIMARC 146$i</h1>
 
-        <div class="page-section">
-            <form class="form-horizontal" id="form">
+        <form class="form-horizontal" id="form">
+            <div class="page-section">
                 <input type="hidden" id="id" name="id" value="[% id | html %]">
 
                 <div class="form-group">
@@ -40,15 +40,18 @@
                         </select>
                     </div>
                 </div>
+            </div> <!-- /.page-section -->
 
-                <div class="form-group">
-                    <div class="col-sm-offset-2 col-sm-10">
-                        <button type="submit" class="btn btn-primary">OK</button>
-                        <a href="#" class="cancel close">Cancel</a>
-                    </div>
+            <nav class="navbar navbar-default navbar-fixed-bottom">
+                <div class="container-fluid">
+                    <fieldset class="action">
+                        <input type="submit" class="btn btn-primary" value="Save" />
+                        <button class="btn btn-default close_window">Cancel</button>
+                    </fieldset>
                 </div>
-            </form>
-        </div> <!-- /.page-section -->
+            </nav>
+
+        </form>
     </div>
 
     <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_181-2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_181-2.tt
index 900b1641f9..0c6fe38c32 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_181-2.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_181-2.tt
@@ -13,8 +13,8 @@
 
     <h3>UNIMARC field 181-2 builder</h3>
 
-    <div class="page-section">
-        <form name="f_pop" action="">
+    <form name="f_pop" action="">
+        <div class="page-section">
             <table>
                 <tr>
                     <td><label for="f0">System code :</label></td>
@@ -47,9 +47,18 @@
                     </td>
                 </tr>
             </table>
-            <p><input type="button" class="btn btn-primary" value="OK" onclick="submitMyForm();" /> <a href="#" class="cancel close">Cancel</a> </p>
-        </form>
-    </div> <!-- /.page-section -->
+        </div> <!-- /.page-section -->
+
+        <nav class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container-fluid">
+                <fieldset class="action">
+                    <input type="button" class="btn btn-primary" onclick="submitMyForm();" value="Save" />
+                    <button class="btn btn-default close_window">Cancel</button>
+                </fieldset>
+            </div>
+        </nav>
+
+    </form>
 <script>
 
     function submitMyForm() {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_181a.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_181a.tt
index 7e163d0873..a8ffcab2fa 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_181a.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_181a.tt
@@ -13,8 +13,8 @@
 
     <h3>UNIMARC field 181a builder</h3>
 
-    <div class="page-section">
-        <form name="f_pop" action="">
+    <form name="f_pop" action="">
+        <div class="page-section">
             <table>
                 <tr>
                     <td><label for="f1">Content Form </label></td>
@@ -132,9 +132,18 @@
                 </tr>
 
             </table>
-            <p><input type="button" class="btn btn-primary" value="OK" onclick="submitMyForm();" /> <a href="#" class="cancel close">Cancel</a> </p>
-        </form>
-    </div> <!-- /.page-section -->
+        </div> <!-- /.page-section -->
+
+        <nav class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container-fluid">
+                <fieldset class="action">
+                    <input type="button" class="btn btn-primary" onclick="submitMyForm();" value="Save" />
+                    <button class="btn btn-default close_window">Cancel</button>
+                </fieldset>
+            </div>
+        </nav>
+
+    </form>
 <script>
 
     function submitMyForm() {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_181b.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_181b.tt
index 9bd5a54eee..5623f89c79 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_181b.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_181b.tt
@@ -13,8 +13,8 @@
 
     <h3>UNIMARC field 181b builder</h3>
 
-    <div class="page-section">
-        <form name="f_pop" action="">
+    <form name="f_pop" action="">
+        <div class="page-section">
             <table>
                 <tr>
                     <td><label for="f1">Specification of Type </label></td>
@@ -241,9 +241,18 @@
                 </tr>
 
             </table>
-            <p><input type="button" class="btn btn-primary" value="OK"  onclick="submitMyForm();" /> <a href="#" class="cancel close">Cancel</a> </p>
-        </form>
-    </div> <!-- /.page-section -->
+        </div> <!-- /.page-section -->
+
+        <nav class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container-fluid">
+                <fieldset class="action">
+                    <input type="button" class="btn btn-primary" onclick="submitMyForm();" value="Save" />
+                    <button class="btn btn-default close_window">Cancel</button>
+                </fieldset>
+            </div>
+        </nav>
+
+    </form>
 
 <script>
     // The following function just puts back the value of the input #return
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_181c.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_181c.tt
index d2e708e786..d638074f1b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_181c.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_181c.tt
@@ -13,8 +13,8 @@
 
     <h3>UNIMARC field 181c builder</h3>
 
-    <div class="page-section">
-        <form name="f_pop" action="">
+    <form name="f_pop" action="">
+        <div class="page-section">
             <table>
                 <tr>
                     <td><label for="f1">Content Type </label></td>
@@ -175,9 +175,18 @@
                 </tr>
 
             </table>
-            <p><input type="button" class="btn btn-primary" value="OK" onclick="submitMyForm();" /> <a href="#" class="cancel close">Cancel</a> </p>
-        </form>
-    </div> <!-- /.page-section -->
+        </div> <!-- /.page-section -->
+
+        <nav class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container-fluid">
+                <fieldset class="action">
+                    <input type="button" class="btn btn-primary" onclick="submitMyForm();" value="Save" />
+                    <button class="btn btn-default close_window">Cancel</button>
+                </fieldset>
+            </div>
+        </nav>
+
+    </form>
 
 <script>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_182-2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_182-2.tt
index cae9c31062..90d03a429e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_182-2.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_182-2.tt
@@ -13,8 +13,8 @@
 
     <h3>UNIMARC field 182-2 builder</h3>
 
-    <div class="page-section">
-        <form name="f_pop" action="">
+    <form name="f_pop" action="">
+        <div class="page-section">
             <table>
                 <tr>
                     <td><label for="f0">System code :</label></td>
@@ -47,9 +47,18 @@
                     </td>
                 </tr>
             </table>
-            <p><input type="button" class="btn btn-primary" value="OK" onclick="submitMyForm();" /> <a href="#" class="cancel close">Cancel</a> </p>
-        </form>
-    </div> <!-- /.page-section -->
+        </div> <!-- /.page-section -->
+
+        <nav class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container-fluid">
+                <fieldset class="action">
+                    <input type="button" class="btn btn-primary" onclick="submitMyForm();" value="Save" />
+                    <button class="btn btn-default close_window">Cancel</button>
+                </fieldset>
+            </div>
+        </nav>
+
+    </form>
 
 <script>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_182a.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_182a.tt
index 7712296e9d..21e7609971 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_182a.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_182a.tt
@@ -13,8 +13,8 @@
 
     <h3>UNIMARC field 182a builder</h3>
 
-    <div class="page-section">
-        <form name="f_pop" action="">
+    <form name="f_pop" action="">
+        <div class="page-section">
             <table>
                 <tr>
                     <td><label for="f1">Media Type Code </label></td>
@@ -84,9 +84,18 @@
                 </tr>
 
             </table>
-            <p><input type="button" class="btn btn-primary" value="OK" onclick="submitMyForm();" /> <a href="#" class="cancel close">Cancel</a> </p>
-        </form>
-    </div> <!-- /.page-section -->
+        </div> <!-- /.page-section -->
+
+        <nav class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container-fluid">
+                <fieldset class="action">
+                    <input type="button" class="btn btn-primary" onclick="submitMyForm();" value="Save" />
+                    <button class="btn btn-default close_window">Cancel</button>
+                </fieldset>
+            </div>
+        </nav>
+
+    </form>
 <script>
 
     function submitMyForm() {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_182c.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_182c.tt
index e059c6440c..f89701ce7b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_182c.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_182c.tt
@@ -13,8 +13,8 @@
 
     <h3>UNIMARC field 182c builder</h3>
 
-    <div class="page-section">
-        <form name="f_pop" action="">
+    <form name="f_pop" action="">
+        <div class="page-section">
             <table>
                 <tr>
                     <td><label for="f1">Media Type </label></td>
@@ -84,9 +84,18 @@
                 </tr>
 
             </table>
-            <p><input type="button" class="btn btn-primary" value="OK" onclick="submitMyForm();" /> <a href="#" class="cancel close">Cancel</a> </p>
-        </form>
-    </div> <!-- /.page-section -->
+        </div> <!-- /.page-section -->
+
+        <nav class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container-fluid">
+                <fieldset class="action">
+                    <input type="button" class="btn btn-primary" onclick="submitMyForm();" value="Save" />
+                    <button class="btn btn-default close_window">Cancel</button>
+                </fieldset>
+            </div>
+        </nav>
+
+    </form>
 
 <script>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_183-2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_183-2.tt
index 34278afdbe..0769c228d1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_183-2.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_183-2.tt
@@ -13,8 +13,8 @@
 
     <h3>UNIMARC field 183-2 builder</h3>
 
-    <div class="page-section">
-        <form name="f_pop" action="">
+    <form name="f_pop" action="">
+        <div class="page-section">
             <table>
                 <tr>
                     <td><label for="f0">System code :</label></td>
@@ -47,9 +47,18 @@
                     </td>
                 </tr>
             </table>
-            <p><input type="button" class="btn btn-primary" value="OK" onclick="submitMyForm();" /> <a href="#" class="cancel close">Cancel</a> </p>
-        </form>
-    </div> <!-- /.page-section -->
+        </div> <!-- /.page-section -->
+
+        <nav class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container-fluid">
+                <fieldset class="action">
+                    <input type="button" class="btn btn-primary" onclick="submitMyForm();" value="Save" />
+                    <button class="btn btn-default close_window">Cancel</button>
+                </fieldset>
+            </div>
+        </nav>
+
+    </form>
 
 <script>
     // The following function just puts back the value of the input #return
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_183a.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_183a.tt
index 2c3e1e2d9e..752d87daca 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_183a.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_183a.tt
@@ -12,8 +12,8 @@
 <body id="cat_unimarc_field_183a" class="cat value_builder">
 
     <h3>UNIMARC field 183a builder</h3>
-    <div class="page-section">
-        <form name="f_pop" action="">
+    <form name="f_pop" action="">
+        <div class="page-section">
             <table>
                 <tr>
                     <td>
@@ -382,9 +382,18 @@
                     </td>
                 </tr>
             </table>
-            <p><input type="button" class="btn btn-primary" value="OK" onclick="submitMyForm();" /> <a href="#" class="cancel close">Cancel</a> </p>
-        </form>
-    </div> <!-- /.page-section -->
+        </div> <!-- /.page-section -->
+
+        <nav class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container-fluid">
+                <fieldset class="action">
+                    <input type="button" class="btn btn-primary" onclick="submitMyForm();" value="Save" />
+                    <button class="btn btn-default close_window">Cancel</button>
+                </fieldset>
+            </div>
+        </nav>
+
+    </form>
 
 <script>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c_bis.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c_bis.tt
index 05bd852c74..cab9e2837b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c_bis.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c_bis.tt
@@ -8,9 +8,6 @@
     [% t("Koha") | html %]
 [% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
-<style>
-    #custom-doc { width:37.85em;*width:36.93em;min-width:492px; margin:auto; text-align:left; }
-</style>
 </head>
 
 <body id="cat_unimarc_field_210c_bis" class="cat value_builder">
@@ -21,12 +18,19 @@
         <form name="f_pop" onsubmit="javascript:report()" action="">
             <div id="fieldautocomplete" class="autocomplete">
                 <fieldset>
-                <input autocomplete="off" id="findvalue" name="findvalue" size="40" class="focus" type="text" />
-                    <fieldset class="action">
-                    <input type="submit" class="btn btn-primary" value="Choose" />
-                    </fieldset>
+                    <input autocomplete="off" id="findvalue" name="findvalue" size="40" class="focus" type="text" />
                 </fieldset>
             </div>
+
+            <nav class="navbar navbar-default navbar-fixed-bottom">
+                <div class="container-fluid">
+                    <fieldset class="action">
+                        <input type="submit" class="btn btn-primary" value="Save" />
+                        <button class="btn btn-default close_window">Cancel</button>
+                    </fieldset>
+                </div>
+            </nav>
+
         </form>
     </div>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_225a.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_225a.tt
index 6b54ed99e1..911b18efc8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_225a.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_225a.tt
@@ -10,8 +10,8 @@
 
 <body id="cat_unimarc_field_225a" class="cat value_builder">
     <h1>UNIMARC field 225a builder</h1>
-        <div id="mainbloc" class="page-section">
-            <form name="f_pop" onsubmit="report()" action="">
+        <form name="f_pop" onsubmit="report()" action="">
+            <div id="mainbloc" class="page-section">
                 <h2 class="authority">Collection</h2>
                 <p><label>Select a collection</label>
                     <select name="f1" id="f1">
@@ -26,9 +26,18 @@
                 </p>
                 OR new collection: <input type="text" value="" name="f2"/>
                 <br/>
-                <input type="submit" value="OK" class="button authority" />
-            </form>
-        </div>
+            </div>
+
+            <nav class="navbar navbar-default navbar-fixed-bottom">
+                <div class="container-fluid">
+                    <fieldset class="action">
+                        <input type="submit" class="btn btn-primary" value="Save" />
+                        <button class="btn btn-default close_window">Cancel</button>
+                    </fieldset>
+                </div>
+            </nav>
+
+        </form>
 
 
 [% MACRO jsinclude BLOCK %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_225a_bis.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_225a_bis.tt
index 00d44fa292..2400da11b9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_225a_bis.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_225a_bis.tt
@@ -19,11 +19,18 @@
           <div id="fieldautocomplete" class="autocomplete">
             <fieldset>
               <input autocomplete="off" id="findvalue" name="findvalue" size="40" class="focus" type="text" />
-              <fieldset class="action">
-                <input type="submit" class="btn btn-primary" value="Choose" />
-              </fieldset>
             </fieldset>
           </div>
+
+            <nav class="navbar navbar-default navbar-fixed-bottom">
+                <div class="container-fluid">
+                    <fieldset class="action">
+                        <input type="submit" class="btn btn-primary" value="Save" />
+                        <button class="btn btn-default close_window">Cancel</button>
+                    </fieldset>
+                </div>
+            </nav>
+
         </form>
       </div>
     </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_283-2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_283-2.tt
index c3218980e5..4022c07185 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_283-2.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_283-2.tt
@@ -13,8 +13,8 @@
 
     <h3>UNIMARC field 283-2 builder</h3>
 
-    <div class="page-section">
-        <form name="f_pop" action="">
+    <form name="f_pop" action="">
+        <div class="page-section">
             <table>
                 <tr>
                     <td><label for="f0">System code :</label></td>
@@ -47,9 +47,18 @@
                     </td>
                 </tr>
             </table>
-            <p><input type="button" class="btn btn-primary" value="OK"  onclick="submitMyForm();" /> <a href="#" class="cancel close">Cancel</a> </p>
-        </form>
-    </div> <!-- /.page-section -->
+        </div> <!-- /.page-section -->
+
+        <nav class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container-fluid">
+                <fieldset class="action">
+                    <input type="button" class="btn btn-primary" onclick="submitMyForm();" value="Save" />
+                    <button class="btn btn-default close_window">Cancel</button>
+                </fieldset>
+            </div>
+        </nav>
+
+    </form>
 
 <script>
     // The following function just puts back the value of the input #return
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_283a.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_283a.tt
index 112eee0125..2d03fa0bee 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_283a.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_283a.tt
@@ -383,8 +383,17 @@
                     </td>
                 </tr>
             </table>
-            <p><input type="button" class="btn btn-primary" value="OK"  onclick="submitMyForm();" /> <a href="#" class="cancel close">Cancel</a> </p>
         </div> <!-- /.page-section -->
+
+        <nav class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container-fluid">
+                <fieldset class="action">
+                    <input type="button" class="btn btn-primary" onclick="submitMyForm();" value="Save" />
+                    <button class="btn btn-default close_window">Cancel</button>
+                </fieldset>
+            </div>
+        </nav>
+
     </form>
 
 <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_325h.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_325h.tt
index dcf5636f47..030e88343f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_325h.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_325h.tt
@@ -42,8 +42,17 @@
                     </td>
                 </tr>
             </table>
-            <p><input type="button" class="btn btn-primary" value="OK"  onclick="submitMyForm();" /> <a href="#" class="cancel close">Cancel</a> </p>
         </div> <!-- /.page-section -->
+
+        <nav class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container-fluid">
+                <fieldset class="action">
+                    <input type="button" class="btn btn-primary" onclick="submitMyForm();" value="Save" />
+                    <button class="btn btn-default close_window">Cancel</button>
+                </fieldset>
+            </div>
+        </nav>
+
     </form>
 
 <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_325j.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_325j.tt
index ca4c573895..4140a550d2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_325j.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_325j.tt
@@ -131,8 +131,17 @@
                         </td>
                     </tr>
                 </table>
-                <p><input type="submit" class="btn btn-primary" value="OK" /> <a href="#" class="cancel close">Cancel</a> </p>
             </div> <!-- /.page-section -->
+
+            <nav class="navbar navbar-default navbar-fixed-bottom">
+                <div class="container-fluid">
+                    <fieldset class="action">
+                        <input type="submit" class="btn btn-primary" value="Save" />
+                        <button class="btn btn-default close_window">Cancel</button>
+                    </fieldset>
+                </div>
+            </nav>
+
         </form>
 
 <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_700-4.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_700-4.tt
index 71b1ab0d69..8c87bb7527 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_700-4.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_700-4.tt
@@ -51,8 +51,17 @@
                     </td>
                 </tr>
             </table>
-            <fieldset class="action"><input type="submit" class="btn btn-primary" value="OK" /> <a href="#" class="cancel close">Cancel</a></fieldset>
         </div> <!-- /.page-section -->
+
+        <nav class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container-fluid">
+                <fieldset class="action">
+                    <input type="submit" class="btn btn-primary" value="Save" />
+                    <button class="btn btn-default close_window">Cancel</button>
+                </fieldset>
+            </div>
+        </nav>
+
     </form>
 
 [% MACRO jsinclude BLOCK %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_leader.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_leader.tt
index 5f3f356207..603d810bab 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_leader.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_leader.tt
@@ -12,8 +12,8 @@
 
 <body id="cat_unimarc_leader" class="cat value_builder">
     <h1>UNIMARC leader builder</h1>
-    <div class="page-section">
-        <form name="f_pop" action="">
+    <form name="f_pop" action="">
+        <div class="page-section">
             <table>
                 <tr>
                     <td>1-4 Record length</td>
@@ -296,9 +296,18 @@
                     <td>(auto-filled)</td>
                 </tr>
             </table>
-            <fieldset class="action"><input type="button" class="btn btn-primary" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
-        </form>
-    </div> <!-- /.page-section -->
+        </div> <!-- /.page-section -->
+
+        <nav class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container-fluid">
+                <fieldset class="action">
+                    <input type="button" class="btn btn-primary" onclick="report();" value="Save" />
+                    <button class="btn btn-default close_window">Cancel</button>
+                </fieldset>
+            </div>
+        </nav>
+
+    </form>
 
 [% MACRO jsinclude BLOCK %]
     <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_leader_authorities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_leader_authorities.tt
index d407cab4b9..28e2a1c924 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_leader_authorities.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_leader_authorities.tt
@@ -10,8 +10,8 @@
 </head>
 <body id="cat_unimarc_leader_authorities" class="cat value_builder">
     <h3>000 - Leader</h3>
-    <div class="page-section">
-        <form name="f_pop" onsubmit="report()" action="">
+    <form name="f_pop" onsubmit="report()" action="">
+        <div class="page-section">
             <input name="plugin_name" value="unimarc_leader_authorities.pl" type="hidden">
             <table>
                 <tr>
@@ -182,9 +182,18 @@
                     <td>(auto-filled)</td>
                 </tr>
             </table>
-            <fieldset class="action"><input type="submit" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
-        </form>
-    </div> <!-- /.page-section -->
+        </div> <!-- /.page-section -->
+
+        <nav class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container-fluid">
+                <fieldset class="action">
+                    <input type="button" class="btn btn-primary" onclick="report();" value="Save" />
+                    <button class="btn btn-default close_window">Cancel</button>
+                </fieldset>
+            </div>
+        </nav>
+
+    </form>
 
 <script>
     function report() {
-- 
2.39.5