diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
index 7b3582172f..37a7d05ee0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
@@ -54,7 +54,7 @@
                         <input type="hidden" name="recordtype" value="biblio" />
                         <input type="hidden" name="op" value="cud-list" />
                         <input type="hidden" name="bib_list" value="[% biblionumber | html %]" />
-                        <button type="submit" class="btn btn-default" id="modifybiblio">Modify record using template</a>
+                        <button type="submit" class="btn btn-default" id="modifybiblio">Modify record using template</button>
                     </form>
                 </li>
             [% END %]
@@ -71,7 +71,7 @@
                             <input type="hidden" name="op" value="cud-show" />
                             <input type="hidden" name="biblionumber" value="[% biblionumber | html %]" />
                             <input type="hidden" name="src" value="CATALOGUING" />
-                            <button id="batchedit" type="submit" class="btn btn-default" id="modifybiblio">Edit items in a batch</a>
+                            <button id="batchedit" type="submit" class="btn btn-default" id="modifybiblio">Edit items in a batch</button>
                         </form>
                     </li>
                 [% ELSE %]
@@ -88,7 +88,7 @@
                             <input type="hidden" name="del" value="1" />
                             <input type="hidden" name="biblionumber" value="[% biblionumber | html %]" />
                             <input type="hidden" name="src" value="CATALOGUING" />
-                            <button id="batchdelete" type="submit" class="btn btn-default" id="modifybiblio">Delete items in a batch</a>
+                            <button id="batchdelete" type="submit" class="btn btn-default" id="modifybiblio">Delete items in a batch</button>
                         </form>
                     </li>
                 [% ELSE %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers/tables/items/catalogue_detail.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers/tables/items/catalogue_detail.inc
index 4d23b75103..f7ca251121 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers/tables/items/catalogue_detail.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers/tables/items/catalogue_detail.inc
@@ -40,7 +40,7 @@
             [% IF ( analyze ) %]<th id="[% tab | html %]_usedin" data-colname="[% tab | html %]_usedin">Used in</th><th></th>[% END %]
             [% IF Koha.Preference('UseCourseReserves') %]<th id="[% tab | html %]_course_reserves" data-colname="[% tab | html %]_course_reserves">Course reserves</th>[% END %]
             [% IF ( SpineLabelShowPrintOnBibDetails ) %]<th id="[% tab | html %]_spinelabel" data-colname="[% tab | html %]_spinelabel" class="NoSort">Spine label</th>[% END %]
-            [% IF ( CAN_user_editcatalogue_edit_items ) %]<th id="[% tab | html %]_actions" data-colname="[% tab | html %]_actions"class="NoSort noExport">&nbsp;</th>[% END %]
+            [% IF ( CAN_user_editcatalogue_edit_items ) %]<th id="[% tab | html %]_actions" data-colname="[% tab | html %]_actions" class="NoSort noExport">&nbsp;</th>[% END %]
             </tr>
         </thead>
     </table>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/modals/place_booking.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/modals/place_booking.inc
index 1840e2b791..56c5302dd3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/modals/place_booking.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/modals/place_booking.inc
@@ -26,20 +26,20 @@
                                 <div class="hint">Enter patron card number or partial name</div>
                             </li>
                             <li>
-                                <label class="required" for="booking_pickup">Pickup at:</label>
-                                <select name="booking_pickup" id="pickup_library_id" required="required" disabled="true"></select>
+                                <label class="required" for="pickup_library_id">Pickup at:</label>
+                                <select name="booking_pickup" id="pickup_library_id" required="required" disabled="disabled"></select>
                                 <span class="required">Required</span>
                             </li>
                             <li>
                             <label for="booking_item_id">Item: </label>
-                                <select name="booking_item_id" id="booking_item_id" disabled="true">
+                                <select name="booking_item_id" id="booking_item_id" disabled="disabled">
                                     <option value="0">Any item</option>
                                 </select>
                             </li>
                             <li>
                                 <div id="period_fields">
                                     <label class="required" for="period">Booking dates: </label>
-                                    <input type="text" id="period" name="period" class="flatpickr" data-flatpickr-futuredate="true" data-flatpickr-disable-shortcuts="true" required="required" disabled="true" autocomplete="off">
+                                    <input type="text" id="period" name="period" class="flatpickr" data-flatpickr-futuredate="true" data-flatpickr-disable-shortcuts="true" required="required" disabled="disabled" autocomplete="off">
                                     <span class="required">Required</span>
                                 </div>
                                 <div class="hint">Select the booking start and end date</div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
index 92513e5599..65e395e508 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
@@ -742,7 +742,7 @@
 
 
 [% IF ( Koha.Preference('NovelistSelectStaffEnabled') && Koha.Preference('NovelistSelectStaffProfile') && Koha.Preference('NovelistSelectStaffView') == 'tab' ) %]
-    <div role="tabpanel" class="tab-pane" id="NovelistSelect" class="novelistSelect">
+    <div role="tabpanel" class="tab-pane novelistSelect" id="NovelistSelect">
         <div data-novelist-novelistselect=[% normalized_isbn | html %]></div>
     </div>
 [% END %]
@@ -832,12 +832,12 @@
                 <div class="modal-body">
                     <fieldset>
                         <p>
-                            <label for="item_group_description" class="required">Name: </label>
+                            <label for="modal-item-group-create-form-description" class="required">Name: </label>
                             <input name="description" id="modal-item-group-create-form-description" type="text" size="30" required="required" class="required" />
                             <span class="required">Required</span>
                         </p>
                         <p>
-                            <label for="item_group_display_order" class="required">Display order: </label>
+                            <label for="modal-item-group-create-form-display_order" class="required">Display order: </label>
                             <input name="display_order" id="modal-item-group-create-form-display_order" value="0" size="5" required="required" class="required" />
                             <span class="required">Required</span>
                             <br/>
@@ -865,12 +865,12 @@
                 <div class="modal-body">
                     <fieldset>
                         <p>
-                            <label for="item_group_description" class="required">Name: </label>
+                            <label for="modal-item-group-edit-form-description" class="required">Name: </label>
                             <input name="description" id="modal-item-group-edit-form-description" type="text" size="30" required="required" class="required" />
                             <span class="required">Required</span>
                         </p>
                         <p>
-                            <label for="item_group_display_order" class="required">Sort order: </label>
+                            <label for="modal-item-group-edit-form-display_order" class="required">Sort order: </label>
                             <input name="display_order" id="modal-item-group-edit-form-display_order" size="5" />
                             <span class="hint">Numbers only, item groups will be displayed in counting order</span>
                         </p>
@@ -914,7 +914,7 @@
                 <div class="modal-body">
                     <fieldset>
                         <p>
-                            <label for="item_group" class="required">Item group: </label>
+                            <label for="item-group-add-form-select" class="required">Item group: </label>
                             <select name="item_group" id="item-group-add-form-select">
                                 [% FOREACH ig IN biblio.item_groups.search({}, {order_by => 'display_order'}) %]
                                     <option value="[% ig.id | html %]">[% ig.description | html %]</option>