From d9079bed130a649c9e77551f28d4261b91d1d708 Mon Sep 17 00:00:00 2001
From: Wainui Witika-Park <wainuiwitikapark@catalyst.net.nz>
Date: Tue, 16 Feb 2021 09:11:08 +0000
Subject: [PATCH] Bug 27610: Changed pages of OPAC to have a <h1>

Changed each of the pages in the OPAC to have one <h1> tag showing that describes the page, rather than the <h1> describing the logo.

The hierarchy of heading tags may be broken in many pages, but this will be dealt with in a follow up patch or bug.

To test:
1) Go to the OPAC
2) Apply patch
3) Go to each of the pages and check that they have an obvious and
descriptive heading
4) Ensure that the heading in the page is <h1>

Sponsored by: Catalyst IT
---
 .../opac-tmpl/bootstrap/en/modules/clubs/clubs-tab.tt    |  4 ++--
 koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/enroll.tt |  4 ++--
 .../opac-tmpl/bootstrap/en/modules/errors/errorpage.tt   | 10 +++++-----
 koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt  |  2 +-
 .../opac-tmpl/bootstrap/en/modules/opac-ISBDdetail.tt    |  2 +-
 .../bootstrap/en/modules/opac-account-pay-error.tt       |  1 +
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt |  3 ++-
 .../opac-tmpl/bootstrap/en/modules/opac-advsearch.tt     |  1 +
 .../bootstrap/en/modules/opac-alert-subscribe.tt         |  5 +++--
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt    |  2 +-
 .../bootstrap/en/modules/opac-authorities-home.tt        |  2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-blocked.tt |  2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browse.tt  |  5 ++++-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt |  2 +-
 .../bootstrap/en/modules/opac-course-details.tt          |  2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt  |  2 +-
 .../opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt |  5 +++--
 .../bootstrap/en/modules/opac-full-serial-issues.tt      |  1 +
 .../opac-tmpl/bootstrap/en/modules/opac-holdshistory.tt  |  2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-idref.tt   |  2 +-
 .../opac-tmpl/bootstrap/en/modules/opac-illrequests.tt   | 12 ++++++------
 .../opac-tmpl/bootstrap/en/modules/opac-issue-note.tt    |  2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt |  4 ++--
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt    |  2 ++
 .../opac-tmpl/bootstrap/en/modules/opac-memberentry.tt   |  3 +++
 .../opac-tmpl/bootstrap/en/modules/opac-messaging.tt     |  2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt  |  5 +++--
 .../bootstrap/en/modules/opac-password-recovery.tt       |  2 +-
 .../bootstrap/en/modules/opac-patron-consent.tt          |  2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt |  2 +-
 .../opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt |  2 +-
 .../bootstrap/en/modules/opac-registration-email-sent.tt |  2 +-
 .../bootstrap/en/modules/opac-request-article.tt         |  2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt |  1 +
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt |  6 +++---
 .../opac-tmpl/bootstrap/en/modules/opac-retrieve-file.tt |  3 ++-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-review.tt  |  3 ++-
 .../opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt |  2 +-
 .../opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt |  2 +-
 .../opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt    |  2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 10 +++++-----
 .../opac-tmpl/bootstrap/en/modules/opac-showreviews.tt   |  2 +-
 .../opac-tmpl/bootstrap/en/modules/opac-suggestions.tt   | 16 +++++++++-------
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt    |  2 +-
 .../opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt  |  2 +-
 .../opac-tmpl/bootstrap/en/modules/opac-topissues.tt     |  2 ++
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt    |  9 +++++----
 koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt     |  6 +++---
 .../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl          |  4 ++--
 49 files changed, 98 insertions(+), 75 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/clubs-tab.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/clubs-tab.tt
index aa2c221a9a..f67bacea80 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/clubs-tab.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/clubs-tab.tt
@@ -2,7 +2,7 @@
 
 [% IF enrollments %]
 
-    <h4>Clubs currently enrolled in</h4>
+    <h2>Clubs currently enrolled in</h2>
 
     <table id="clubs-table-enrolled" class="table table-bordered table-striped">
         <thead>
@@ -37,7 +37,7 @@
 
 [% IF clubs %]
 
-    <h4>Clubs you can enroll in</h4>
+    <h2>Clubs you can enroll in</h2>
 
     <table id="clubs-table-unenrolled" class="table table-bordered table-striped">
         <thead>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/enroll.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/enroll.tt
index 0fdb275ada..1c5b564b9f 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/enroll.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/enroll.tt
@@ -1,9 +1,9 @@
 [% USE AuthorisedValues %]
 [% SET AuthorisedValuesCategories = AuthorisedValues.GetCategories %]
 
-<h3>
+<h2>
     Enroll in <em>[% club.name | html %]</em>
-</h3>
+</h2>
 
 <div class="container">
     <form id="patron-enrollment-form">
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/errorpage.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/errorpage.tt
index e47b510a5e..6daca7787f 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/errorpage.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/errorpage.tt
@@ -31,9 +31,9 @@
                     <div class="col order-first order-md-first order-lg-2">
                 [% END %]
                     <div id="errormsg[% errno | html %]">
-                        <h3>Sorry, the requested page is not available</h3>
-                        <h4>Error [% errno | html %]</h4>
-                        <h5>This message can have the following reason(s):</h5>
+                        <h1>Sorry, the requested page is not available</h1>
+                        <h2>Error [% errno | html %]</h2>
+                        <h3>This message can have the following reason(s):</h3>
                         <ul>
                             [% IF ( errno == 400 ) %]
                                 <li>The link is broken and the page does not exist.</li>
@@ -61,7 +61,7 @@
                                 <li>An error occurred while processing your request.</li>
                             [% END %]
                         </ul>
-                        <h4>What's next?</h4>
+                        <h2>What's next?</h2>
                         <ul>
                             [% IF ( errno == 401 ) && ( Koha.Preference( 'opacuserlogin' ) == 1 ) %]
                                 <li>Please log in to the catalog and try again. <a href="/cgi-bin/koha/opac-user.pl">Login page</a></li>
@@ -70,7 +70,7 @@
                             <li>You can search our catalog using the search form at the top of this page.</li>
                             <li><a href="/cgi-bin/koha/opac-main.pl">Return to the catalog home page.</a></li>
                         </ul>
-                        <h4>Report issues and broken links</h4>
+                        <h2>Report issues and broken links</h2>
                         <ul>
                             <li>To report this error, please contact the Koha Administrator.
                                     <a href="mailto:[% admin | uri %]">Send email</a>.</li>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt
index 198fc584f6..2ffbf9d9f9 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt
@@ -39,7 +39,7 @@
                     [% IF Koha.Preference( 'OpacMaintenanceNotice' ) %]
                         [% Koha.Preference( 'OpacMaintenanceNotice' ) | $raw %]
                     [% ELSE %]
-                        <h2>System Maintenance</h2>
+                        <h1>System Maintenance</h1>
                           <p>The [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog is offline for system maintenance. We'll be back soon! If you have any questions, please contact the <a href="mailto:[% KohaAdminEmailAddress | uri %]">site administrator</a></p>
                     [% END %]
                 </div>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-ISBDdetail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-ISBDdetail.tt
index b7d5283b5e..3b8940e167 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-ISBDdetail.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-ISBDdetail.tt
@@ -30,7 +30,7 @@
                                 <span class="view"><a id="Normalview" class="btn btn-link" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | html %]"><i class="fa fa-file-text-o" aria-hidden="true"></i> Normal view</a></span>
                                 <span class="view"><a id="MARCview" class="btn btn-link" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% biblio.biblionumber | html %]"><i class="fa fa-list-alt" aria-hidden="true"></i> MARC view</a></span>
                                 <span class="view current-view"><span id="ISBDview"><i class="fa fa-list-ul" aria-hidden="true"></i> ISBD view</span></span></div>
-
+                                <h1 class="title">[% INCLUDE 'biblio-title.inc' %]</h1>
                                 <div id="isbdcontents">[% ISBD | $raw %]</div>
 
                         </div> <!-- / #catalogue_detail_biblio -->
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account-pay-error.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account-pay-error.tt
index 1cdf2f4b84..a2004cde32 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account-pay-error.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account-pay-error.tt
@@ -30,6 +30,7 @@
             </div>
             <div class="col-10 order-first order-md-first order-lg-2">
                 <div id="useraccount" class="maincontent">
+                    <h1>Account payment</h1>
                     [% IF error %]
                         <div id="error" class="alert alert-warning">
                             <p><strong>Error:</strong> there was a problem processing your payment</p>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt
index 97c6281a6f..13ec32dd6e 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt
@@ -42,6 +42,7 @@
             <div class="col-md-12 col-lg-10 order-1">
                 <div id="useraccount" class="maincontent">
 
+                    <h1>Charges</h1>
                     [% IF message %]
                         <div class="alert alert-info">
                             [% IF message == 'valid_payment' %]
@@ -73,7 +74,7 @@
                             <p><strong>Payment applied:</strong> your payment of [% payment | html %] has been applied to your account</p>
                         </div>
                     [% END %]
-                    <h2>Charges</h2>
+
                     [% PROCESS 'account-table.inc' ACCOUNT_LINES = ACCOUNT_LINES, ENABLE_OPAC_PAYMENTS = ENABLE_OPAC_PAYMENTS, plugins = plugins %]
 
                 </div> <!-- / #useraccount -->
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt
index ada84161e9..d2c516d781 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt
@@ -28,6 +28,7 @@
                 <div class="col order-first order-md-first order-lg-2">
                     <!-- BOOLEAN SEARCH OPTIONS -->
                     <div id="booleansearch" class="maincontent">
+                        <h1>Advanced search</h1>
                         <fieldset>
                             <legend>Search for:</legend>
                             [% IF ( expanded_options ) %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-alert-subscribe.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-alert-subscribe.tt
index 656fd482c1..972d1bda2d 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-alert-subscribe.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-alert-subscribe.tt
@@ -18,8 +18,9 @@
             <div class="row">
                 <div class="col order-first order-md-first order-lg-2">
                     <div id="useralertsubscribe" class="maincontent">
+                            <h1>Subscription alerts</h1>
                         [% IF ( typeissue ) %]
-                            <h1>Subscribe to a subscription alert</h1>
+                            <h2>Subscribe to a subscription alert</h2>
                             <form action="opac-alert-subscribe.pl" method="post">
                                 <p>Do you want to receive an email when a new issue for this subscription arrives?</p>
                                 <h4>[% bibliotitle | html %]</h4>
@@ -33,7 +34,7 @@
                             </form>
                         [% END %]
                         [% IF ( typeissuecancel ) %]
-                            <h1>Unsubscribe from a subscription alert</h1>
+                            <h2>Unsubscribe from a subscription alert</h2>
                             <form action="opac-alert-subscribe.pl" method="post">
                                 <p>Please confirm that you do not want to receive email when a new issue arrives for this subscription.</p>
                                 <h4>[% bibliotitle | html %]</h4>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt
index d5f142c86b..abedf7895b 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt
@@ -50,7 +50,7 @@
 
                         [% IF ( loginprompt ) %]
                             <!-- login prompt time-->
-                            <h2>Log in to your account</h2>
+                            <h1>Log in to your account</h1>
 
                             [% IF ( timed_out ) %]
                                 <!-- This is what is displayed if login has timed out -->
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authorities-home.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authorities-home.tt
index b7c4879e9a..fe390b9489 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authorities-home.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authorities-home.tt
@@ -36,7 +36,7 @@
                             <input type="hidden" name="op" value="do_search" />
                             <input type="hidden" name="type" value="opac" />
                             <fieldset class="rows">
-                                <legend>Authority search</legend>
+                                <legend><h1>Authority search</h1></legend>
                                 <ol>
                                     <li>
                                         <label for="authtypecode">Authority type: </label>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-blocked.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-blocked.tt
index a2c187f27e..6c18d4ec31 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-blocked.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-blocked.tt
@@ -22,7 +22,7 @@
         <div class="row justify-content-center">
             <div class="col-md-10 col-lg-6">
                 <div id="opac-blocked-message" class="maincontent">
-                    <h3>Blocked</h3>
+                    <h1>Blocked</h1>
                     <p>You are not authorized to view this record.</p>
                     [% IF ( OpacSuppressionMessage ) %]
                         <div id="opacsuppressionmessage">
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browse.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browse.tt
index 11ff7f1efc..3717bfa2d2 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browse.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browse.tt
@@ -108,7 +108,10 @@
                     </div><!-- / #browse-resultswrapper -->
                 </div><!-- /#browse-search -->
             [% ELSE %]
-                <h3>This feature is not enabled</h3>
+                <h1>Browse search</h1>
+                <div class="alert alert-info">
+                    This feature is not enabled
+                </div>
             [% END %]
 
             </div><!-- / .col/col-10 -->
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt
index de6e9b5e40..566e70872a 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt
@@ -33,7 +33,7 @@
                 [% END %]
 
                     <div id="userbrowser" class="maincontent">
-                        <h2>Browse our catalog</h2>
+                        <h1>Browse our catalog</h1>
 
                         [% IF ( have_hierarchy ) %]
                             <ul>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt
index d90c1fa2e8..c85b63e612 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt
@@ -37,7 +37,7 @@
             <div class="col">
                 <div id="course_reserves" class="maincontent">
 
-                    <h2>Course reserves for <em>[% course.course_name | html %]</em></h2>
+                    <h1>Course reserves for <em>[% course.course_name | html %]</em></h1>
                     <div class="rows">
                         <ol>
                             [% IF ( course.term ) %]<li><span class="label">Term:</span> [% AuthorisedValues.GetByCode( 'TERM', course.term, 1 ) | html %]</li>[% END %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
index a14c1e3607..29a8139b1c 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
@@ -141,7 +141,7 @@
                     [% IF ( OPACXSLTDetailsDisplay ) %]
                         [% XSLTBloc | $raw %]
                     [% ELSE %]
-                        <h2 class="title">[% INCLUDE 'biblio-title.inc' %]</h2>
+                        <h1 class="title">[% INCLUDE 'biblio-title.inc' %]</h1>
                         [% IF ( author ) %]
                             <span class="results_summary author h3">by <a class="contributors" href="/cgi-bin/koha/opac-search.pl?q=au:[% author |url %]">[% author | html %]</a></span>
                         [% END %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt
index 78b0e4dc6a..8794348a3e 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt
@@ -46,14 +46,15 @@
 [% END # / IF fullpage %]
 
                     <div id="userdownloadshelf" class="maincontent">
+
                         [% UNLESS ( invalidlist ) %]
 
+                            <h1>Download list <em>[% shelf.shelfname | html %]</em></h1>
                             [% IF ( format ) %]
                                 <div class="alert alert-info">
                                     <p>Your download should begin automatically.</p>
                                 </div>
                             [% ELSE %]
-                                <h1>Download list <em>[% shelf.shelfname | html %]</em></h1>
                                 <form method="post" action="/cgi-bin/koha/opac-downloadshelf.pl">
                                     <fieldset>
                                         <select name="format" id="dlformat" required="required">
@@ -92,7 +93,7 @@
                             [% END # / IF format %]
 
                         [% ELSE %]
-
+                            <h1>Download list unsuccessful</h1>
                             <div class="alert alert-warning">
                                 <p>You do not have permission to download this list.</p>
                             </div>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt
index 6ad30b0f39..51d6fc701c 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt
@@ -97,6 +97,7 @@
                 <div class="col-10 order-first order-md-first order-lg-2">
                     <div id="fullserialissues" class="maincontent">
                         [% UNLESS ( popup ) %]
+                            <h1>Full subscription history</h1>
                             <h2>Full subscription history for [% bibliotitle | html %]</h2>
                             <div id="views">
                                 <span class="view"><a id="Normalview" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber | html %]">Normal view</a></span>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdshistory.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdshistory.tt
index a684a304e7..4ab6a009a2 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdshistory.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdshistory.tt
@@ -52,7 +52,7 @@
             </div>
             <div class="col-md-12 col-lg-10 order-1">
                 <div id="userholdshistory">
-                    <h3>Holds history</h3>
+                    <h1>Holds history</h1>
 
                     [% IF !holds %]
                         You have never placed a hold from this library.
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-idref.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-idref.tt
index bd4ff8257b..b442f46a23 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-idref.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-idref.tt
@@ -23,7 +23,7 @@
   [% ELSE %]
     [% FOREACH role IN content %]
       <div>
-        <h2 class="role" title="Click to expand this role">[% role.role_name | html %] ([% role.count | html %])</h2>
+        <h1 class="role" title="Click to expand this role">[% role.role_name | html %] ([% role.count | html %])</h1>
           <div class="docs">
             <table>
               <thead>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt
index ab03b84d96..2c2c64fadb 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt
@@ -69,7 +69,7 @@
                 [% ELSE %]
                     <div id="illrequests" class="maincontent">
                         [% IF method == 'create' %]
-                            <h2>New interlibrary loan request</h2>
+                            <h1>New interlibrary loan request</h1>
                             [% IF stage == 'copyrightclearance' %]
                                 [% INCLUDE messages %]
                                 <div>
@@ -104,7 +104,7 @@
                                 [% END %]
                             [% END # /IF stage == 'copyrightclearance' %]
                         [% ELSIF method == 'list' %]
-                            <h2>Interlibrary loan requests</h2>
+                            <h1>Interlibrary loan requests</h1>
                             [% INCLUDE messages %]
 
                             <div id="illrequests-create-button" class="dropdown btn-group">
@@ -165,7 +165,7 @@
                                 </tbody>
                             </table>
                         [% ELSIF method == 'view' %]
-                            <h2>View interlibrary loan request</h2>
+                            <h1>View interlibrary loan request</h1>
                             [% INCLUDE messages %]
                             [% status = request.status %]
                             <form method="post" action="?method=update" id="illrequestupdate-form" novalidate="novalidate">
@@ -239,9 +239,9 @@
                                 </fieldset>
                             </form>
                         [% ELSIF method == 'availability' %]
-                            <h2>Interlibrary loan item availability</h2>
+                            <h1>Interlibrary loan item availability</h1>
                             <div id="results">
-                                <h3>Displaying availability results</h3>
+                                <h2>Displaying availability results</h2>
                                 <form method="POST" action="/cgi-bin/koha/opac-illrequests.pl">
                                     [% FOREACH key IN whole.keys %]
                                         [% value = whole.$key %]
@@ -265,7 +265,7 @@
                                     </div>
                                 </form>
                                 [% FOR service IN services %]
-                                    <h4 class="ill_availability_sourcename">[% service.name | html %]</h4>
+                                    <h3 class="ill_availability_sourcename">[% service.name | html %]</h3>
                                     [% INCLUDE 'ill-availability-table.inc' service=service %]
                                 [% END %]
                             </div> <!-- /#illrequestupdate-form -->
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-issue-note.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-issue-note.tt
index bb997f8c31..b788017932 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-issue-note.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-issue-note.tt
@@ -33,7 +33,7 @@
             </div>
             <div class="col-10 order-first order-md-first order-lg-2">
                 <div id="issuenote" class="maincontent">
-                    <h2>Editing issue note for [% title | html %] [% author | html %]</h2>
+                    <h1>Editing issue note for [% title | html %] [% author | html %]</h1>
                         [% IF not(Koha.Preference("AllowCheckoutNotes")) %]
                             Issue notes have not been enabled. Please contact the library.
                         [% ELSE %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt
index bd9a7744aa..7460ff9f46 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt
@@ -99,7 +99,7 @@
                 [% IF ( library ) %]
 
                     <div id="library_info" class="maincontent" vocab="http://schema.org/" typeof="Library">
-                        <h3 property="name">[% library.branchname | html %]</h3>
+                        <h1 property="name">[% library.branchname | html %]</h1>
 
                         <div class="row">
                             <div class="col-lg-8">
@@ -137,7 +137,7 @@
 
                 [% ELSE %]
                     <div id="library_info" class="maincontent">
-                        <h2>[% IF ( singleBranchMode ) %]Library[% ELSE %]Libraries[% END %]</h2>
+                        <h1>[% IF ( singleBranchMode ) %]Library[% ELSE %]Libraries[% END %]</h1>
 
                         [% FOREACH library IN libraries %]
                             <h3 property="name">
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
index 181fb9a0db..3f059a2fee 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
@@ -66,6 +66,8 @@
             <div class="col order-md-1 maincontent">
         [% END %]
 
+        <h1>Home</h1>
+
         [% IF Koha.Preference( 'OpacNewsLibrarySelect' ) %]
             [% UNLESS news_item %]
                 <form id="news-branch-select" class="form-inline" name="news-branch-select" method="get" action="/cgi-bin/koha/opac-main.pl">
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
index fc46fedda5..fb2e0ca17e 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
@@ -64,6 +64,9 @@
                 </div>
             </div>
             <div class="col-md-12 col-lg-10 order-1">
+
+                <h1>Your personal details</h1>
+
                 [% IF action == 'edit' %]
                     <div id="update-account" class="maincontent">
                 [% ELSE %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt
index ef0b7af5d5..3dd4b6d809 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt
@@ -33,7 +33,7 @@
 
                 [% IF Koha.Preference( 'EnhancedMessagingPreferencesOPAC' )  %]
                     <div id="usermessaging" class="maincontent">
-                        <h3>Your messaging settings</h3>
+                        <h1>Your messaging settings</h1>
                         [% IF ( settings_updated ) %]
                             <div class="alert alert-success"><h4>Settings updated</h4></div>
                         [% END %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt
index c66523ec1a..98fd3dc569 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt
@@ -33,7 +33,7 @@
             </div>
             <div class="col-10 order-first order-lg-2">
                 <div id="userpasswd" class="maincontent">
-                    <h3>Change your password </h3>
+                    <h1>Change your password </h1>
 
                     [% IF ( Error_messages ) %]
                         <div class="alert alert-warning">
@@ -93,7 +93,8 @@
 
                     [% IF ( password_updated ) %]
                         <div class="alert alert-info">
-                            <h1>Password updated</h1>
+                            <strong>Password updated</strong>
+                            <br />
                             Your password has been changed
                         </div>
                         <form action="/cgi-bin/koha/opac-user.pl" method="post" autocomplete="off">
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt
index c2f0c9654a..e234db6f2c 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt
@@ -69,7 +69,7 @@
                 [% END %]
             </div>
             <div class="col-6 order-first order-md-first order-lg-2 maincontent">
-                <h3>Forgotten password recovery</h3>
+                <h1>Forgotten password recovery</h1>
                 [% IF (hasError) %]
                     <div class="alert alert-warning">
                         <h3>Error</h3>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt
index 8ef79facd1..77836942dd 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt
@@ -40,7 +40,7 @@
                     </div>
                     [% END %]
 
-                    <h3>Your consents</h3>
+                    <h1>Your consents</h1>
 
                     <form action="/cgi-bin/koha/opac-patron-consent.pl" method="post">
                         [% IF Koha.Preference('GDPR_Policy') %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt
index 787adf978b..662ef8c46a 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt
@@ -32,7 +32,7 @@
             <div class="col-md-12 col-lg-10 order-1">
 
                 <div id="userprivacy" class="maincontent">
-                    <h2>Your privacy management</h2>
+                    <h1>Your privacy management</h1>
 
                     [% IF deleted %]
                         <div class="alert alert-success">Your checkout history has been deleted.</div>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt
index 4da626c48d..ec49c3e617 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt
@@ -45,7 +45,7 @@
             <div class="col-md-12 col-lg-10 order-1">
 
                 <div id="userreadingrecord" class="maincontent">
-                    <h3>Checkout history</h3>
+                    <h1>Checkout history</h1>
 
                     [% IF READING_RECORD.size == 0 %]
                         You have never borrowed anything from this library.
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-email-sent.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-email-sent.tt
index d028f53b34..d85e858bad 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-email-sent.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-email-sent.tt
@@ -32,8 +32,8 @@
                     <div class="col order-first order-md-first order-lg-2">
                 [% END %]
                     <div id="registration-confirmation-pending" class="maincontent">
+                        <h1>Please confirm your registration</h1>
                         <div id="confirmation-pending" class="alert alert-info">
-                            <h1>Please confirm your registration</h1>
 
                             <p>A confirmation email will be sent shortly to the email address <strong>[% email | html %]</strong>.</p>
 
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-request-article.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-request-article.tt
index 82e3ac5fb6..3e9e0db090 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-request-article.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-request-article.tt
@@ -35,7 +35,7 @@
                     [% IF article_request_type == 'bib_only' %]  [% SET mandatory_fields = Koha.Preference('ArticleRequestsMandatoryFieldsRecordOnly') %] [% END %]
                     [% IF article_request_type == 'item_only' %] [% SET mandatory_fields = Koha.Preference('ArticleRequestsMandatoryFieldsItemOnly') %]   [% END %]
 
-                    <h3>Place article request for [% biblio.title | html %]</h3>
+                    <h1>Place article request for [% biblio.title | html %]</h1>
 
                     <form id="place-article-request" method="post" action="/cgi-bin/koha/opac-request-article.pl">
                         <input type="hidden" name="action" value="create" />
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
index ec4aaf5b03..d6acf1e477 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
@@ -27,6 +27,7 @@
 
     <div class="container">
         <div id="holds" class="maincontent">
+            <h1>Placing a hold</h1>
             [% IF ( message ) %]
                 <div id="holdmessages" class="alert">
                     <p>Sorry, you cannot place holds.</p>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
index ad91bbbba6..57841b4d4a 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
@@ -61,7 +61,7 @@
             <div class="container-fluid">
                 <div class="row">
                     <div class="col">
-                        <h2 id="numresults">No results found!</h2>
+                        <h1 id="numresults">No results found!</h1>
                         <p>
                             [% IF ( searchdesc ) %]
                                 No results found for that in [% LibraryName | html %] catalog.
@@ -115,12 +115,12 @@
 
                 [% IF ( searchdesc ) %]
                     [% IF ( total ) %]
-                        <h2 id="numresults">
+                        <h1 id="numresults">
                             Your search returned [% total | html %] results.
                             <a href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %]&amp;format=rss" class="btn btn-link rsssearchlink noprint" aria-label="Subscribe to this search">
                                 <i class="fa fa-rss rsssearchicon" aria-hidden="true" title="Subscribe to this search"></i>
                             </a>
-                        </h2>
+                        </h1>
                         [% IF ( related ) %]
                             <p>(related searches:[% FOREACH relate IN related %] [% relate.related_search | html %][% END %]).</p>
                         [% END %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-retrieve-file.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-retrieve-file.tt
index 6aea8f785b..d8a17c7760 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-retrieve-file.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-retrieve-file.tt
@@ -1,6 +1,7 @@
 [%# This template is called only for a very simple error message %]
 <html>
 <body id="opac-retrieve-file" class="scrollto">
-Your search [% IF hash %]for [% hash | html %][% END %] was not successful.
+    <h1>Search unsuccessful</h1>
+    Your search [% IF hash %]for [% hash | html %][% END %] was not successful.
 </body>
 </html>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-review.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-review.tt
index 3e56ddff6b..8a9e2663d0 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-review.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-review.tt
@@ -9,6 +9,7 @@
             <div class="row">
                 <div class="col order-first order-md-first order-lg-2">
                     <div id="userreview" class="maincontent">
+                        <h1>Reviews</h1>
                         [% IF ( cgi_debug ) %]
                             <div class="debug">CGI debug is on.</div>
                         [% END %]
@@ -39,7 +40,7 @@
                             </div>
                         [% END # / ERRORs %]
 
-                        <h1>Comments on <em>[% INCLUDE 'biblio-title.inc' %]</em></h1>
+                        <h2>Comments on <em>[% INCLUDE 'biblio-title.inc' %]</em></h2>
                         [% IF ( biblio.author ) %]<h3>[% biblio.author | html %]</h3>[% END %]
                         <form id="reviewf" action="/cgi-bin/koha/opac-review.pl[% IF ( cgi_debug ) %]?debug=1[% END %]" method="post">
                             <input type="hidden" name="biblionumber" value="[% biblio.biblionumber | html %]" />
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt
index 4ff3bd7b43..70c6788818 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt
@@ -38,7 +38,7 @@
             <div class="col-10 order-first order-md-first order-lg-2">
                 <div id="user-routing-lists" class="maincontent">
 
-                    <h2>Routing lists</h2>
+                    <h1>Routing lists</h1>
 
                     [% SET routinglists = logged_in_user.get_routing_lists %]
                     [% IF ( routinglists.count ) %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt
index 7aa3f32906..143b46f010 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt
@@ -42,7 +42,7 @@
                     <div class="col order-first order-md-first order-lg-2">
                 [% END %]
                     <div id="userserialissues" class="maincontent">
-                        <h2>Issues for a subscription</h2>
+                        <h1>Issues for a subscription</h1>
                         <div id="views">
                             <span class="view">
                                 <a id="Normalview" href="opac-detail.pl?biblionumber=[% biblionumber | html %]" class="button">Normal view</a>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt
index b55f7364f7..8a5e1f44c0 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt
@@ -41,7 +41,7 @@
                 <div id="shareshelf" class="maincontent">
 
                     [%# This section contains the essential code for error messages and three operations: invite, confirm_invite and accept. %]
-                    <h2>Share a list with another patron</h2>
+                    <h1>Share a list with another patron</h1>
 
                     [% IF errcode %]
                         [% IF errcode==1 && op %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
index b780ad16f6..11a4dde294 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
@@ -193,12 +193,12 @@
                     [% END %]
 
                     [% IF shelf AND op == 'view' %]
-                        <h2>
+                        <h1>
                             [% shelf.shelfname | html %]
                             <a href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-shelves.pl?rss=1&amp;op=view&amp;shelfnumber=[% shelf.shelfnumber | uri %]" class="rss-list-link noprint" aria-label="Subscribe to this list">
                                 <i class="fa fa-fw fa-rss rsssearchicon" aria-hidden="true" title="Subscribe to this list"></i>
                             </a>
-                        </h2>
+                        </h1>
 
                         [% IF ( itemsloop ) %]
                             [% SET contents = shelf.get_contents %]
@@ -617,10 +617,10 @@
                             <fieldset class="rows">
                                 [% IF op == 'add_form' %]
                                     <div id="addshelf">
-                                    <legend>Create a new list</legend>
+                                        <legend><h1>Create a new list</h1></legend>
                                     <input type="hidden" name="op" value="add" />
                                 [% ELSE %]
-                                    <legend>Editing <em>[% shelf.shelfname | html %]</em></legend>
+                                <legend><h1>Editing <em>[% shelf.shelfname | html %]</em></h1></legend>
                                     <input type="hidden" name="op" value="edit" />
                                     <input type="hidden" name="referer" value="[% referer | html %]" />
                                     <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber | html %]" />
@@ -699,7 +699,7 @@
                         </form>
 
                     [% ELSIF op == 'list' %]
-                        <h2>Lists</h2>
+                        <h1>Lists</h1>
                         <div class="toptabs ui-tabs ui-widget ui-widget-content ui-corner-all">
                             <ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
                                 [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt
index 010a1766c6..cb9e992ac7 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt
@@ -35,7 +35,7 @@
                     <div class="col order-first order-md-first order-lg-2">
                 [% END %]
                    <div id="showreviews" class="searchresults maincontent">
-                        <h3>Recent comments <a href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-showreviews.pl?format=rss" class="rsssearchlink" aria-label="Subscribe to recent comments"><i class="fa fa-rss rsssearchicon" aria-hidden="true" title="Subscribe to recent comments"></i></a></h3>
+                        <h1>Recent comments <a href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-showreviews.pl?format=rss" class="rsssearchlink" aria-label="Subscribe to recent comments"><i class="fa fa-rss rsssearchicon" aria-hidden="true" title="Subscribe to recent comments"></i></a></h1>
                         <table class="table table-striped">
                             [% SET AdlibrisEnabled = Koha.Preference('AdlibrisCoversEnabled') %]
                             [% SET AdlibrisURL = Koha.Preference('AdlibrisCoversURL') %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
index d73defd049..30781ce591 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
@@ -41,18 +41,20 @@
                 <div class="col-md-12 col-lg-10 order-1">
 
                     <div id="usersuggestions" class="maincontent">
+                        <h1>Your purchase suggestions</h1>
                         [% IF ( op_add ) %]
                             [% IF ( Koha.Preference('MaxTotalSuggestions') != '' && patrons_total_suggestions_count >= Koha.Preference('MaxTotalSuggestions') ) %]
-                                    <h1 class="TooManySuggestions">You cannot place any more suggestions</h1>
-                                    <h2 class="TooManySuggestionsText">You may only add up to [% Koha.Preference('MaxTotalSuggestions') | html %] suggestions in [% Koha.Preference('NumberOfSuggestionDays') | html %] days.</h2>
+                                    <h2 class="TooManySuggestions">You cannot place any more suggestions</h2>
+                                    <h3 class="TooManySuggestionsText">You may only add up to [% Koha.Preference('MaxTotalSuggestions') | html %] suggestions in [% Koha.Preference('NumberOfSuggestionDays') | html %] days.</h3>
                             [% ELSIF ( Koha.Preference('MaxOpenSuggestions') != '' && patrons_pending_suggestions_count >= Koha.Preference('MaxOpenSuggestions') ) %]
-                                    <h1 class="TooManySuggestions">You cannot place any more suggestions</h1>
-                                    <h2 class="TooManySuggestionsText">You have reached your limit for suggestions you can place at this time ([% Koha.Preference('MaxOpenSuggestions') | html %]). Once the library has processed those suggestions you will be able to place more.</h2>
+                                    <h2 class="TooManySuggestions">You cannot place any more suggestions</h2>
+                                    <h3 class="TooManySuggestionsText">You have reached your limit for suggestions you can place at this time ([% Koha.Preference('MaxOpenSuggestions') | html %]). Once the library has processed those suggestions you will be able to place more.</h3>
                             [% ELSE %]
+
                             [% IF ( opacsuggestion ) %]
                                 [% PROCESS koha_news_block news => opacsuggestion %]
                             [% ELSE %]
-                                <h1>Enter a new purchase suggestion</h1>
+                                <h2>Enter a new purchase suggestion</h2>
 
                                 <p>Please fill out this form to make a purchase suggestion. You will receive an email when the library processes your suggestion.</p>
                                 <p>Only certain fields (marked in red) are required, but the more information you enter the easier it will be for the librarians to find the title you're requesting. The "Notes" field can be used to provide any additional information.</p>
@@ -259,7 +261,7 @@
                         [% END #  IF op_add %]
 
                         [% IF ( op_else ) %]
-                            <h1>
+                            <h2>
                                 [% IF Koha.Preference( 'OPACViewOthersSuggestions' ) == 1 %]
                                     Purchase suggestions
                                 [% ELSE %]
@@ -269,7 +271,7 @@
                                         Purchase suggestions
                                     [% END %]
                                 [% END %]
-                            </h1>
+                            </h2>
                             [% FOR m IN messages %]
                                 <div class="alert alert-[% m.type | html %]">
                                     [% SWITCH m.code %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt
index 5e926ce77c..941fbc472d 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt
@@ -58,6 +58,7 @@
             [% END %]
 
                     <div id="usertags" class="maincontent">
+                        <h1>All Tags</h1>
                         [% IF ( ERRORS ) %]
                             [% FOREACH ERROR IN ERRORS %]
                                 <div class="alert alert-warning">
@@ -80,7 +81,6 @@
                                 </div>
                             [% END %]
                         [% END # /IF ERRORS %]
-                        <h1>All Tags</h1>
 
                         <form method="get" action="opac-tags.pl" class="form-inline">
                             <fieldset>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt
index 3eea8b9bba..41ab8a617f 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt
@@ -33,7 +33,7 @@
                 [% END %]
 
                     <div id="subjectcloud" class="maincontent">
-                        <h2>Subject cloud</h2>
+                        <h1>Subject cloud</h1>
                             [% IF Koha.Preference( 'OpacCloud' ) == 1 %]
                                 [% IF ( LOOP ) %]
                                     <p>This &quot;cloud&quot; shows the most used topics in our catalog. Click on any subject below to see the items in our collection.</p>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt
index 14f94bf3f8..403a6179aa 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt
@@ -62,6 +62,8 @@
                 <div class="col-10 order-first order-md-first order-lg-2">
                     <div id="topissues" class="maincontent">
 
+                        <h1>Top issues</h1>
+
                         [% IF ( results ) %]
                             <table id="topissuest" class="table table-bordered table-striped">
                                 <caption>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
index 5d4206a0c6..c583c591ff 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
@@ -50,12 +50,13 @@
             <div class="col-md-12 col-lg-10 order-1 order-lg-2">
                 <div id="userdetails" class="maincontent">
 
-                    [% INCLUDE 'opac-note.inc' %]
+                    <h1>Your summary</h1>
 
-                    <h2>Hello, [% INCLUDE 'patron-title.inc' patron = logged_in_user %]
-                    </h2>
+                    [% INCLUDE 'opac-note.inc' %]
 
-                    <p><a href="/cgi-bin/koha/opac-main.pl?logout.x=1">Click here if you're not [% INCLUDE 'patron-title.inc' patron = logged_in_user %]</a></p>
+                    <p>Hello, [% INCLUDE 'patron-title.inc' patron = logged_in_user %]
+                    <br />
+                    <a href="/cgi-bin/koha/opac-main.pl?logout.x=1">Click here if you're not [% INCLUDE 'patron-title.inc' patron = logged_in_user %]</a></p>
 
                     [% IF ( patronupdate ) %]<div class="alert alert-info"><h3>Thank you!</h3><p>Your corrections have been submitted to the library, and a staff member will update your record as soon as possible.</p></div>[% END %]
 
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt
index c0a1376eff..274083923b 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt
@@ -36,18 +36,18 @@
                     is not behaving as expected, you may want to refer to this guide to get
                     yourself started.</p>
 
-                    <h3>Step one: Enter your user id[% IF ( SelfCheckoutByLogin ) %] and password[% END %]</h3>
+                    <h2>Step one: Enter your user id[% IF ( SelfCheckoutByLogin ) %] and password[% END %]</h2>
 
                     <p>Enter your User ID[% IF ( SelfCheckoutByLogin ) %] and password[% END %], and click the
                     submit button (or press the enter key).</p>
 
-                    <h3>Step two: Scan the barcode for each item, one at a time</h3>
+                    <h2>Step two: Scan the barcode for each item, one at a time</h2>
 
                     <p>Scan each item and wait for the page to reload before scanning the next item.
                     The checked-out item should appear in your checkouts list.
                     The Submit button only needs to be clicked if you enter the barcode manually.</p>
 
-                    <h3>Step three: Click the 'Finish' button</h3>
+                    <h2>Step three: Click the 'Finish' button</h2>
 
                     <p>If you do not click the 'Finish' button, your session will automatically expire in
                     [% SelfCheckTimeout | html %] seconds.</p>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
index 0931ba2c04..cacad015e2 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
@@ -129,7 +129,7 @@
 
             <!--Bug 13381 -->
             <xsl:if test="marc:datafield[@tag=245]">
-                <h2 class="title" property="name">
+                <h1 class="title" property="name">
                     <xsl:for-each select="marc:datafield[@tag=245]">
                         <xsl:call-template name="subfieldSelect">
                             <xsl:with-param name="codes">a</xsl:with-param>
@@ -154,7 +154,7 @@
                             </xsl:choose>
                         </xsl:for-each>
                     </xsl:for-each>
-                </h2>
+                </h1>
             </xsl:if>
 
 
-- 
2.11.0