From ee53369bb78c61d518583f7dbb4c7bc9ae25c2c8 Mon Sep 17 00:00:00 2001
From: Terran McCanna <tmccanna@georgialibraries.org>
Date: Wed, 23 Dec 2020 19:22:31 -0500
Subject: [PATCH] PINES Bootstrap Customizations

Omnibus 2 - collection of customizations, mostly to
translation strings.

Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
---
 Open-ILS/src/templates-bootstrap/opac/browse.tt2   |   3 +-
 .../src/templates-bootstrap/opac/css/style.css.tt2 |  82 +++++++++-
 .../src/templates-bootstrap/opac/mylist/email.tt2  |   2 +-
 .../templates-bootstrap/opac/myopac/charges.tt2    |   7 +-
 .../opac/myopac/circ_history.tt2                   |   4 +-
 .../src/templates-bootstrap/opac/myopac/circs.tt2  |   4 +-
 .../opac/myopac/hold_history.tt2                   |   2 +-
 .../src/templates-bootstrap/opac/myopac/holds.tt2  |   8 -
 .../templates-bootstrap/opac/myopac/holds/edit.tt2 |  49 +++---
 .../src/templates-bootstrap/opac/myopac/lists.tt2  |  72 +++++----
 .../src/templates-bootstrap/opac/myopac/main.tt2   |  10 +-
 .../opac/myopac/main_payments.tt2                  |   6 +-
 .../opac/myopac/messages/list.tt2                  |   8 +-
 .../src/templates-bootstrap/opac/myopac/prefs.tt2  |   2 +-
 .../opac/myopac/prefs_my_lists.tt2                 |   4 +-
 .../opac/myopac/prefs_notify.tt2                   | 173 ++++++++-------------
 .../opac/myopac/prefs_settings.tt2                 |   2 +-
 .../opac/parts/advanced/expert.tt2                 |   4 +-
 .../opac/parts/advanced/numeric.tt2                |   4 +-
 .../opac/parts/advanced/search.tt2                 |   8 +-
 .../templates-bootstrap/opac/parts/anon_list.tt2   |  10 +-
 .../src/templates-bootstrap/opac/parts/footer.tt2  |   2 +-
 .../templates-bootstrap/opac/parts/login/form.tt2  |  25 ++-
 .../opac/parts/login/login_modal.tt2               |  30 ++--
 .../opac/parts/login/password_hint.tt2             |   3 +-
 .../opac/parts/login/username_hint.tt2             |   2 +-
 .../opac/parts/metarecord_hold_filters.tt2         |  13 +-
 .../templates-bootstrap/opac/parts/misc_util.tt2   |  10 +-
 .../templates-bootstrap/opac/parts/myopac/base.tt2 |  35 ++---
 .../templates-bootstrap/opac/parts/place_hold.tt2  |  21 ++-
 .../opac/parts/record/cnbrowse.tt2                 |   2 +-
 .../opac/parts/record/contents.tt2                 |  11 +-
 .../opac/parts/record/copy_counts.tt2              |   2 +-
 .../opac/parts/record/copy_table.tt2               |  14 +-
 .../opac/parts/record/navigation.tt2               |   4 +-
 .../opac/parts/record/subjects.tt2                 |  14 +-
 .../opac/parts/record/summary.tt2                  |  17 +-
 .../opac/parts/result/copy_counts.tt2              |   7 +-
 .../opac/parts/result/paginate.tt2                 |   4 +-
 .../opac/parts/result/table.tt2                    |   4 +-
 .../templates-bootstrap/opac/parts/searchbar.tt2   |   6 +-
 .../opac/parts/sms_carrier_selector.tt2            |   8 +-
 .../opac/parts/sms_number_textbox.tt2              |   6 +-
 .../src/templates-bootstrap/opac/record/email.tt2  |   4 +-
 .../opac/record/email_preview.tt2                  |  17 +-
 .../src/templates-bootstrap/opac/record/print.tt2  |   8 +-
 .../opac/record/print_preview.tt2                  |  13 +-
 47 files changed, 390 insertions(+), 356 deletions(-)

diff --git a/Open-ILS/src/templates-bootstrap/opac/browse.tt2 b/Open-ILS/src/templates-bootstrap/opac/browse.tt2
index 357c68bacf..0ca249f1fe 100755
--- a/Open-ILS/src/templates-bootstrap/opac/browse.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/browse.tt2
@@ -48,7 +48,8 @@
                         [% control_locg = INCLUDE build_org_selector id='browse-context'
                             show_loc_groups=1
                             arialabel=l('Select holding library') %]
-                        [% l('Browse for [_1] starting with [_2] in [_3]', control_qtype, control_bterm, control_locg) %]
+                        [% l('Browse for') _ "<br/>" _ control_qtype _ "<br/>" _ l('starting with') _ "<br/>" _ control_bterm _ "<br/>" _ l('in') _ "<br/>" _ control_locg %] 
+
 
             <button id='search-submit-go' type="submit" class="btn btn-confirm my-2"><i class="fas fa-book-reader" aria-hidden="true"></i> [% l('Browse') %]</button>
                         <img id="browse-submit-spinner"
diff --git a/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2 b/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2
index cb7a48322d..24c05f3a1b 100755
--- a/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2
@@ -3904,10 +3904,88 @@ label[for*=expert_]
     display: inline-block;
 }
 .carousel .glide__arrow--right {
-    right: -6em;
+    right: -5em;
+    margin-top: -100px;
 }
 .carousel .glide__arrow--left {
-    left: -6em;
+    left: -4em;
+    margin-top: -100px;
+}
+
+/* PINES Carousel customizations */
+#carousel_selector {
+    width: 300px;
+}
+
+.pines_carousel_selector {
+    float: left;
+    text-align: center;
+    height: 250px;
+    width: 350px;
+    margin-left: 0px;
+    margin-right: 40px;
+}
+
+.pines_carousel_selector_image {
+    height: 150px;
+}
+
+.pines_carousel_selector_text {
+    font-size: 125%;
+    font-weight: bold;
+    color: #006838;
+}
+
+@media only screen and (max-width: 1200px) {
+    .carousel {
+        margin-left: 430px;
+        width: 40%;
+    }
+    .carousel-entry-image {
+        width: auto;
+        height: 90px;
+        border: 1px solid #999;
+    }
+}
+
+@media only screen and (max-width: 1000px) {
+    .carousel {
+        margin: auto;
+        width: 80%;
+    }
+    .carousel-entry-image {
+        width: auto;
+        height: 100px;
+        border: 1px solid #999;
+    }
+    .pines_carousel_selector {
+        float: none;
+        text-align: center;
+        height: 80px;
+        width: 100%;
+        margin: auto;
+        margin-top: -20px;
+        margin-bottom: 40px;
+    }
+    .pines_carousel_selector_image {
+        display: none;
+    }
+    .pines_carousel_selector_text {
+        font-size: 125%;
+        font-weight: bold;
+        color: #006838;
+    }
+    .carousel .glide__arrow {
+        display: none;
+    }
+    .carousel .glide__arrow--right {
+        display: none;
+    }
+    .carousel .glide__arrow--left {
+        display: none;
+    }
+
+>>>>>>> d9e3b208a9... PINES Bootstrap Customizations
 }
 
 .search-filter{
diff --git a/Open-ILS/src/templates-bootstrap/opac/mylist/email.tt2 b/Open-ILS/src/templates-bootstrap/opac/mylist/email.tt2
index 0a9d302604..5f2f8726f2 100755
--- a/Open-ILS/src/templates-bootstrap/opac/mylist/email.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/mylist/email.tt2
@@ -7,7 +7,7 @@
 [% INCLUDE "opac/parts/searchbar.tt2" %]
 <div class="container top-divide">
   [% IF ctx.mylist.size %]
-  <h3>[% l('Confirm Basket Email') %]</h3>
+  <h3>[% l('Confirm Email') %]</h3>
   <p class="big-strong">[% l('Please confirm that you want to email the [_1] titles in the basket.', ctx.mylist.size) %]
     <form method="post" action="[% mkurl(ctx.opac_root _ '/mylist/doemail', {}, 1) %]">
       <input type="hidden" name="redirect_to" value="[% ctx.referer %]" />
diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2
index 62f6085bd5..80bdef5529 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2
@@ -55,11 +55,8 @@
                     <th>[% l("Billing Type") %]</th>
                     <th>[% l("Title") %]</th>
                     <th>[% l("Checkout") %]</th> 
-                    <th>[% l(" Due ") %]</th> 
-                    <th>
-                       <span>[% l(" Returned/Renewed") %]</span>
-                       <span>[% l(" Returned&#42;") %]</span>
-                    </th>
+                    <th>[% l("Due ") %]</th> 
+                    <th>[% l("Returned/Renewed") %]</th>
                     
                 </tr>
             </thead>
diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/circ_history.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/circ_history.tt2
index 9b13c101e1..49596e241d 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/circ_history.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/circ_history.tt2
@@ -7,7 +7,7 @@
     limit = ctx.circ_history_limit;
     offset = ctx.circ_history_offset;
 %]
-<h3>[% l('History of Checked Out Items') %] <a href="#" title="" data-toggle="tooltip" data-original-title="Control your check out history under Preferences > Search & History"><i class="fas fa-question-circle" aria-hidden="true"></i></a></h3>
+<h3>[% l('History of Checked Out Items') %] <a title="" data-toggle="tooltip" data-original-title="[% l('Control your check out history under Preferences > Search & History') %]"><i class="fas fa-question-circle" aria-hidden="true"></i></a></h3>
 <div style="padding:0px;">
     [%
     # In the sorting case, the size is the size of ALL the circ items.  In the non-sorting case,
@@ -33,7 +33,7 @@
         <div class="col-3 text-left">[% IF offset != 0 %]<a href='[% mkurl('circ_history', {limit => limit, offset => (offset - limit)}) %]'
                  class="btn btn-action mr-3" ><span class="nav_arrow_fix">&#9668;</span>[% l('Previous') %]</a>[% END %]
                  <button name="action" class="btn btn-deny my-2" id="delete" value="delete" type="submit" onclick="return confirm('[% l("Are you sure you wish to delete the selected item(s)?") %]');">
-            <i class="fas fa-trash-alt" aria-hidden="true"></i> Delete Selected</button>
+            <i class="fas fa-trash-alt" aria-hidden="true"></i> [% l("Delete Selected") %]</button>
             </div>
         <div class="col-6 text-center"></div>
         <div class="col-3 text-right">[% IF !no_next %]<a href='[% mkurl('circ_history', {limit => limit, offset => (offset + limit)}) %]'
diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/circs.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/circs.tt2
index 1ddc4ccfed..77cae5248f 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/circs.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/circs.tt2
@@ -28,7 +28,7 @@
         <form method="post" id="circ-form"
             onsubmit="return confirm('[% l("Are you sure you wish to renew the selected item(s)?") %]');">
          <div class="my-3">
-                <button name="action" class="btn btn-confirm" id="renew" value="renew" type="submit"><i class="fas fa-redo-alt"></i> Renew Selected</button>
+                <button name="action" class="btn btn-confirm" id="renew" value="renew" type="submit"><i class="fas fa-redo-alt"></i> [% l("Renew Selected Items") %]</button>
         </div>
         <div class="d-block d-md-none">
             <input id="check_all_checked_alt" aria-label="[% l('Select All Items') %]" checked="checked" type="checkbox" onclick="var inputs=document.getElementsByTagName('input'); for (i = 0; i < inputs.length; i++) { if (inputs[i].name == 'circ' &amp;&amp; !inputs[i].disabled) inputs[i].checked = this.checked;}"/>
@@ -48,7 +48,7 @@
                 <th>[% l("Cover") %]</th>
                 <th>[% sort_head("sort_title", l("Title")) %]</th>
                 <th>[% sort_head("author", l("Author")) %]</th>
-                <th>[% sort_head("renews", l("Renewals Left")) %] <a href="#" title="" data-toggle="tooltip" data-original-title="You will be unable to renew items if other patrons have holds on them, if your account is expired, or if you have more than $10.00 in fines and fees."><i class="fas fa-question-circle" aria-hidden="true"></i></a></th>
+                <th>[% sort_head("renews", l("Renewals Left")) %] <a href="#" title="" data-toggle="tooltip" data-original-title="[% l('You will be unable to renew items if other patrons have holds on them, if your account is expired, or if you have more than $10.00 in fines and fees.') %]"><i class="fas fa-question-circle" aria-hidden="true"></i></a></th>
                 <th>[% sort_head("due", l("Due Date")) %]</th>
                 <th>[% sort_head("barcode", l("Barcode")) %]</th>
                 <th>[% sort_head("callnum", l("Call Number")) %]</th>
diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/hold_history.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/hold_history.tt2
index 430e66af87..74806e087f 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/hold_history.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/hold_history.tt2
@@ -9,7 +9,7 @@
     count = ctx.hold_history_ids.size;
 %]
 
-<h3>[% l('Holds History') %] <a href="#" title="" data-toggle="tooltip" data-original-title="Control your holds history under Preferences > Search & History"><i class="fas fa-question-circle" aria-hidden="true"></i></a></h3>
+<h3>[% l('Holds History') %] <a title="" data-toggle="tooltip" data-original-title="[% l('Control your holds history under Preferences > Search & History') %]"><i class="fas fa-question-circle" aria-hidden="true"></i></a></h3>
 <div style="padding-bottom:10px;">[% l("PINES Account Tips") %]</div>
 <div id='myopac_holds_div'>
 
diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/holds.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/holds.tt2
index 4891e2219d..c1a24449ca 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/holds.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/holds.tt2
@@ -1,7 +1,6 @@
 [%  PROCESS "opac/parts/header.tt2";
     PROCESS "opac/parts/misc_util.tt2";
     PROCESS "opac/parts/hold_status.tt2";
-    PROCESS "opac/parts/hold_notify.tt2";
     PROCESS "opac/parts/myopac/column_sort_support.tt2";
     WRAPPER "opac/parts/myopac/base.tt2";
     myopac_page = "holds";
@@ -89,7 +88,6 @@
                 <th>[% l('Pickup Location') %]</th>
                 <th>[% l('Cancel if not filled by') %]</th>
                 <th>[% l('Status') %]</th>
-                <th>[% l('Notify Method') %]</th>
                 <th>[% l('Notes') %]</th>
                 <th>[% l('Edit') %]</th>
             </tr>
@@ -232,12 +230,6 @@
                             [% PROCESS get_hold_status hold=hold; %]
                         </div>
                     </td>
-                    <td>
-                    <span class="sr-only">Notify Method</span>
-                        <div>
-                            [% PROCESS get_hold_notify h=ahr; %]
-                        </div>
-                    </td>
                     <td class="hold_notes">
                     <span class="sr-only">Notes</span>
                     [%- FOREACH pubnote IN ahr.notes;
diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/holds/edit.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/holds/edit.tt2
index 06755c6088..8991cba24e 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/holds/edit.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/holds/edit.tt2
@@ -39,49 +39,48 @@
         </div>
 
         <div class="row">
-            <div class="col-12 mb-3">
+            <div class="col-12">
             <strong>[% l('Status') %]</strong>: [% hold.human_status %]
             </div>
             <div class="col-12">
              <input type="hidden" name="action" value="edit" />
                             <input type="hidden" name="hold_id"
                                 value="[% ahr.id %]" />
-                            <div class="form-group">
-                            <label for="pickup_lib">[% l('Pickup library') %]</library>
+                            [% l('Pickup library') %]
 
                             [% INCLUDE build_org_selector
-                                name='pickup_lib' id='pickup_lib' value=ahr.pickup_lib
+                                name='pickup_lib' value=ahr.pickup_lib
                                 can_have_vols_only=1 hold_pickup_lib=1 %]
-                            </div>
             </div>
-            <div class="col-sm-6">
+            <div class="col-12">
             [% IF hold.hold.status < 3 OR hold.hold.status == 7 %]
                     [%# The following actions cannot be performed on holds that
                         have already been captured... %]
-                            
-                            <label for="expire_time">[% l('Cancel unless filled by') %]</label>
+
+                            [% l('Cancel unless filled by') %]
+
                             <div class="input-group date" data-provide="datepicker">
-                                <input type="text" class="form-control" id="expire_time" name="expire_time"
-                                    value="[% expire_time | html %]" data-date-format="mm/dd/yyyy">
+                                <input type="text" class="form-control" name="expire_time"  value="[% expire_time | html %]" data-date-format="mm/dd/yyyy">
                                 <div class="input-group-addon">
                                     <span class="glyphicon glyphicon-th"></span>
                                 </div>
                             </div>
- 
-                            <div class="form-group mt-2">
-                                <label for="frozen">[% l('Active?') %]</label>
-                                <select class="form-control" name="frozen" id="frozen">
-                                    <option value="f"[% ahr.frozen == 't' ? '' :' selected="selected"' %]>
-                                        [% l('Yes, this hold is active now') %]
-                                    </option>
-                                    <option value="t"[% ahr.frozen == 't' ? ' selected="selected"' : '' %]>
-                                        [% l('No, this hold is suspended') %]
-                                    </option>
-                                </select>
-                            </div>
- 
-                            <label for="datepicker">[% l('If suspended, activate on') %]</label>
-                            <div class="input-group date" data-provide="datepicker">
+
+
+                            [% l('Active?') %]
+
+                            <select class="form-control" name="frozen">
+                                <option value="f"[% ahr.frozen == 't' ? '' :' selected="selected"' %]>
+                                    [% l('Yes, this hold is active now') %]
+                                </option>
+                                <option value="t"[% ahr.frozen == 't' ? ' selected="selected"' : '' %]>
+                                    [% l('No, this hold is suspended') %]
+                                </option>
+                            </select>
+
+                            [% l('If suspended, activate on') %]
+
+                         <div class="input-group date" data-provide="datepicker">
                                 <input type="text" class="form-control" name="thaw_date" id="datepicker" value="[% thaw_date | html %]" data-date-format="mm/dd/yyyy">
                                 <div class="input-group-addon">
                                     <span class="glyphicon glyphicon-th"></span>
diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/lists.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/lists.tt2
index fd356c7e8c..d417e1290d 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/lists.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/lists.tt2
@@ -19,37 +19,47 @@
 <div id='myopac_bookbag_div'>
 
     <!-- new list creation -->
-    <div class="row">
-    <button class="btn btn-sm btn-opac my-2" data-toggle="collapse" data-target="#create_form" aria-expanded="false" aria-controls="create_form">[% l('Create New List') %]</button>
-    </div>
-    <div id="create_form" [% IF ctx.add_rec || move_cart_by_default || !ctx.bookbags.size %] class="collapse show my-3"[% ELSE %] class="row collapse my-3"[% END %]>
-        <form action="[% mkurl(ctx.opac_root _ '/myopac/list/update') %]" method="post">
-            [%- INCLUDE "opac/parts/preserve_params.tt2"; %]
-            <input type="hidden" name="action" value="create" class="form-control" />
-            [% IF ctx.add_rec %]
-                <input type="hidden" name="add_rec" value="[% ctx.add_rec %]" class="form-control" />
-            [% END %]
-            [% IF ctx.where_from %]
-                 <input type="hidden" name="where_from" value="[% ctx.where_from %]" class="form-control" />
-            [% END %]
-            <div class="form-group">
-                <label for="list_create_name">[% l('Enter the name of the new list:') %]</label>
-                <input id="list_create_name" type="text" name="name" class="form-control" autofocus>
-            </div>
-            <div class="form-group">
-                <label for="list_description">[% l("List description (optional):") %]</label>
-                <textarea name="description" id="list_description" class="form-control"></textarea>
-            </div>
-            <div class="form-group">
-                <label for="list_create_shared">[% l('Share this list?') %]</label>
-                <select class="d-inline-block form-control mini-control" name="shared" id="list_create_shared">
-                    <option value="0">[% l('No') %]
-                    <option value="1">[% l('Yes') %]
-                </select>
-                <a href="#" title="Allows the list to be shared through a link or RSS." data-toggle="tooltip">
-                <i class="fas fa-question-circle" aria-hidden="true"></i>
-                </a>
-            </div>
+    <form action="[% mkurl(ctx.opac_root _ '/myopac/list/update') %]" method="post" id="create_form">
+        <h4>[% l('Create New List') %]</h4><a id="createnewlist"></a>
+        <table class="table" >
+            <tr>
+                <td class="list_create_table_label">
+                    <label for="list_create_name">[% l('Enter the name of the new list:') %]</label>
+                </td>
+                <td class="px-3 my-2">
+                    [%- INCLUDE "opac/parts/preserve_params.tt2"; %]
+                    <input id="list_create_name" type="text" name="name" class="form-control"/>
+                    <input type="hidden" name="action" value="create" class="form-control" />
+                    [% IF ctx.add_rec %]
+                    <input type="hidden" name="add_rec" value="[% ctx.add_rec %]" class="form-control" />
+                    [% END %]
+                    [% IF ctx.where_from %]
+                    <input type="hidden" name="where_from" value="[% ctx.where_from %]" class="form-control" />
+                    [% END %]
+                </td>
+            </tr>
+            <tr>
+                <td class="list_create_table_label">
+                    <label for="list_description">[% l("List description (optional):") %]</label>
+                </td>
+                <td class="px-3">
+                    <textarea name="description" id="list_description" class="form-control"></textarea>
+                </td>
+            </tr>
+            <tr>
+                <td class="list_create_table_label">
+                    <label for="list_create_shared">[% l('Share this list?') %]</label>
+                </td>
+                <td class="px-3">
+                    <select class="d-inline-block form-control mini-control" name="shared" id="list_create_shared">
+                        <option value="0">[% l('No') %]
+                        <option value="1">[% l('Yes') %]
+                    </select>
+                    <a title="[% l('Allows the list to be shared through a link or RSS.') %]" data-toggle="tooltip">
+                        <i class="fas fa-question-circle" aria-hidden="true"></i>
+                    </a>
+                </td>
+            </tr>
             [% IF ctx.mylist.size %]
             <div class="form-group">
                 <label for="list_move_cart">[% l('Move contents of basket to this list?') %]</label>
diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/main.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/main.tt2
index 59ed839d4d..cc07f66c37 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/main.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/main.tt2
@@ -17,7 +17,7 @@
                 <div class="row">
                     <div class="col-12">
                      <span [% IF ctx.expired_card %]class="danger"[% END %]>
-                        [% l("Account Expiration Date - ") %]
+                        [% l("Account Expiration Date") %]: 
                             [% date.format(ctx.parse_datetime(ctx.user.expire_date), DATE_FORMAT) %]
                         </span>
                     </div>
@@ -34,19 +34,19 @@
                     <div class="col-12">
                      <a href="[% mkurl(ctx.opac_root _ '/myopac/circs') %]"
                             title="[% l('View My Checked Out Items') %]">
-                            [% l("Items Checked out ([_1])", ctx.user_stats.checkouts.total_out) %]
+                            [% l("Items Currently Checked Out") %] ([% ctx.user_stats.checkouts.total_out %])
                         </a>
                     </div>
                      <div class="col-12">
                      <a href="[% mkurl(ctx.opac_root _ '/myopac/holds') %]"
                             title="[% l('View My Holds') %]">
-                            [% l('Items on Hold ([_1])', ctx.user_stats.holds.total) %]
+                            [% l('Items Currently on Hold'); " (";  ctx.user_stats.holds.total; ")" %]
                         </a>
                     </div>
                     <div class="col-12">
                      <a href="[% mkurl(ctx.opac_root _ '/myopac/holds', {available => 1}) %]"
-                            title="[% l('View My Holds Ready for Pickup') %]">
-                            [% l('Items Ready for Pickup ([_1])', ctx.user_stats.holds.ready) %]
+                            title="[% l('Items Ready for Pickup') %]">
+                            [% l('Items Ready for Pickup'); " ("; ctx.user_stats.holds.ready; ")" %]
                         </a>
                     </div>
                     <br><br>
diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/main_payments.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/main_payments.tt2
index fc86b7437d..af63b4f646 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/main_payments.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/main_payments.tt2
@@ -37,7 +37,7 @@
         <thead><tr>
             <th>[% l('Payment Date') %]</th>
             <th>[% l('Payment For') %]</th>
-            <th>[% l('Amount') %]</th>
+            <th>[% l('Amount Paid') %]</th>
             <th>[% l('Receipt') %]</th>
         </tr></thead>
         <tbody>
@@ -57,11 +57,11 @@
                 <span class="sr-only">Receipt Options: </span>
                     <form action="[% ctx.opac_root %]/myopac/receipt_print" method="post" class="d-inline m-1">
                         <input class="btn btn-sm btn-confirm my-1" type="hidden" name="payment" value="[% payment.mp.id %]" />
-                        <button class="btn btn-sm btn-action my-1" type="submit"><i class='fas fa-print'></i> Print</button>
+                        <button class="btn btn-sm btn-action my-1" type="submit"><i class='fas fa-print'></i> [% l("Print") %]</button>
                     </form>
                     <form action="[% ctx.opac_root %]/myopac/receipt_email" method="post" class="d-inline m-1">
                         <input class="btn btn-sm btn-confirm my-1" type="hidden" name="payment" value="[% payment.mp.id %]" />
-                        <button class="btn btn-sm btn-action my-1" type="submit" value="[% l('Email') %]"><i class="fas fa-envelope-open-text"></i> Email</button>
+                        <button class="btn btn-sm btn-action my-1" type="submit" value="[% l('Email') %]"><i class="fas fa-envelope-open-text"></i> [% l("Email") %]</button>
                     </form>
                 </td>
             </tr>
diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/messages/list.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/messages/list.tt2
index 07b646d6a1..593b5238bf 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/messages/list.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/messages/list.tt2
@@ -66,9 +66,9 @@
         <form method="post" id="messages-form"
          onsubmit="if (document.getElementById('acct_messages_actions').value == 'mark_deleted') { return confirm('[% l("Are you sure you wish to permanently delete the selected message(s)?") %]') } else { return true; }">
             <div class="my-2">
-                <button name="action" class="btn btn-action" value="mark_read" id="mark_read" type="submit"><i class="fas fa-glasses" aria-hidden="true"></i> Mark Read</button>
-                <button name="action" class="btn btn-opac" value="mark_unread" id="mark_unread"  type="submit"><i class="fas fa-eye-slash" aria-hidden="true"></i> Mark Unread</button>
-                <button name="action" class="btn btn-deny" value="mark_deleted" id="mark_deleted"  type="submit" onclick="return confirm('[% l("Are you sure you wish to permanently delete the selected message(s)?") %]')"><i class="fas fa-trash-alt" aria-hidden="true"></i> Delete</button>
+                <button name="action" class="btn btn-action" value="mark_read" id="mark_read" type="submit"><i class="fas fa-glasses" aria-hidden="true"></i> [% l("Mark Read") %]</button>
+                <button name="action" class="btn btn-opac" value="mark_unread" id="mark_unread"  type="submit"><i class="fas fa-eye-slash" aria-hidden="true"></i> [% l("Mark Unread") %]</button>
+                <button name="action" class="btn btn-deny" value="mark_deleted" id="mark_deleted"  type="submit" onclick="return confirm('[% l("Are you sure you wish to permanently delete the selected message(s)?") %]')"><i class="fas fa-trash-alt" aria-hidden="true"></i> [% l("Delete") %]</button>
             </div>
             [% IF count < 1 %]
             <div class="warning_box">[% l('No messages found.') %]</div>
@@ -115,7 +115,7 @@
                         </td>
                         <td>
                         <span class="sr-only">Message Options</span>
-                            <a class="btn btn-sm btn-action" href="[% mkurl('messages', { single => 1, message_id => message.id } ) %]" title="Read [% message.title | html %]"><i class="fas fa-glasses" aria-hidden="true"></i> Read</a>
+                            <a class="btn btn-sm btn-action" href="[% mkurl('messages', { single => 1, message_id => message.id } ) %]" title="Read [% message.title | html %]"><i class="fas fa-glasses" aria-hidden="true"></i> [% l("Read") %]</a>
                         </td>
                     </tr>
                 [% END %]
diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/prefs.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/prefs.tt2
index f5bf02d90a..8a73a7b5d6 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/prefs.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/prefs.tt2
@@ -195,7 +195,7 @@
     <br />
 
 	<div class="header_middle mb-3">
-        <span>Addresses</span>
+        <span>[% l("Addresses") %]</span>
     </div>
 
 <div class="row">
diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_my_lists.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_my_lists.tt2
index f5ca19ed98..c9d96efeab 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_my_lists.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_my_lists.tt2
@@ -35,7 +35,7 @@
                                         selected='selected'[% END %]>[% val | html %]</option>
                             [% END %]
                         </select>
-                      <a href="#" title="Change the amount of lists shown in 'My Lists'." data-toggle="tooltip">
+                      <a href="#" title="[% l('Change the amount of lists shown in \'My Lists\'.') %]" data-toggle="tooltip">
                         <i class="fas fa-question-circle"></i>
                     </a>
                     </td>
@@ -54,7 +54,7 @@
                                         selected='selected'[% END %]>[% val | html %]</option>
                             [% END %]
                         </select>
-                       <a href="#" title="Change the amount of items shown while viewing a 'My List'." data-toggle="tooltip">
+                       <a href="#" title="[% l('Change the amount of items shown while viewing a List.') %]" data-toggle="tooltip">
                         <i class="fas fa-question-circle"></i>
                     </a>
                     </td>
diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_notify.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_notify.tt2
index 497d48ab03..00f324f954 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_notify.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_notify.tt2
@@ -65,111 +65,74 @@
             [% setting = 'opac.hold_notify' %]
             <input name='[% setting %]' type="hidden"
                 [% IF ctx.user_setting_map.$setting; %] value='[% ctx.user_setting_map.$setting | html %]' [% END %]/>
-
-            <table class="full-width table" id="acct_search_main" 
-                title="[% l('Notification Preferences') %]">
-                <tbody>
-
-                    [% IF ctx.updated_user_settings %]
-                    <tr><td colspan='2'>
-                        <div class='renew-summary'>
-                            [% l('Account Successfully Updated') %]
-                        </div>
-                    </td></tr>
-                    [% END %]
-
-                    [% setting = 'opac.hold_notify' %]
-                    <tr>
-                        [%# WCAG insists that labels for checkboxes contain the input
-                            or directly follow the input, which would not look right
-                            with the rest of the table.  As an alternative, we can
-                            repeat the label as a title attr.
-                            http://www.w3.org/TR/WCAG20-TECHS/H44.html %]
-                        [% email_label = l('Notify by Email by default when a hold is ready for pickup?') %]
-
-                        <td><label for='[% setting %].email'>[% email_label %]</label></td>
-                        <td>
-                            <input onchange="record_change(event)" id='[% setting %].email' name='[% setting %].email'
-                                type="checkbox" title="[% email_label %]"
-                                [% IF (matches = ctx.user_setting_map.$setting.match('email')); %] checked='checked' [% END %]/>
-                        </td>
-                    </tr>
-                    [%- IF allow_phone_notifications == 'true';
-                        setting = 'opac.hold_notify'; 
-                    -%]
-                    <tr>
-                        [% phone_label = l('Notify by Phone by default when a hold is ready for pickup?') %]
-                        <td><label for='[% setting %].phone'>[% phone_label %]</label></td>
-                        <td>
-                            <input onchange="record_change(event)" id='[% setting %].phone' name='[% setting %].phone'
-                                type="checkbox" title="[% phone_label %]"
-                                [% IF (matches = ctx.user_setting_map.$setting.match('phone')); %] checked='checked' [% END %]/>
-                        </td>
-                    </tr>
-                    [% setting = 'opac.default_phone' %]
-                    <tr>
-                        <td><label for='[% setting %]'>[% l('Default Phone Number') %]</label></td>
-                        <td>
-                            <input onchange="record_change(event)" id='[% setting %]' name='[% setting %]' type="text"
-                                [% IF ctx.user_setting_map.$setting; %] value='[% ctx.user_setting_map.$setting | html %]' [% END %]/>
-                        </td>
-                    </tr>
-                    [%- END %]
-                    [%- IF ctx.get_org_setting(ctx.search_ou, 'sms.enable') == 1;
-                       setting = 'opac.hold_notify';
-                    -%]
-                    <tr>
-                        [% sms_label = l('Notify by Text by default when a hold is ready for pickup?') %]
-                        <td><label for='[% setting %].sms'>[% sms_label %]</label></td>
-                        <td>
-                            <input onchange="record_change(event)" id='[% setting %].sms' name='[% setting %].sms'
-                                type="checkbox" title="[% sms_label %]"
-                                [% IF (matches = ctx.user_setting_map.$setting.match('sms')); %] checked='checked' [% END %]/>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>[% l('Default Mobile Carrier') %]</td>
-                        <td>[% INCLUDE "opac/parts/sms_carrier_selector.tt2" sms_carrier_hide_label="true" %]</td>
-                    </tr>
-                    [% setting = 'opac.default_sms_notify' %]
-                    <tr>
-                        <td><label for='[% setting %]'>[% l('Default Mobile Number') %]</label></td>
-                        <td>
-                            <input onchange="record_change(event)" id='[% setting %]' name='[% setting %]' type="text"
-                                [% IF ctx.user_setting_map.$setting; %] value='[% ctx.user_setting_map.$setting | html %]' [% END %]/>
-                            [% IF ctx.user_setting_map.$setting; %]
-                                <span class='light_border'>
-                                <a href="#" class="btn btn-sm btn-action" onclick="sendTestSMS(
-                                    [% ctx.user.id %], '[% ctx.authtoken %]'
-                                    )"
-                                    title="[% l('Send Test Text Message') %]">
-                                    <i class="fas fa-mobile"></i> [% l('Send Test Text Message') %]
-                                </a>
-                                </span><br />
-                            [% l('Hint: use the full 10 digits of your phone #, no spaces, no dashes'); %]
-                            [% END %]
-                        </td>
-                    </tr>
-                    [% END %]
-                    <tr id="test_notification_banner" style="display:none">
-                        <td colspan='3'>
-                            [% INCLUDE "opac/myopac/test_notification.tt2" message_type = "sms" %]
-                        </td>
-                    </tr>
-                    [% FOR optin IN ctx.opt_in_settings %]
-                    <tr>
-                        <td><label for='[% optin.cust.name | uri %]'>[% optin.cust.label | html %]</label></td>
-                        <td>
-                            <input type='checkbox' name='setting' 
-                                value='[% optin.cust.name | uri %]' 
-                                id='[% optin.cust.name | uri %]' 
-                                title="[% optin.cust.label | html %]"
-                                [% IF optin.value %] checked='checked' [% END %]/>
-                        </td>
-                    </tr>
-                    [% END %]
-                </tbody>
-            </table>
+                <td><label for='[% setting %].email'>[% email_label %]</label></td>
+                <td>
+                    <input id='[% setting %].email' name='[% setting %].email'
+                        type="checkbox" title="[% email_label %]"
+                        [% IF (matches = ctx.user_setting_map.$setting.match('email')); %] checked='checked' [% END %]/>
+                </td>
+            </tr>
+            [%- IF allow_phone_notifications == 'true';
+                setting = 'opac.hold_notify';
+            -%]
+            <tr>
+                [% phone_label = l('Notify by Phone by default when a hold is ready for pickup?') %]
+                <td><label for='[% setting %].phone'>[% phone_label %]</label></td>
+                <td>
+                    <input id='[% setting %].phone' name='[% setting %].phone'
+                        type="checkbox" title="[% phone_label %]"
+                        [% IF (matches = ctx.user_setting_map.$setting.match('phone')); %] checked='checked' [% END %]/>
+                </td>
+            </tr>
+            [% setting = 'opac.default_phone' %]
+            <tr>
+                <td><label for='[% setting %]'>[% l('Default Phone Number') %]</label></td>
+                <td>
+                    <input id='[% setting %]' name='[% setting %]' type="text"
+                        [% IF ctx.user_setting_map.$setting; %] value='[% ctx.user_setting_map.$setting | html %]' [% END %] class="form-control"/>
+                </td>
+            </tr>
+            [%- END %]
+            [%- IF ctx.get_org_setting(ctx.search_ou, 'sms.enable') == 1;
+               setting = 'opac.hold_notify';
+            -%]
+            <tr>
+                [% sms_label = l('Notify by Text by default when a hold is ready for pickup?') %]
+                <td><label for='[% setting %].sms'>[% sms_label %]</label></td>
+                <td>
+                    <input id='[% setting %].sms' name='[% setting %].sms'
+                        type="checkbox" title="[% sms_label %]"
+                        [% IF (matches = ctx.user_setting_map.$setting.match('sms')); %] checked='checked' [% END %]/>
+                </td>
+            </tr>
+            <tr>
+                <td>[% l('Default Mobile Carrier') %]</td>
+                <td>[% INCLUDE "opac/parts/sms_carrier_selector.tt2" sms_carrier_hide_label="true" %]</td>
+            </tr>
+            [% setting = 'opac.default_sms_notify' %]
+            <tr>
+                <td><label for='[% setting %]'>[% l('Default Mobile Number') %]</label></td>
+                <td>
+                    <input id='[% setting %]' name='[% setting %]' type="text"
+                        [% IF ctx.user_setting_map.$setting; %] value='[% ctx.user_setting_map.$setting | html %]' [% END %]/>
+                    [% l('Hint: use the full 10 digits of your phone number, no spaces, no dashes'); %]
+                </td>
+            </tr>
+            [% END %]
+            [% FOR optin IN ctx.opt_in_settings %]
+            <tr>
+                <td><label for='[% optin.cust.name | uri %]'>[% optin.cust.label | html %]</label></td>
+                <td>
+                    <input type='checkbox' name='setting'
+                        value='[% optin.cust.name | uri %]'
+                        id='[% optin.cust.name | uri %]'
+                        title="[% optin.cust.label | html %]"
+                        [% IF optin.value %] checked='checked' [% END %]/>
+                </td>
+            </tr>
+            [% END %]
+        </tbody>
+    </table>
 
     <button type='submit' class="btn btn-confirm"><i class="fas fa-save"></i> [% l('Save') %]</button>
 </form>
diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_settings.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_settings.tt2
index 2384df3445..b3efce2379 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_settings.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_settings.tt2
@@ -47,7 +47,7 @@
                                         selected='selected'[% END %]>[% val | html %]</option>
                             [% END %]
                         </select>
-                         <a href="#" title="Change the amount of results shown in a search while signed in." data-toggle="tooltip">
+                         <a title="[% l('Change the amount of results shown in a search while signed in.') %]" data-toggle="tooltip">
                         <i class="fas fa-question-circle"></i>
                     </a>
                     </td>
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/advanced/expert.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/advanced/expert.tt2
index 414d0cd708..f4e787456f 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/advanced/expert.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/advanced/expert.tt2
@@ -1,6 +1,6 @@
 <form action="[% ctx.opac_root %]/results" method="get">
-    <h1 class="text-center">[% l("Expert Search") %]</h1>
-            <h2 class="text-center">[% l("Search the MARC record.") %]</h2>
+    <h1 class="text-center" style="font-size:1.5em;">[% l("Expert Search") %]</h1>
+            <h2 class="text-center" style="font-size:1em;">[% l("Search the MARC record.") %]</h2>
     <input type="hidden" name="_special" value="1" />
     <input id="detail" type="hidden" name="detail_record_view"
            value="[% show_detail_view %]"/>
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/advanced/numeric.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/advanced/numeric.tt2
index 7bc25bd469..7066389859 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/advanced/numeric.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/advanced/numeric.tt2
@@ -1,6 +1,6 @@
 <form action="[% ctx.opac_root %]/results" method="get">
-    <h1 class="text-center">[% l("Numeric Search") %]</h1>
-            <h2 class="text-center">[% l("Search by a field and numeric identifier.") %]</h2>
+    <h1 class="text-center" style="font-size:1.5em;">[% l("Numeric Search") %]</h1>
+            <h2 class="text-center" style="font-size:1em;">[% l("Search by a field and numeric identifier.") %]</h2>
     <input type="hidden" name="contains" value="contains" />
     <input type="hidden" name="_special" value="1" />
     <input id="detail" type="hidden" name="detail_record_view"
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/advanced/search.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/advanced/search.tt2
index f22c7ff3d5..606a7e3771 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/advanced/search.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/advanced/search.tt2
@@ -5,8 +5,8 @@
 <form action="[% ctx.opac_root %]/results" method="get">
 <div id='adv_global_search' class='data_grid data_grid_center'>
     <div id='adv_search_rows' class="container">
-        <h1 class="text-center">[% l("Advanced Search") %]</h1>
-        <h2 class="text-center">[% l("Refine your search by filling out one or more fields to search by below.") %]</h2>
+        <h1 class="text-center" style="font-size:1.5em;">[% l("Advanced Search") %]</h1>
+        <h2 class="text-center" style="font-size:1em;">[% l("Refine your search by filling out one or more fields to search by below.") %]</h2>
         <div class='adv_global_input_container row'>
             <table role="presentation" id="adv_global_input_table" class="mx-auto col-12">
                 <tbody id="adv_global_tbody">
@@ -100,8 +100,8 @@
                             </select>
 
                             <br/>
-                            <div class="adv_special_block text-center">
-                                <input title="[% l('Search date') %]" class='form-control' placeholder='Year'
+                            <div id='adv_special_block' class="text-center">
+                                <input title="[% l('Search date') %]" class='form-control' placeholder='[% l("Year") %]'
                                   name='date1' type='text' size='4' maxlength='4' value="[% CGI.param('date1') | html %]" />
                                 <span id='adv_global_pub_date_2_span' class='[% CGI.param("pubdate") == "between" ? "" : "hide_me" %]'>
                                    [% l("AND") %] <input name='date2' class='form-control' placeholder='Year'
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/anon_list.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/anon_list.tt2
index aa28996d18..24bfa06c50 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/anon_list.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/anon_list.tt2
@@ -10,12 +10,12 @@
         <div class="bbag-action" style="clear:both;">
         <div class="input-group my-3">
 
-            <button class="btn btn-success m-1" name="action" value="place_hold" id="place_hold" type="submit"><i class="fas fa-book" aria-hidden="true"></i> [% l('Place Hold')%]</button>
-            <button class="btn btn-danger m-1" name="action" value="delete" id="delete" type="submit"><i class="fas fa-trash" aria-hidden="true"></i> [% l('Delete') %]</button>
-            <button class="btn btn-action m-1" name="action" value="print" id="print" type="submit"><i class="fas fa-print" aria-hidden="true"></i> [% l('Print Details') %]</button>
-            <button class="btn btn-action m-1" name="action" value="email" id="email" type="submit"><i class="fas fa-envelope-open-text" aria-hidden="true"></i> [% l('Email Details') %]</button>
+            <button class="btn btn-success m-1" name="action" value="place_hold" id="place_hold" type="submit"><i class="fas fa-book" aria-hidden="true"></i> [% l("Place Hold") %]</button>
+            <button class="btn btn-danger m-1" name="action" value="delete" id="delete" type="submit"><i class="fas fa-trash" aria-hidden="true"></i> [% l("Delete") %]</button>
+            <button class="btn btn-action m-1" name="action" value="print" id="print" type="submit"><i class="fas fa-print" aria-hidden="true"></i> [% l("Print Details") %]</button>
+            <button class="btn btn-action m-1" name="action" value="email" id="email" type="submit"><i class="fas fa-envelope-open-text" aria-hidden="true"></i> [% l("Email Details") %]</button>
 
-            <a class="btn btn-action m-1" id="new_list" href=[% mkurl(ctx.opac_root _ '/myopac/lists', { move_cart_by_default => 1, from_basket => 1}) %]><i class="fas fa-plus" aria-hidden="true"></i> [% l('Add to New List') %]</a>
+            <button class="btn btn-action m-1" name="action" value="new_list" id="new_list" type="submit"><i class="fas fa-plus" aria-hidden="true"></i> [% l("Add to New List") %]</button>
             <div class="dropdown show m-1">
                 [% IF ctx.user AND ctx.bookbags.size %]
                  <a class="btn btn-action dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/footer.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/footer.tt2
index e64fcbcec2..39756ccd1d 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/footer.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/footer.tt2
@@ -26,7 +26,7 @@
     [% END %]
 
       <div id="copyright_text" class="mt-3">
-        [% l('Copyright &copy; 2006-[_1] Georgia Public Library Service, and others', date.format(date.now, '%Y')) %]<br/>
+        [% l("Copyright") %] &copy; 2006-[% date.format(date.now, '%Y') %] [% l("Georgia Public Library Service, and others") %]<br/>
         <a href="https://gapines.org/images/IMLS-logo.jpg">
           <img src="/images/IMLS-logo.jpg" alt="IMLS Logo" style="padding:10px;height:80px;"></a><br/>
         [% l('This Web site and other Georgia Public Library Service programs are partially assisted with funds from the Library Services and Technology Act through the Institute of Museum and Library Services.') %]
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/login/form.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/login/form.tt2
index 25c898a8ab..d08ca77204 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/login/form.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/login/form.tt2
@@ -13,8 +13,7 @@
     ELSIF ctx.login_failed_event.textcode == 'PATRON_INACTIVE';
         l("This account has been deactivated.  <br>Please contact your local library.");
     ELSE;
-        l("Login failed. <br> The username or password provided was not valid. <br>" _
-           "Passwords are case-sensitive.  <br>Check your Caps-Lock key and try again or contact your local library.");
+        l("Login failed.<br> The username or password provided was not valid.<br>Passwords and user names are case-sensitive.<br>Check your Caps-Lock key and try again or contact your local library.");
     END;
 %]
 </div>
@@ -70,38 +69,32 @@
     <div class="mx-auto row w-75 my-5">
         <div class='col-md-6'>
             <label for='username_field' class="lbl1" >[% l('Library Card Number or User Name') %]
-            <a href="#" title="[% INCLUDE "opac/parts/login/username_hint.tt2" %]" data-html="true" data-toggle="tooltip">
+            <a title="[% INCLUDE "opac/parts/login/username_hint.tt2" %]" data-html="true" data-toggle="tooltip">
             <i class="fas fa-question-circle"></i></a></label> <br>
             <div class="input_bg mb-2">
                 <input class="form-control" type='text' id="username_field" name="username"/>
             </div>
-               <a href='[% mkurl(ctx.opac_root _ '/register', {}, 1) %]'>[% l('Apply for a PINES Library Card') %]</a>
-            <br>
-
         </div>
         <div class='col-md-6'>
             <label for="password_field" class="lbl1" >[% l('Password') %]
-            <a href="#" title="[% INCLUDE "opac/parts/login/password_hint.tt2" %]" data-html="true" data-toggle="tooltip">
+            <a title="[% INCLUDE "opac/parts/login/password_hint.tt2" %]" data-html="true" data-toggle="tooltip">
                         <i class="fas fa-question-circle"></i>
                     </a></label><br>
 
             <div class="input_bg mb-2">
                 <input class="form-control" id="password_field" name="password" type="password"/>
             </div>
-           [% IF reset_password == 'true' %]
+        </div>
+        <div class='col-md-6'>
+            <a href='[% mkurl(ctx.opac_root _ '/register', {}, 1) %]'>[% l('Apply for a PINES Library Card') %]</a>
+        </div>
+        <div class='col-md-6'>
+            [% IF reset_password == 'true' %]
             <a href='[% mkurl(ctx.opac_root _ '/password_reset', {}, 1) %]'>[% l('Forgot Your Password?') %]  </a>
             [% END %]
-            <br>
-
         </div>
 
          <div class="col-12 pt-4 text-center">
-            <div class="form-check my-2">
-                <input class="form-check-input" type="checkbox" value="" id="rememberMe">
-                <label class="form-check-label" for="rememberMe">
-                    [% l('Stay logged in?') %]
-                </label>
-            </div>
             <button type="submit" class="btn btn-confirm my-2"><i class="fas fa-sign-in-alt" aria-hidden="true"></i> [% l('Log in') %]</button>
         </div>
         <div style="clear: both; padding-top: 15px;" class="col-12 text-center">
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/login/login_modal.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/login/login_modal.tt2
index 0b15e3da40..31e4d5d90a 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/login/login_modal.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/login/login_modal.tt2
@@ -3,7 +3,7 @@
     <div class="modal-content">
      <form method='post' action="/eg/opac/login?redirect_to=%2Feg%2Fopac%2Fmyopac%2Fmain">
       <div class="modal-header">
-        <h1 class="modal-title" id="exampleModalLabel">[% l('Log in to Your Account') %]</h1>
+        <h1 class="modal-title" id="exampleModalLabel" style="font-size:2em;">[% l('Log in to Your Account') %]</h1>
         <button type="button" class="close" data-dismiss="modal" aria-label="Close">
           <i class="fas fa-times" aria-hidden="true"></i>
         </button>
@@ -18,8 +18,7 @@
         ELSIF ctx.login_failed_event.textcode == 'PATRON_INACTIVE';
             l("This account has been deactivated.  Please contact your local library.");
         ELSE;
-            l("Login failed. The username or password provided was not valid. " _
-               "Passwords are case-sensitive.  Check your Caps-Lock key and try again or contact your local library.");
+            l("Login failed.<br> The username or password provided was not valid.<br>Passwords and user names are case-sensitive.<br>Check your Caps-Lock key and try again or contact your local library.");
         END;
     %]
     </div>
@@ -29,23 +28,30 @@
     <div class="mx-auto row py-4">
         <div class='col-md-6'>
             <label for='username_field' class="lbl1" >[% l('Library Card Number or User Name') %]
-            <a href="#" title="[% INCLUDE "opac/parts/login/username_hint.tt2" %]" data-html="true" data-toggle="tooltip">
+            <a title="[% INCLUDE "opac/parts/login/username_hint.tt2" %]" data-html="true" data-toggle="tooltip">
             <i class="fas fa-question-circle"></i></a></label> <br>
             <div class="input_bg mb-2">
                 <input class="form-control" type='text' id="username_field" name="username"/>
             </div>
-               <a href='[% mkurl(ctx.opac_root _ '/register', {}, 1) %]'>[% l('Apply for a PINES Library Card') %]</a>
-            <br>
-
         </div>
         <div class='col-md-6'>
-            <label for="password_field" class="lbl1" >[% l('Password') %]
-            <a href="#" title="[% INCLUDE "opac/parts/login/password_hint.tt2" %]" data-html="true" data-toggle="tooltip">
+            <label for="password_field" class="lbl1" ><br/>[% l('Password') %]
+            <a title="[% INCLUDE "opac/parts/login/password_hint.tt2" %]" data-html="true" data-toggle="tooltip">
                         <i class="fas fa-question-circle"></i>
                     </a></label><br>
 
-    <div class="mx-auto row py-4">
-
+            <div class="input_bg mb-2">
+                <input class="form-control" id="password_field" name="password" type="password"/>
+            </div>
+        </div>
+        <div class="col-md-6">
+            <a href='[% mkurl(ctx.opac_root _ '/register', {}, 1) %]'>[% l('Apply for a PINES Library Card') %]</a>
+        </div>
+        <div class="col-md-6">
+            [% IF reset_password == 'true' %]
+            <a href='[% mkurl(ctx.opac_root _ '/password_reset', {}, 1) %]'>[% l('Forgot Your Password?') %]  </a>
+            [% END %]
+        </div>
         <div style="clear: both; padding-top: 15px;" class="col-12">
         [%
             redirect = CGI.param('redirect_to');
@@ -71,8 +77,6 @@
       <div class="modal-footer">
       <div class="mr-auto">
         <input type='hidden' name='redirect_to' value='[% redirect | html %]'/>
-        <input type="checkbox" name="persist" id="login_persist" class="mr-1"/>
-        <label for="login_persist"> [% l('Stay logged in?') %]</label>
       </div>
 
         <button type="button" class="btn btn-secondary" data-dismiss="modal"><i class="fas fa-times" aria-hidden="true"></i> [% l('Close') %]</button>
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/login/password_hint.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/login/password_hint.tt2
index f1df0c9ce6..9f40c71d0d 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/login/password_hint.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/login/password_hint.tt2
@@ -1,3 +1,4 @@
 <div>
-[%- l('First time logging in?<br> Try using the last 4 digits of your phone number. <br> Example: 0926'); %]
+[%- l('First time logging in?<br> Try using the last 4 digits of your phone number.') -%]<br>
+[% l('Example:') %] 0926
 </div>
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/login/username_hint.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/login/username_hint.tt2
index fc9642500f..7bda8f3154 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/login/username_hint.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/login/username_hint.tt2
@@ -1,5 +1,5 @@
 <div>
 [% l('Please enter your full library card number.') %]
 <br>
-[% l('Example: 12340001234567') %]
+[% l('Example:') %] 12340001234567
 </div>
\ No newline at end of file
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/metarecord_hold_filters.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/metarecord_hold_filters.tt2
index c1e2df691d..ad5ab42dac 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/metarecord_hold_filters.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/metarecord_hold_filters.tt2
@@ -19,12 +19,10 @@ limiting the set of desired records for a given metarecord.
     END;
 %]
 <hr>
-<h4>[% l('Select your desired format(s).') %]</h4>
-<div class="row">
+<span class="font-weight-bold">[% l('Select your desired format(s) and language(s):') %]</span><br/>
+<div><i>[% l('Note: If none are selected, any available formats and languages may be used.') %]</i></div>
+<div class="row" style="margin-left: 30px;">
   <div class="col-6">
-    <div class="metarecord_filter_header">
-
-    </div>
     <select multiple='multiple' class="form-control"
       name="metarecord_formats_[% target_id %]">
       [% FOR ccvm IN
@@ -36,7 +34,6 @@ limiting the set of desired records for a given metarecord.
         </option>
       [% END %]
     </select>
-          <div>[% l('If none are selected, any available formats may be used.') %]</div>
 
   </div>
   [% IF hold_data.metarecord_filters.langs.size;
@@ -65,10 +62,6 @@ limiting the set of desired records for a given metarecord.
         </option>
       [% END %]
     </select>
-     <div>
-      <div>[% l('Select your desired language(s).') %]</div>
-      <div>[% l('If none are selected, any available languages may be used.') %]</div>
-    </div>
   </div>
   [% END %]
 
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/misc_util.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/misc_util.tt2
index 7e976fd347..854a67dd38 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/misc_util.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/misc_util.tt2
@@ -805,9 +805,9 @@
 
 [%- BLOCK carousels;
     config = {
-        animated => 0,
-        animation_interval => 5,
-        width => 5,
+        animated => 1,
+        animation_interval => 3,
+        width => 4,
         sm_width => 3,
         xs_width => 2,
     };
@@ -860,8 +860,8 @@
     </ul>
   </div>
   <div class="glide__arrows" data-glide-el="controls">
-    <button class="glide__arrow glide__arrow--left btn" data-glide-dir="<"><i class="fas fa-arrow-left"></i> Prev</button>
-    <button class="glide__arrow glide__arrow--right btn" data-glide-dir=">">Next <i class="fas fa-arrow-right"></i></button>
+    <button class="glide__arrow glide__arrow--left btn" data-glide-dir="<"><i class="fas fa-arrow-left"></i></button>
+    <button class="glide__arrow glide__arrow--right btn" data-glide-dir=">"><i class="fas fa-arrow-right"></i></button>
   </div>
 </div>
 </div>
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/myopac/base.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/myopac/base.tt2
index aac692c995..1442ebd4a0 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/myopac/base.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/myopac/base.tt2
@@ -1,33 +1,32 @@
 [%  WRAPPER "opac/parts/base.tt2" %]
 
 [% myopac_pages = [
-        {children => 0, parent => "parent",url => "main", text => l("<i class='fas fa-home' aria-hidden='true'></i> Home"), name => l("Account Summary")},
+        {children => 0, parent => "parent",url => "main", text => "<i class='fas fa-home' aria-hidden='true'></i>" _ l("Home"), name => l("Account Summary")},
 
-        {children => 2, parent => "parent",url => "charges", text => l("<i class='fas fa-money-check-alt' aria-hidden='true'></i> <span class='sumNum'>[_1]</span>Charges", money(ctx.user_stats.fines.balance_owed)), name => l("Charges")},
-        {children => 0, parent => "charges",url => "charges", text => l("<i class='fas fa-file-invoice' aria-hidden='true'></i> Current Charges"), name => l("Current Charges")},
-        {children => 0, parent => "charges",url => "main_payments", text => l("<i class='fas fa-history' aria-hidden='true'></i> Payment History"), name => l("Payment History")},
+        {children => 2, parent => "parent",url => "charges", text => "<i class='fas fa-money-check-alt' aria-hidden='true'></i> <span class='sumNum'>" _ money(ctx.user_stats.fines.balance_owed) _ "</span>" _ l("Charges"), name => l("Charges")},
+        {children => 0, parent => "charges",url => "charges", text => "<i class='fas fa-file-invoice' aria-hidden='true'></i> " _ l("Current Charges"), name => l("Current Charges")},
+        {children => 0, parent => "charges",url => "main_payments", text => "<i class='fas fa-history' aria-hidden='true'></i> " _ l("Payment History"), name => l("Payment History")},
 
-        {children => 0, parent => "parent", url => "messages", text => l("<i class='fas fa-envelope' aria-hidden='true'></i> <span class='sumNum'>[_1]</span>Messages",  ctx.user_stats.messages.unread), name => l("Messages")},
+        {children => 0, parent => "parent", url => "messages", text => "<i class='fas fa-envelope' aria-hidden='true'></i> <span class='sumNum'>" _ ctx.user_stats.messages.unread _ "</span> " _ l("Messages"), name => l("Messages")},
 
-        {children => 3, parent => "parent",url => "circs", text => l("<i class='fas fa-book' aria-hidden='true'></i> <span class='sumNum'>[_1]</span>Items Checked Out", ctx.user_stats.checkouts.total_out), name = l("Circulations")},
-        {children => 0, parent => "circs", url => "circs", text => l("<i class='fas fa-book-reader' aria-hidden='true'></i> Current Items Checked Out"), name=> l("Circulations")},
+        {children => 3, parent => "parent",url => "circs", text => "<i class='fas fa-book' aria-hidden='true'></i> <span class='sumNum'>" _ ctx.user_stats.checkouts.total_out _ "</span>" _ l("Items Checked Out"), name = l("Circulations")},
+        {children => 0, parent => "circs", url => "circs", text => "<i class='fas fa-book-reader' aria-hidden='true'></i> " _ l("Current Items Checked Out"), name=> l("Circulations")},
 
-        {children => 0, parent => "circs", url => "circ_history", text => l("<i class='fas fa-history' aria-hidden='true'></i> Check Out History"), name => l("Check Out History")},
+        {children => 0, parent => "circs", url => "circ_history", text => "<i class='fas fa-history' aria-hidden='true'></i> " _ l("Checkout History"), name => l("Checkout History")},
 
-        {children => 5, parent => "parent",url => "holds", text => l("<i class='fas fa-clock' aria-hidden='true'></i> <span class='sumNum'>[_1]</span>Holds / <span class='sumNum'>[_2]</span> Ready", ctx.user_stats.holds.total, ctx.user_stats.holds.ready), name => l("Holds")},
-        {children => 0, parent => "holds", url => "holds", text => l("<i class='fas fa-hands' aria-hidden='true'></i> Items on Hold"), name => l("Holds")},
+        {children => 4, parent => "parent",url => "holds", text => "<i class='fas fa-clock' aria-hidden='true'></i> <span class='sumNum'>" _ ctx.user_stats.holds.total _  "</span>" _ l("Holds") _ " / <span class='sumNum'>" _ ctx.user_stats.holds.ready _ "</span> " _ l("Ready"), name => l("Holds")},
+        {children => 0, parent => "holds", url => "holds", text => "<i class='fas fa-hands' aria-hidden='true'></i> " _ l("Items on Hold"), name => l("Holds")},
 
+        {children => 0, parent => "holds", url => "hold_history", text => "<i class='fas fa-history' aria-hidden='true'></i> " _ l("Holds History"), name => l("Holds History")},
 
-        {children => 0, parent => "holds", url => "hold_history", text => l("<i class='fas fa-history' aria-hidden='true'></i> Holds History"), name => l("Holds History")},
+        {children => 4, parent => "parent", url => "prefs", text => "<i class='fas fa-cog' aria-hidden='true'></i> " _ l("Preferences"),name => l("Preferences")},
+        {children => 0, parent => "prefs", url => "prefs", text => "<i class='fas fa-user-cog' aria-hidden='true'></i> " _ l("Personal Information"), name => l("Preferences")},
+        {children => 0, parent => "prefs", url => "prefs_notify", text => "<i class='fas fa-exclamation-circle' aria-hidden='true'></i> " _ l("Notifications"), name => l("Notifications")},
+        {children => 0, parent => "prefs", url => "prefs_settings", text => "<i class='fas fa-search' aria-hidden='true'></i> " _ l("Search & History"), name => l("Search & History")},
+        {children => 0, parent => "prefs", url => "prefs_my_lists", text => "<i class='fas fa-list' aria-hidden='true'></i> " _ l("Lists"), name => l("Lists")},
 
-        {children => 4, parent => "parent", url => "prefs", text => l("<i class='fas fa-cog' aria-hidden='true'></i> Preferences"),name => l("Preferences")},
-        {children => 0, parent => "prefs", url => "prefs", text => l("<i class='fas fa-user-cog' aria-hidden='true'></i> Personal Information"), name => l("Preferences")},
-        {children => 0, parent => "prefs", url => "prefs_notify", text => l("<i class='fas fa-exclamation-circle' aria-hidden='true'></i> Notifications"), name => l("Notifications")},
-        {children => 0, parent => "prefs", url => "prefs_settings", text => l("<i class='fas fa-search' aria-hidden='true'></i> Search & History"), name => l("Search & History")},
-        {children => 0, parent => "prefs", url => "prefs_my_lists", text => l("<i class='fas fa-list' aria-hidden='true'></i> Lists"), name => l("Lists")},
 
-
-        {children => 0, parent => "parent", url => "lists", text => l("<i class='fas fa-list' aria-hidden='true'></i> My Lists"), name => l("My Lists")}
+        {children => 0, parent => "parent", url => "lists", text => "<i class='fas fa-list' aria-hidden='true'></i> " _ l("My Lists"), name => l("My Lists")}
     ];
     IF (ctx.curbside_pickup_libs.size > 0 );
         myopac_pages.push({children => 0, parent => "parent", url => "holds_curbside", text => l("<i class='fas fa-road' aria-hidden='true'></i> Curbside Pickup"), name => l("Curbside Pickup")});
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/place_hold.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/place_hold.tt2
index 3dba482de6..d9894ff5d2 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/place_hold.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/place_hold.tt2
@@ -242,7 +242,7 @@ function maybeToggleNumCopies(obj) {
                 <label class="form-check-label" for="email_notify">
                    [% l('Yes, by Email') %]
 
-                     [% IF !ctx.user.email and !ctx.is_staff; l('<br>No configured Email address. See "My Account" for setting your Email address.'); ELSE; %] : <span id="email_address"><b name="email_address">[% ctx.user.email %]</b></span>[% END %]
+                     [% IF !ctx.user.email and !ctx.is_staff; "<br/>" _ l('No configured Email address. See "My Account" for setting your Email address.'); ELSE; %] : <span id="email_address"><b>[% ctx.user.email %]</b></span>[% END %]
                 </label>
             </div>
 
@@ -258,8 +258,8 @@ function maybeToggleNumCopies(obj) {
                     </label>
                 </div>
 
-                <p>
-                    <label>[% l('Phone Number:') %]<input type="text" class="form-control" name="phone_notify" [% setting = 'opac.default_phone';
+                <p style="margin-left:30px;">
+                    <label>[% l('Phone Number:') %]<input type="text" class="form-control" style="width:13em;" name="phone_notify" [% setting = 'opac.default_phone';
                     IF ctx.user_setting_map.$setting; %] value='[% ctx.user_setting_map.$setting | html %]'
                     [%- ELSIF ctx.user.day_phone; %] value='[% ctx.user.day_phone | html %]' [% END %]/></label>
                 </p>
@@ -267,8 +267,11 @@ function maybeToggleNumCopies(obj) {
                 [% IF ctx.get_org_setting(ctx.search_ou, 'sms.enable') == 1 %]
                 <input class="hold-alert-method" type="checkbox" id="sms_notify_checkbox" name="sms_notify_checkbox"
                     [% IF ctx.default_sms_notify %]checked="checked"[% END %]/>
-                    <label for="sms_notify_checkbox">[% l('Yes, by Text Messaging') %]</label><br/>
-                <p>
+                    <label for="sms_notify_checkbox">[% l('Yes, by SMS Text Message') %]</label><br/>
+                <p style="margin-left:30px;">
+                [% IF NOT sms_carrier_hide_warning %]
+                    <i>[% l("Note: Not all mobile carriers provide SMS text services. Carrier charges may apply.") %]</i><br/><br/>
+                [%  END; %]
                     [% INCLUDE "opac/parts/sms_carrier_selector.tt2" %]<br/>
                     [% INCLUDE "opac/parts/sms_number_textbox.tt2" %]<br/>
                 </p>
@@ -277,6 +280,7 @@ function maybeToggleNumCopies(obj) {
             <div>
 
              [% IF ctx.hold_data.size > 0; %]
+            <span class="font-weight-bold">[% l('Create this hold for a future date?') %]</span>
             <div class="form-check m-2">
                 <input class="form-check-input" type="checkbox" value="t" id="hold_suspend" name="hold_suspend">
                 <label class="form-check-label" for="hold_suspend">
@@ -297,10 +301,10 @@ function maybeToggleNumCopies(obj) {
 
                 <a class="btn btn-sm btn-action m-2" id="actDateToggle" href="#toggled-block-suspend" onclick="return toggleActivationDate();"><i class="fas fa-calendar" aria-hidden="true"></i> [% l('Set activation date') %]</a>
             </div>
-            <blockquote id="toggled-block-suspend">
-            <label for="thaw_date">[% l('Activate on') %]
+            <blockquote id="toggled-block-suspend" style="margin-left:30px;">
+            <label for="thaw_date">[% l('Activate on:') %]
               <div class="input-group date" data-provide="datepicker">
-                <input type="text" class="form-control" name="thaw_date" id="thaw_date" value="[% thaw_date | html %]" data-date-format="mm/dd/yyyy" />
+                <input type="text" class="form-control"  name="thaw_date" id="thaw_date" value="[% thaw_date | html %]" data-date-format="mm/dd/yyyy" />
                 <div class="input-group-addon">
                     <span class="glyphicon glyphicon-th"></span>
                 </div>
@@ -317,6 +321,7 @@ function maybeToggleNumCopies(obj) {
                 </div>
         [% END %]
                  [% IF NOT metarecords.disabled AND ctx.hold_data.size == 1 %]
+                <span class="font-weight-bold">[% l('Choose formats and languages?') %]</span><br/>
                         [% IF CGI.param('hold_type') == 'T' AND hdata.record.metarecord AND !hdata.part_required %]
                         <!-- Grab the bre_id so that we can restore it if user accidentally clicks advanced options -->
                            [% bre_id = hdata.target.id %]
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/record/cnbrowse.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/record/cnbrowse.tt2
index 73cf33b642..7e1774a4fd 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/record/cnbrowse.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/record/cnbrowse.tt2
@@ -6,7 +6,7 @@
 <div class='cn_browser'>
     <div id='cn_browse_div'>
         <p class='color_4 h5'>
-            [% l("You are now browsing [_1]", ctx.browsing_ou.name) | html %]
+            [% l("You are now browsing"); " "; ctx.browsing_ou.name %]
         </p>
 
         <div class="row">
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/record/contents.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/record/contents.tt2
index d6f234ac13..5db63f784e 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/record/contents.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/record/contents.tt2
@@ -1,22 +1,23 @@
 [%-
 contents =  [
     {
-        label => l('General Note: '),
+        display_field => 'general_note',
+        label => l('General Note:'),
         xpath => '//*[@tag="500"]'
     }, {
-        label => l('With Note: '),
+        label => l('With Note:'),
         xpath => '//*[@tag="501"]'
     }, {
         display_field => 'thesis',
-        label => l('Dissertation Note: '),
+        label => l('Dissertation Note:'),
         xpath => '//*[@tag="502"]'
     }, {
         display_field => 'bibliography',
-        label => l('Bibliography, etc. Note: '),
+        label => l('Bibliography, etc. Note:'),
         xpath => '//*[@tag="504"]'
     }, {
         display_field => 'toc',
-        label => l('Formatted Contents Note: '),
+        label => l('Formatted Contents Note:'),
         xpath => '//*[@tag="505"]'
     }, {
         label => l('Restrictions on Access Note: '),
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/record/copy_counts.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/record/copy_counts.tt2
index 4f4fcaada8..fdedfcb90e 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/record/copy_counts.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/record/copy_counts.tt2
@@ -20,7 +20,7 @@
             displayed_ous.$ou_name = 1;
     %]
     <li>
-    [% l('[_1] of [quant,_2,copy,copies] available at [_3].', ou_avail, ou_count, ou_name) | html %]
+    [% ou_avail; " / "; ou_count; " "; l("copies available at"); " "; ou_name %]
     [%- this_depth = ctx.get_aou(ou_id).ou_type.depth;
         IF ou_count > 0 && this_depth != ctx.copy_depth %]
     <a href="[% mkurl('', {copy_depth => this_depth}, ['copy_offset']); %]"
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/record/copy_table.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/record/copy_table.tt2
index a829703ae3..26c786841d 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/record/copy_table.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/record/copy_table.tt2
@@ -87,15 +87,15 @@ IF has_copies or ctx.foreign_copies;
             [% IF serial_holdings -%]
             <th scope='col' style="vertical-align:top;">[% l("Issue Label") %]</th>
             [%- ELSE -%]
-            <th scope='col' style="vertical-align:top;">[% l("Library System: Library Branch Name") %]<a href="#" title="" data-toggle="tooltip" data-original-title="Click a library name on the list below to see that library's location and hours."><i class="fas fa-question-circle" aria-hidden="true"></i></a><br/>
-                <div style="font-style:italic;font-weight:normal;padding-left:10px;"><a href="#" title="" data-toggle="tooltip" data-original-title="Use this library map to identify which libraries are close to you."><i class="fas fa-map-marker-alt" aria-hidden="true"></i></a> <a href="http://pines.georgialibraries.org/pinesLocator/locator.html" target="_blank">Find your nearest library</a></div></th>
+            <th scope='col' style="vertical-align:top;">[% l("Library System: Library Branch Name") %]<a title="" data-toggle="tooltip" data-original-title="[% l('Click a library name on the list below to see the location and hours.') %]"><i class="fas fa-question-circle" aria-hidden="true"></i></a><br/>
+                <div style="font-style:italic;font-weight:normal;padding-left:10px;"><a  title="" data-toggle="tooltip" data-original-title="[% l('Use this library map to identify which libraries are close to you.') %]"><i class="fas fa-map-marker-alt" aria-hidden="true"></i></a> <a href="http://pines.georgialibraries.org/pinesLocator/locator.html" target="_blank">[% l('Find your nearest library') %]</a></div></th>
             [%- END %]
-            <th scope='col' style="vertical-align:top;">[% l("Call Number / Copy Notes") %]<a href="#" title="" data-toggle="tooltip" data-original-title="Use the call number to locate the item on the shelf."><i class="fas fa-question-circle" aria-hidden="true"></i></a></th>
+            <th scope='col' style="vertical-align:top;">[% l("Call Number / Copy Notes") %]<a title="" data-toggle="tooltip" data-original-title="[% l('Use the call number to locate the item on the shelf.') %]"><i class="fas fa-question-circle" aria-hidden="true"></i></a></th>
             [%- IF has_parts == 'true' %]
             <th scope='col' style="vertical-align:top;">[% l("Part") %]</th>
             [%- END %]
             <th scope='col' style="vertical-align:top;">[% l("Barcode") %]</th>
-            <th scope='col' style="vertical-align:top;">[% l("Shelving Location") %]<a href="#" title="" data-toggle="tooltip" data-original-title="The shelving location is the part of the library where the item is located."><i class="fas fa-question-circle" aria-hidden="true"></i></a></th>
+            <th scope='col' style="vertical-align:top;">[% l("Shelving Location") %]<a  title="" data-toggle="tooltip" data-original-title="[% l('The shelving location is the section of the library where the item is located.') %]"><i class="fas fa-question-circle" aria-hidden="true"></i></a></th>
             [%- IF ctx.is_staff %]
             <th scope='col' style="vertical-align:top;">[% l("Circulation Modifier") %]</th>
             <th scope='col' style="vertical-align:top;">[% l("Age Hold Protection") %]</th>
@@ -160,8 +160,8 @@ END; # FOREACH bib
                 <meta property="price" content="0.00">
             </td>[% END %]
             <td><span property="sku">[% callnum | html %]</span> [% IF ctx.get_org_setting(CGI.param('loc')
-                OR ctx.aou_tree.id, 'sms.enable') == 1 %]<br/><a href="#" title="" data-toggle="tooltip" data-original-title="Send this call number to yourself as an SMS text message."><i class="fas fa-paper-plane" aria-hidden="true" style="color:#5781AB;"></i></a> <i><a href="[% mkurl(ctx.opac_root _ '/sms_cn',
-               {copy_id => copy_info.id}) %];rec=[%- ctx.bre_id -%]" rel="nofollow" vocab="">[% l('Send Text') %]</a></i>[% END %]</td>
+                OR ctx.aou_tree.id, 'sms.enable') == 1 %]<br/><a title="" data-toggle="tooltip" data-original-title="[% l('Send this call number to yourself as an SMS text message.') %]"><i class="fas fa-paper-plane" aria-hidden="true" style="color:#5781AB;"></i></a> <i><a href="[% mkurl(ctx.opac_root _ '/sms_cn',
+               {copy_id => copy_info.id}) %];rec=[%- ctx.bre_id -%]" rel="nofollow" vocab="">[% l('Send SMS Text') %]</a></i>[% END %]</td>
 
        [% IF copy_info.notes; %]
             [% FOREACH note IN copy_info.notes; %]
@@ -320,7 +320,7 @@ END; # FOREACH bib
                     '-';
                 END %]</td>
         <!-- PINES customization: Show alert if item is new -->
-        <td>[% IF copy_info.age_protect && copy_info.create_date < (date.now - 15552000); '<a href="#" title="" data-toggle="tooltip" data-original-title="This is a new item and may only be checked out locally."><i class="fas fa-star" style="color:orange;" aria-hidden="true"></i></a>'; END; %] 
+        <td>[% IF copy_info.age_protect && copy_info.create_date < (date.now - 15552000); '<a title="" data-toggle="tooltip" data-original-title="' _ l("This is a new item and may only be checked out locally.") _ '"><i class="fas fa-star" style="color:orange;" aria-hidden="true"></i></a>'; END; %] 
         </td>
         </tr>
 
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/record/navigation.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/record/navigation.tt2
index c1fe478165..98b356c244 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/record/navigation.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/record/navigation.tt2
@@ -13,7 +13,7 @@
                 ctx.prev_rec_url = mkurl(ctx.prev_search_record, prev_args, stop_parms);
         %]
         <a class='np_nav_link classic_link btn btn-action' title='[% l("Previous Record") %]'
-            href='[% ctx.prev_rec_url %]'><span class="nav_arrow_fix">&#9668;</span> <span class="d-none d-md-inline-block">[% l('Previous') %]</span></a>
+            href='[% ctx.prev_rec_url %]'><span class="nav_arrow_fix">&#9668;</span> <span class="d-none d-md-inline-block"></span></a>
         [% END %]
         </div>
     </div>
@@ -28,7 +28,7 @@
         </span>
         <br>
         <span>
-                [% l('Showing Item [_1] of [_2]', ctx.search_result_index + 1, ctx.hit_count) %]
+                [% l('Showing Item'); " "; ctx.search_result_index + 1; " "; l('of'); " "; ctx.hit_count %]
         </span>
         <br>
         <span>
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/record/subjects.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/record/subjects.tt2
index f58e0402c2..d397be724e 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/record/subjects.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/record/subjects.tt2
@@ -6,28 +6,28 @@
             xpath => '//*[@tag="600" or @tag="610" or @tag="611" or @tag="630" or @tag="650" or @tag="651"]'
         }, {
             display_field => 'genre',
-            label => l('Genre: '),
+            label => l('Genre:'),
             facet => 'identifier|genre',
             joiner => ' -- ',
             xpath => '//*[@tag="655"]',
             subfields => '[abvxyz]'
         }, {
-            label => l('Topic Heading: '),
+            label => l('Topic Heading:'),
             xpath => '//*[@tag="690"]'
         }, {
-            label => l('Geographic Setting: '),
+            label => l('Geographic Setting:'),
             xpath => '//*[@tag="691"]'
         }, {
-            label => l('Biographical Subject: '),
+            label => l('Biographical Subject:'),
             xpath => '//*[@tag="692"]'
         }, {
-            label => l('Character Attributes: '),
+            label => l('Character Attributes:'),
             xpath => '//*[@tag="693"]'
         }, {
-            label => l('Setting: '),
+            label => l('Setting:'),
             xpath => '//*[@tag="698"]'
         }, {
-            label => l('Time Period: '),
+            label => l('Time Period:'),
             xpath => '//*[@tag="699"]'
         }
     ];
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/record/summary.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/record/summary.tt2
index 7705145878..b9ba720809 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/record/summary.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/record/summary.tt2
@@ -56,7 +56,7 @@ ctx.metalinks.push('
     <div class="col-lg-9">
         <div class="row h-100">
             <div class="col-lg-8">
-                <h1 class='h1' property="name" style="font-size:2em;">[% IF attrs.hl.title; attrs.hl.title; ELSE; attrs.title_extended | html; END %]</h1>
+                <h1 class='h1' property="name" style="font-size:1.8em;">[% IF attrs.hl.title; attrs.hl.title; ELSE; attrs.title_extended | html; END %]</h1>
                 [%-
                 FOR link880 IN attrs.graphic_titles;
                 FOR alt IN link880.graphic;
@@ -72,9 +72,9 @@ ctx.metalinks.push('
                 [%- INCLUDE "opac/parts/record/contents-summaryonly.tt2" %]
                 <div>
                     <button id="btnMore" data-toggle="collapse" data-target="#demo"
-                        class="btn btn-action btn-sm my-3"><i class="fas fa-info-circle" aria-hidden="true"></i> [%l ("More Details") %]</button>
+                        class="btn btn-action btn-sm my-3"><i class="fas fa-info-circle" aria-hidden="true"></i> [% l('More Details') %]</button>
                     <div id="demo" class="collapse">
-                        <h2 id='rdetail_record_details' style="font-size:1.7em;">[% l("Record details") %]</h2>
+                        <h2 id='rdetail_record_details' style="font-size:1.5em;">[% l("Record details") %]</h2>
                         <ul class="list-unstyled">
                             [%- IF attrs.hl.isbn.size; FOR isbn IN attrs.hl.isbn %]
                             <li class='rdetail_isbns'>
@@ -294,7 +294,7 @@ ctx.metalinks.push('
 
                             IF args.mmr_unique_bib.size > 1;
                             %]
-                            <h2 class="rdetail_other_formats">[% l("Other Formats and Editions") %]</h2>
+                            <h3 style="font-size:1.5em;">[% l("More Options") %]</h3>
                             <span class="metarecord_population_format">
                                 [%- IF mmr_attrs.format_label;
 
@@ -344,7 +344,7 @@ ctx.metalinks.push('
                                 ['qtype','fi:search_format','fi:icon_format','fi:item_lang','fi:from_metarecord'] ) );
                                 %]
                                 <span class="metarecord_population_span_link">
-                                    <a href="[%- l( link ) %]">[% l("View all formats and editions ") %] ([%-
+                                    <a href="[%- l( link ) %]">[% l("View all formats and editions") %] ([%-
                                         args.mmr_unique_bib.size %])
                                     </a></span><br />
                             </div>
@@ -379,7 +379,7 @@ ctx.metalinks.push('
 
                 <!-- PINES: Moved Holds block here -->
                 <div>
-                    <h2 style="font-size:1.7em;">[% l('Holds') %]</h2>
+                    <h2 style="font-size:1.5em;">[% l('Holds') %]</h2>
                     <ul>
                         [%
                             # If org hiding is enabled/relevant, only show
@@ -392,8 +392,7 @@ ctx.metalinks.push('
                             END;
                             count_entry = count_entry + 1;
                             END;
-                            l("<li>[quant,_1,current hold,current holds] with [quant,_2,total copy,total copies].</li>",
-                            ctx.record_hold_count, ctx.copy_summary.$count_entry.count)
+                            "<li>"; ctx.record_hold_count; " "; l("current holds");
                         %]
                     </ul>
                 </div>
@@ -568,7 +567,7 @@ ctx.metalinks.push('
         IF num_uris > 0;
         -%]
 
-        <h2 class="rdetail_uris" style="font-size:1.7em;">[% l("Electronic resources") %]</h2>
+        <h2 class="rdetail_uris" style="font-size:1.5em;">[% l("Electronic resources") %]</h2>
         <div class="rdetail_uris">
             [%- IF num_uris > 1 %]<ul>[% END %]
                 [%- FOR uri IN merged_uris %]
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/result/copy_counts.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/result/copy_counts.tt2
index b198400bb7..0f811cc280 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/result/copy_counts.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/result/copy_counts.tt2
@@ -11,14 +11,11 @@
 %]
 <div class="result_count">
 [% IF ctx.get_aou(attrs.copy_counts.$depth.org_unit).opac_visible == 't' %]
-    [% l('[_1] of [quant,_2,copy,copies] available at [_3].',
-        attrs.copy_counts.$depth.available,
-        attrs.copy_counts.$depth.count,
-        ou_name) | html
-    %]
+    [% attrs.copy_counts.$depth.available; " / "; attrs.copy_counts.$depth.count; " "; l("copies available at"); " "; ou_name %]
 [% END %]
 </div>
 [%-     END;
+
     depth = depth + 1;
     END;
 
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/result/paginate.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/result/paginate.tt2
index d2676a598b..477dd25b12 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/result/paginate.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/result/paginate.tt2
@@ -53,12 +53,12 @@
                 [%~ |l('<span class="result_count_number">' _ ctx.result_start _'</span>',
                 '<span class="result_count_number">' _ ctx.result_stop _ '</span>',
                 '<span class="result_count_number">' _ ctx.hit_count _ '</span>')  ~%]
-                Results [_1] - [_2] of [_3]
+                [% l('Results') %] [_1] - [_2] [% l('of') %] [_3]
                 [%~ END %]
                 <span class='padding-left-6'>
                     [%~ |l('<span class="result_count_number">' _ (page + 1) _ '</span>',
                     '<span class="result_count_number">' _ page_count _ '</span>') ~%]
-                    (page [_1] of [_2])
+                    ([% l('page') %] [_1] [% l('of') %] [_2])
                     [%~ END %]
                 </span>
     </span>
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/result/table.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/result/table.tt2
index d01c1722d4..faff6b450c 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/result/table.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/result/table.tt2
@@ -35,13 +35,13 @@
             [% IF !ctx.is_meta %]
             <div id="record_selector_block" class="mx-2 hidden">
                 <input type="checkbox" id="select_all_records" />
-                <label for="select_all_records">[% l('Select [_1] - [_2]', ctx.result_start, ctx.result_stop) %]</label>
+                <label for="select_all_records">[% l('Select'); ' '; ctx.result_start; ' - ';   ctx.result_stop %]</label>
                 <span id="selected_records_summary">
                 <a href="[% mkurl(ctx.opac_root _ '/mylist') %]" class="no-dec" rel="nofollow" vocab="">
                     <span id="selected_records_count">[% ctx.mylist.size %]
 
                     </span>
-                            [% l('selected') %]
+                            [% l('selected titles') %]
                 </a></span>
                 <span id="hit_selected_record_limit" class="hidden">Reached limit!</span>
                 <a id="clear_basket" href="#">[% l('Clear basket') %]</a>
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2
index 91092cfed7..660818b9e8 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2
@@ -39,14 +39,14 @@ END;
     [% IF (ctx.page == 'place_hold' || ctx.page == 'myopac' || ctx.page == 'home' || ctx.page == 'record') && search.metarecord_default %]
     <input type="hidden" name="modifier" value="metabib"/>
     [% END %]
-    <div class="m-3" style="border-bottom: 3px dashed #8DC641;">
+    <div class="m-3" style="border-bottom: 3px dashed #8DC641;padding-bottom: 10px;">
     <div class="row">
      <!--Keyword-->
         <div class="col-sm-12 col-md">
         <span class='search_box_wrapper'>
             [%- # autosuggest breaks accessibility, as the aria-label
                 # attribute is removed when the Dijit is created. :(  %]
-            <label id="search_box_label" for="search_box" class="w-100">[% l('Search for: ') %]
+            <label id="search_box_label" for="search_box" class="w-100">[% l('Search for:') %]
             <input class="form-control form-control-sm" type="text" id="search_box" name="query" aria-label="[%
                     l('Enter search query:');
                 %]" value="[% is_advanced ? ctx.naive_query_scrub(ctx.user_query) : CGI.param('query') | html %]"
@@ -102,7 +102,7 @@ END;
         <div class="col-sm-12 col-md">
         <label id="search_locg_label" for="search_org_selector" class="w-100">
         [%-
-            l('Library: ');
+            l('Search within:');
             select_lib_label = l("Search within:");
             INCLUDE build_org_selector arialabel=select_lib_label
               id='search_org_selector' show_loc_groups=1 show_lassos=1
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/sms_carrier_selector.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/sms_carrier_selector.tt2
index 88085ae6be..6d73370a26 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/sms_carrier_selector.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/sms_carrier_selector.tt2
@@ -18,12 +18,12 @@
     END;
 %]
 [% IF NOT sms_carrier_hide_label; '<label for="sms_carrier">' _ l('Mobile carrier:') _ '</label>'; END; %]
-<select onchange="record_change(event)" id="sms_carrier" name="sms_carrier" id="sms_carrier" [% IF sms_carrier_hide_label; 'aria-label="' _ l('Mobile carrier') _ '"'; END; %]>
+<select name="sms_carrier" id="sms_carrier" class="form-control" style="width:25em;" [% IF sms_carrier_hide_label; 'aria-label="' _ l('Mobile carrier:') _ '"'; END; %]>
     <option value="">[% l('Please select your mobile carrier') %]</option>
     [% FOR carrier IN carriers.sort('name','region') -%]
     <option value='[% carrier.id | html %]'[%
-        default_carrier == carrier.id || ahr.sms_carrier == carrier.id ? ' selected="selected"' : ''
+        default_carrier == carrier.id ? ' selected="selected"' : ''
     %]>[% carrier.name | html %] ([% carrier.region | html %])</option>
     [% END -%]
-</select><br/>
-[% IF NOT sms_carrier_hide_warning; l('Note: carrier charges may apply'); END; %]
+</select>
+
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/sms_number_textbox.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/sms_number_textbox.tt2
index 395b5a36d1..0c504bd347 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/sms_number_textbox.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/sms_number_textbox.tt2
@@ -1,5 +1,5 @@
 [% IF NOT sms_number_hide_label; '<label for="sms_notify">' _ l('Mobile number:') _ '</label>'; END; %]
-<input type="text" name="sms_notify" [% setting = 'opac.default_sms_notify';
+<input class="form-control" style="width:13em;" type="text" name="sms_notify" [% setting = 'opac.default_sms_notify';
 IF ctx.user_setting_map.$setting; %] value='[% ctx.user_setting_map.$setting | html %]' [% END %]
-[% IF sms_number_hide_label; 'aria-label="' _ l('Mobile number') _ '"'; END; %] id="sms_notify" />
-[% IF NOT sms_number_hide_hint; l('Hint: use the full 10 digits of your phone #, no spaces, no dashes'); END; %]
+[% IF sms_number_hide_label; 'aria-label="' _ l('Mobile number:') _ '"'; END; %] id="sms_notify" />
+[% IF NOT sms_number_hide_hint; "<i>" _ l('Hint: use the full 10 digits of your phone number, no spaces, no dashes') _ ".</i>"; END; %]
diff --git a/Open-ILS/src/templates-bootstrap/opac/record/email.tt2 b/Open-ILS/src/templates-bootstrap/opac/record/email.tt2
index a08b743dc8..7fd7a42944 100755
--- a/Open-ILS/src/templates-bootstrap/opac/record/email.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/record/email.tt2
@@ -22,9 +22,9 @@
             [% END %]
             <br/>
             [% IF ctx.redirect_to %]
-            <p><a class="btn btn-outline-primary" href="[% ctx.redirect_to | html %]">[% l("Return") %]</a>  </p>
+            <p><a class="btn btn-outline-primary" href="[% ctx.redirect_to | html %]">[% l("Go Back") %]</a>  </p>
             [% ELSE %]
-            <p><a class="btn btn-outline-primary" href="[% mkurl(ctx.opac_root  _ '/record/' _ ctx.bre_id) %]">[% l("Back to Record") %]</a></p>
+            <p><a class="btn btn-outline-primary" href="[% mkurl(ctx.opac_root  _ '/record/' _ ctx.bre_id) %]">[% l("Go Back") %]</a></p>
             [% END %]
             <div class="common-full-pad"></div>
         </div>
diff --git a/Open-ILS/src/templates-bootstrap/opac/record/email_preview.tt2 b/Open-ILS/src/templates-bootstrap/opac/record/email_preview.tt2
index f28cf8953f..6980c1332f 100644
--- a/Open-ILS/src/templates-bootstrap/opac/record/email_preview.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/record/email_preview.tt2
@@ -7,7 +7,8 @@
     <h2 class="sr-only">[% l('Email Record Preview') %]</h2>
     [% INCLUDE "opac/parts/searchbar.tt2" %]
     <br class="clear-both" />
-    <div id="content-wrapper" class="content-wrapper-record-page">
+    <div id="content-wrapper" class="content-wrapper-record-page" style="margin-left:20px;">
+    <h2>[% l('Email Preview') %]</h2>
 
     <form id="previewForm" method="POST" action="[% mkurl('',{},['locg','format','sort','sort_dir','context_org','bre_id','is_list']) %]">
         <input type="hidden" name="old_event" value="[% ctx.preview_record.id %]"/>
@@ -17,19 +18,19 @@
         <input type="hidden" name="redirect_to" value="[% ctx.redirect_to | html %]"/>
 
         <div class="searchbar">
-            <label for="email">[% l('Email Address: ') %]
+            <label for="email">[% l('Email Address') %]:
                 <input class="form-control" id="email" type="text" name="email" value="[% ctx.email || ctx.user.email %]"/>
             </label>
         </div>
 
         <div class="searchbar">
-            <label for="subject">[% l('Custom Email Subject: ') %]
+            <label for="subject">[% l('Custom Email Subject:') %]
                 <input class="form-control" id="subject" type="text" name="subject" value="[% ctx.subject || '' %]"/>
             </label>
         </div>
 
         <div class="searchbar">
-            <label for="formats">[% l('Format: ') %]
+            <label for="formats">[% l('Select Brief or Full Format, then click Update:') %]
                 <select class="form-control" id="formats" name="format">
                     [% FOR f IN ctx.formats %]
                         [% IF !ctx.format_obj; ctx.format_obj = f; END %]
@@ -41,7 +42,7 @@
 
         [% IF ctx.is_list == '1' %]
         <div class="searchbar">
-            <label for="sortby">[% l('Sort by: ') %]
+            <label for="sortby">[% l('Choose how you want to sort, then click Update:') %]
                 <select class="form-control" id="sortby" name="sort">
                     <option [% IF ctx.sort == 'author'; 'selected="selected"'; END %] value="author">[% l('Author') %]</option>
                     <option [% IF ctx.sort == 'title'; 'selected="selected"'; END %] value="title">[% l('Title') %]</option>
@@ -57,7 +58,7 @@
 
         [% IF ctx.format_obj.holdings == 't' %]
         <div class="searchbar">
-            <label for="context_org">[% l('Holdings Library: ') %]
+            <label for="context_org">[% l('Select a Library:') %]
                 [% INCLUDE build_org_selector id='context_org' name='context_org' value=ctx.selected_print_email_loc %]</br>
             </label>
         </div>
@@ -90,8 +91,8 @@
             </div>
             [% END %]
             <div class="searchbar">
-                <button type="submit" class="btn btn-confirm">[% l("Email Now") %]</button> |
-                <a class="btn btn-confirm" href="[% ctx.redirect_to | html %]">[% l("Return") %]</a>
+                <button type="submit" class="btn btn-confirm">[% l("Email Now") %]</button> 
+                <a class="btn btn-confirm" href="[% ctx.redirect_to | html %]">[% l("Go Back") %]</a>
                 <br/>
                 <br/>
                 <pre>[% ctx.preview_record.template_output.data %]</pre>
diff --git a/Open-ILS/src/templates-bootstrap/opac/record/print.tt2 b/Open-ILS/src/templates-bootstrap/opac/record/print.tt2
index 15fbc21c11..200ed5fe00 100755
--- a/Open-ILS/src/templates-bootstrap/opac/record/print.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/record/print.tt2
@@ -8,9 +8,9 @@
     <body onload="if (document.getElementById('printable-record')) window.print();">
         <div class='noprint'>
             [% IF ctx.redirect_to %]
-            <p>[ <a href="[% ctx.redirect_to | html %]">[% l("Return") %]</a> ] </p>
+            <p>[ <a href="[% ctx.redirect_to | html %]">[% l("Go Back") %]</a> ] </p>
             [% ELSE %]
-            <p>[ <a href="[% mkurl(ctx.opac_root  _ '/record/' _ ctx.bre_id) %]">[% l("Back to Record") %]</a> ]</p>
+            <p>[ <a href="[% mkurl(ctx.opac_root  _ '/record/' _ ctx.bre_id) %]">[% l("Go Back") %]</a> ]</p>
             [% END %]
             <hr />
         </div>
@@ -26,9 +26,9 @@
         <div class='noprint'>
             <hr />
             [% IF ctx.redirect_to %]
-            <p>[ <a href="[% ctx.redirect_to | html %]">[% l("Return") %]</a> ] </p>
+            <p>[ <a href="[% ctx.redirect_to | html %]">[% l("Go Back") %]</a> ] </p>
             [% ELSE %]
-            <p>[ <a href="[% mkurl(ctx.opac_root  _ '/record/' _ ctx.bre_id) %]">[% l("Back to Record") %]</a> ]</p>
+            <p>[ <a href="[% mkurl(ctx.opac_root  _ '/record/' _ ctx.bre_id) %]">[% l("Go Back") %]</a> ]</p>
             [% END %]        
         </div>
     </body>
diff --git a/Open-ILS/src/templates-bootstrap/opac/record/print_preview.tt2 b/Open-ILS/src/templates-bootstrap/opac/record/print_preview.tt2
index 8880ba1b5f..e84fbd6c4a 100644
--- a/Open-ILS/src/templates-bootstrap/opac/record/print_preview.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/record/print_preview.tt2
@@ -4,10 +4,10 @@
     ctx.page_title = l("Print Record Preview");
     PROCESS "opac/parts/org_selector.tt2";
 -%]
-    <h2 class="sr-only">[% l('Print Record Preview') %]</h2>
+    <h2 class="sr-only">[% l('Print Preview') %]</h2>
     [% INCLUDE "opac/parts/searchbar.tt2" %]
     <br class="clear-both" />
-    <div id="content-wrapper" class="content-wrapper-record-page">
+    <div id="content-wrapper" class="content-wrapper-record-page" style="margin-left:20px;">
 
     <form id="previewForm" action="[% mkurl('',{},['locg','format','sort','sort_dir','context_org','bre_id','is_list']) %]">
         <input type="hidden" name="old_event" value="[% ctx.preview_record.id %]"/>
@@ -16,8 +16,9 @@
         <input type="hidden" name="is_list" value="[% ctx.is_list %]"/>
         <input type="hidden" name="redirect_to" value="[% ctx.redirect_to | html %]"/>
 
+        <h2>[% l("Print Preview") %]</h2>
         <div class="searchbar">
-            <label for="formats">[% l('Format: ') %]
+            <label for="formats">[% l('Select Brief or Full Format, then click Update:') %]
                 <select class="form-control w-100" id="formats" name="format">
                     [% FOR f IN ctx.formats %]
                         [% IF !ctx.format_obj; ctx.format_obj = f; END %]
@@ -29,7 +30,7 @@
 
         [% IF ctx.is_list == '1' %]
         <div class="searchbar">
-            <label for="sortby">[% l('Sort by: ') %]
+            <label for="sortby">[% l('Choose how you want to sort, then click Update:') %]<br/>
                 <select id="sortby" name="sort">
                     <option [% IF ctx.sort == 'author'; 'selected="selected"'; END %] value="author">[% l('Author') %]</option>
                     <option [% IF ctx.sort == 'title'; 'selected="selected"'; END %] value="title">[% l('Title') %]</option>
@@ -45,7 +46,7 @@
 
         [% IF ctx.format_obj.holdings == 't' %]
         <div class="searchbar">
-            <label for="context_org">[% l('Holdings Library: ') %]
+            <label for="context_org">[% l('Select a library:') %]
                 [% INCLUDE build_org_selector id='context_org' name='context_org' value=ctx.selected_print_email_loc %]</br>
             </label>
         </div>
@@ -61,7 +62,7 @@
         [% IF ctx.preview_record.template_output %]
         <div class="searchbar">
             <a class="btn btn-confirm" href="[% mkurl('../print/' _ ctx.preview_record.id, {redirect_to => ctx.redirect_to}) %]">[% l("Print Now") %]</a> |
-            <a class="btn btn-confirm" href="[% ctx.redirect_to | html %]">[% l("Return") %]</a>
+            <a class="btn btn-confirm" href="[% ctx.redirect_to | html %]">[% l("Go Back") %]</a>
         </div>
             <br/>
             <div>[% ctx.preview_record.template_output.data %]</div>
-- 
2.11.0