From: Terran McCanna <tmccanna@georgialibraries.org>
Date: Tue, 23 Dec 2014 16:38:36 +0000 (-0500)
Subject: OPAC UI modifications as per OPAC Working Group suggestions.
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=fe23cd589defeba70a7eeb742438e73a52338310;p=evergreen%2Fpines.git

OPAC UI modifications as per OPAC Working Group suggestions.

Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>

Conflicts:
	Open-ILS/src/templates/opac/myopac/circs.tt2
	Open-ILS/src/templates/opac/myopac/holds.tt2
	Open-ILS/src/templates/opac/myopac/prefs.tt2
	Open-ILS/src/templates/opac/myopac/prefs_notify.tt2
	Open-ILS/src/templates/opac/parts/advanced/search.tt2
	Open-ILS/src/templates/opac/parts/footer.tt2
	Open-ILS/src/templates/opac/parts/myopac/main_base.tt2
	Open-ILS/src/templates/opac/parts/place_hold.tt2
	Open-ILS/src/templates/opac/parts/record/copy_counts.tt2
	Open-ILS/src/templates/opac/parts/record/extras.tt2
	Open-ILS/src/templates/opac/parts/record/navigation.tt2
	Open-ILS/src/templates/opac/parts/record/summary.tt2
	Open-ILS/src/templates/opac/parts/result/table.tt2
	Open-ILS/src/templates/opac/parts/topnav.tt2
	Open-ILS/src/templates/opac/register.tt2
	Open-ILS/src/templates/opac/results.tt2
---

diff --git a/Open-ILS/src/templates/actor/user/register_table.tt2 b/Open-ILS/src/templates/actor/user/register_table.tt2
index d3f19a05b1..ba670c2983 100644
--- a/Open-ILS/src/templates/actor/user/register_table.tt2
+++ b/Open-ILS/src/templates/actor/user/register_table.tt2
@@ -34,7 +34,10 @@
     <tr fmclass='au' fmfield='juvenile'/>
     <tr fmclass='au' fmfield='ident_type' required='required'/>
     <tr fmclass='au' fmfield='ident_value'/>
-    <tr fmclass='au' fmfield='ident_value2'><td/><td id='parentGuardian'></td></tr>
+    <tr fmclass='au' fmfield='ident_value2'>
+	    <td/><td id='parentGuardian' /><td/><td><span id='parentGuardianRequired' style='color:red;font-weight:bold;display:none;'>
+        <script>document.write(localeStrings.PARENT_REQUIRED);</script>
+        </span></td></tr>
     <tr fmclass='au' fmfield='email'/>
     <tr fmclass='au' fmfield='day_phone'/>
     <tr fmclass='au' fmfield='evening_phone'/>
diff --git a/Open-ILS/src/templates/opac/advanced.tt2 b/Open-ILS/src/templates/opac/advanced.tt2
index de86006f49..e113da800f 100644
--- a/Open-ILS/src/templates/opac/advanced.tt2
+++ b/Open-ILS/src/templates/opac/advanced.tt2
@@ -10,10 +10,9 @@
     <h2 class="sr-only">[% l('Advanced Search') %]</h2>
     <div id="search-wrapper">
         <div id="search-box">
-            <span class="search_catalog_lbl mobile_hide">[% l('Search the Catalog') %]</span>
             <span class="adv_search_catalog_lbl"><a href="[% mkurl(ctx.opac_root _ '/home') %]"
                     id="home_adv_search_link">[%l('Basic Search')%]</a></span>
-
+            <span class="search_catalog_lbl mobile_hide">[% l('Advanced Search') %]</span>
             <span class="browse_the_catalog_lbl"><a href="[% mkurl(ctx.opac_root _ '/browse') %]">[%
                     l('Browse the Catalog')%]</a></span>
         </div>
@@ -27,7 +26,7 @@
                     id="num_search">[% l('Numeric Search') %]</a>
                 <a href="[% mkurl('', {pane => 'expert'}) %]"
                     [% IF pane == 'expert' %]class="on" [% END %]
-                    id="expert_search">[% l('Expert Search') %]</a>
+                    id="expert_search">[% l('MARC Record Search') %]</a>
             </div>
         </div>
     </div>
diff --git a/Open-ILS/src/templates/opac/browse.tt2 b/Open-ILS/src/templates/opac/browse.tt2
index 303c6e3501..d6363c6787 100644
--- a/Open-ILS/src/templates/opac/browse.tt2
+++ b/Open-ILS/src/templates/opac/browse.tt2
@@ -7,7 +7,7 @@
     INCLUDE "opac/parts/topnav.tt2";
 
     ctx.page_title = l("Browse the Catalog");
-    blimit = CGI.param('blimit') || ctx.opac_hits_per_page || 10;
+    blimit = CGI.param('blimit') || ctx.opac_hits_per_page || 20;
 
     depart_list = ['blimit', 'bterm', 'bpivot'];
     ctx.metalinks.push('<meta name="robots" content="noindex,follow">');
@@ -29,6 +29,11 @@
         <div id="main-content">
             <div id="browse-the-catalog">
                 <div id="browse-controls" class='searchbar'>
+				    <p style="font-style:italic;font-weight:normal;width:100%;max-width:800px;">
+					    Browse through a virtual index of titles, authors, subjects, or series for a
+					    particular library, for a library system, or for all of PINES. If browsing
+						by author, type in the first letters of the last name.
+					</p>
                     <form method="get" onsubmit="$('browse-submit-spinner').className = ''; return true">
                         <input type="hidden" name="blimit"
                             value="[% blimit %]" />
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 6c70550612..891b665bb8 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -19,6 +19,14 @@ img {
     border: none;
 }
 
+select {
+    padding:3px;
+}
+
+input {
+    padding:3px;
+}
+
 #topnav_logo {
     margin: 2em 0;
 }
@@ -40,7 +48,7 @@ a {
 
 #search-wrapper input[type=text] {
     margin:0;
-    padding:0;
+    padding:3;
 }
 
 #search-wrapper select, .results_header_lbl select {
@@ -51,8 +59,10 @@ a {
 
 .searchbar {
     font-weight: bold;
-    padding-top: 10px;
+    padding-top: 30px;
+	padding-bottom: 15px;
     margin-left: 1em;
+	font-size: [% css_fonts.size_big %];
 }
 
 /*
@@ -169,7 +179,7 @@ for now until a better color is picked - if needed.
     color: [% css_colors.background %];
     margin-left: 1em;
     margin-right: 1em;
-    font-size: [% css_fonts.size_small %];
+    font-size: [% css_fonts.size_base %];
 }
 
 #header a {
@@ -183,7 +193,7 @@ for now until a better color is picked - if needed.
 
 #header-links {
     color: [% css_colors.text_invert %];
-    font-size: [% css_fonts.size_small %];
+    font-size: [% css_fonts.size_base %];
     font-weight: bold;
     position: relative;
     top:4px;
@@ -234,7 +244,7 @@ for now until a better color is picked - if needed.
 }
 
 #gold-links-holder {
-    height: 24px;
+    height: 42px;
     background: [% css_colors.background_invert %];
 }
 
@@ -272,10 +282,11 @@ for now until a better color is picked - if needed.
 }
 
 #search-wrapper #search-box {
-    margin-left: 1em;
+    margin-left: 0;
     padding-left: 0px;
-    padding-top: 10px;
+    padding-top: 20px;
     padding-bottom: 10px;
+	background-color:#ddd;
 }
 
 #adv_search_tabs, #acct_tabs, #acct_fines_tabs, #acct_checked_tabs, #acct_holds_tabs, #acct_prefs_tabs, #results_header_inner{
@@ -384,30 +395,36 @@ for now until a better color is picked - if needed.
 }
 
 .rdetail_header {
-    padding: 5px 7px 6px 0px;
-    margin-left: 1em;
-    border-bottom: 1px dotted [% css_colors.accent_light %];
+    padding: 10px 7px 10px 20px;
+    border-bottom: 1px dotted [% css_colors.accent_medium %];
+	border-top: 1px dotted [% css_colors.accent_medium %];
+	background-color:#eee;
+	margin-left:-20px;
+	margin-right:-20px;
+	font-weight: bold;
+	text-decoration: none;
 }
 
-.rdetail_results a {
-    color:[% css_colors.primary_fade %];
-    font-weight:bold;
-    font-size: [% css_fonts.size_bigger %];
+.rdetail_results a, .rdetail_result_nav a {
+	text-decoration: none;
 }
 
 .rdetail_result_count {
     color: [% css_colors.text %];
-    font-weight: normal;
     padding-left: 1em;
     display: inline-block;
+	font-weight:normal;
 }
 
 .rdetail_result_nav {
-    font-weight:normal;
     padding-left: 1em;
     display: inline-block;
 }
 
+#rdetail_summary_header {
+    margin-top: 30px;
+}
+
 #rdetail_details_table {
     margin-top: 15px;
 }
@@ -421,13 +438,15 @@ for now until a better color is picked - if needed.
 h2.rdetail_uris {
     margin-top: 1em;
 }
+
 div.rdetail_uris {
-    padding: 0.5em 1em 0.5em 1em;
-    background-color: [% css_colors.accent_lighter2 %];
+    padding: 0em 1em em 1em;
+	margin-left: 1em;
 }
+
 div.rdetail_uris ul li {
     position: relative;
-    left: 1em;
+    left: 3em;
 }
 
 div.rdetail_show_copies {
@@ -437,6 +456,10 @@ div.rdetail_show_copies {
 div#rdetail_actions_div {
     float: right;
     background: [% css_colors.background %];
+	border: 1px solid #ccc;
+    border-radius: 25px;
+	padding:10px 0px 10px 0px;
+	margin-bottom:20px;
 }
 
 span#rdetail_copy_counts {
@@ -461,14 +484,18 @@ span#rdetail_hold_counts p {
 }
 
 .rdetail_aux_utils {
-    border-left:1px dotted [% css_colors.accent_light %];
     padding-left: 17px;
     padding-bottom: 6px;
     padding-right: 70px;
 }
 
+.result_count {
+	padding-left:40px;
+	width:600px;
+}
+
 div.place_hold {
-    border-bottom: 1px dotted [% css_colors.accent_light %];
+    border-bottom: 0px;
     padding-top: 10px;
 }
 
@@ -485,8 +512,7 @@ div.format_icon {
 }
 
 .result_util {
-    border-bottom: 1px dotted [% css_colors.accent_light %];
-    padding-top: 6px;
+    border-bottom:0px;
 }
 
 .results_aux_utils {
@@ -494,7 +520,7 @@ div.format_icon {
 }
 
 .result_util {
-    padding-left: 1em;
+    padding-left: 0px;
 }
 
 .results_reviews {
@@ -631,7 +657,7 @@ div.format_icon {
 #main-content .left_brain input[type=text], #main-content .left_brain input[type=password] {
     width:167px;
     margin:0;
-    padding:0;
+    padding:3;
     background: [% css_colors.background %];
     font-size: [% css_fonts.size_bigger %];
     color: [% css_colors.text %];
@@ -652,7 +678,7 @@ div.format_icon {
 
 .login-help-button {
     font-size: [% css_fonts.size_biggest %];
-    padding: 1.5em;
+    padding: 20px;
 }
 
 #login-failed-message {
@@ -660,6 +686,9 @@ div.format_icon {
     font-weight: bold;
     color: [% css_colors.text_alert %];
     padding-top: 1em;
+	padding-bottom: 30px;
+	width: 100%;
+	max-width: 700px;
 }
 
 #holds_temp_parent td {
@@ -668,6 +697,7 @@ div.format_icon {
 
 #holds_temp_parent input, #holds_temp_parent select {
     margin:0;
+	padding:3px;
 }
 
 #holds_temp_parent tr td div {
@@ -682,7 +712,7 @@ div.format_icon {
 }
 
 #results_header_bar {
-    background: [% css_colors.accent_medium %];
+    background: [% css_colors.accent_light %];
     border-top:1px solid [% css_colors.accent_mediumdark %];
     border-bottom:1px solid [% css_colors.accent_mediumdark %];
 }
@@ -693,8 +723,8 @@ div.format_icon {
     color: [% css_colors.text %];
     /* this border is not visible, but it keeps these labels the same size
     as the buttons */
-    border: 1px solid [% css_colors.accent_medium %];
-    background: [% css_colors.accent_medium %];
+    border: 1px solid [% css_colors.accent_light %];
+    background: [% css_colors.accent_light %];
     margin: 0.5em 0.3em;
     padding: 0.3em;
 }
@@ -717,8 +747,12 @@ collapse correctly when the window width decreases */
 }
 
 .results_header_nav1 {
-    padding: 5px 7px 6px 0px;
-    border-bottom: 1px dotted [% css_colors.accent_light %];
+    padding: 10px 7px 10px 7px;
+	text-align:center;
+    border-bottom: 2px dotted [% css_colors.accent_light %];
+	background-color:#eee;
+	margin-left:-20px;
+	margin-right:-20px;
 }
 
 .results_header_nav1 .h1 {
@@ -759,16 +793,17 @@ tr.result_table_row > td.result_table_title_cell {
 
 tr.result_table_row:nth-child(n+2) > td {
     border-top: 1px solid [% css_colors.accent_lighter2 %];
+	padding-top:10px;
+	padding-bottom:10px;
 }
 
 tr.result_table_row > td.result_table_pic_header {
     white-space: nowrap;
-    width: 78px;
+    width: 110px;
     padding-left: 1em;
 }
 
 .result_number {
-    padding-left: 1em;
     white-space: nowrap;
 }
 
@@ -784,6 +819,7 @@ tr.result_table_row > td.result_table_pic_header {
 div.result_table_utils_cont {
     text-align:left;
     float: left;
+	margin-left:70px;
 }
 
 .icon_text {
@@ -864,6 +900,7 @@ div.result_table_utils_cont {
     padding: 0px 7px 0px 0px;
     border-bottom: 1px dotted [% css_colors.accent_light %];
     clear: both;
+	margin-bottom:10px;
 }
 
 .header_middle a {
@@ -983,7 +1020,7 @@ div.result_table_utils_cont {
 .myopac_payments_table thead th:first-child { width: 8em; }
 .myopac_payments_table tbody tr:nth-child(odd) { background-color: [% css_colors.accent_lighter %]; }
 .myopac_payments_table form { display: inline; }
-.myopac_payments_table input[type="submit"] { padding: 1px; }
+.myopac_payments_table input[type="submit"] { padding: 3px; }
 
 .payment-error {
     font-weight: bold; color: [% css_colors.text_alert %];
@@ -1132,7 +1169,8 @@ div#facet_sidebar {
     padding-top:5px;
     padding-bottom: 10px;
     margin-left: 1em;
-    font-size: [% css_fonts.size_small %];
+    font-size: [% css_fonts.size_base %];
+	font-weight: bold;
 }
 
 #footer a {
@@ -1234,12 +1272,15 @@ a.dash-link:hover { text-decoration: underline !important; }
 .inactive-hold { background: [% css_colors.accent_lightest %]; }
 .unread-patron-message { font-weight: bold; }
 
-#hold-items-list td { padding: 5px; margin-bottom: 20px; }
-.hold-items-list-title { 
-  font-size: [% css_fonts.size_bigger %];
-  margin-bottom: 20px;
+#hold-items-list td { 
+  padding: 10px 0px 20px 0px;
+}
+
+.hold-items-list-title { font-size: 2em; }
+.hold-items-list-problem {  
+  padding-left:10px;
+  font-weight:bold;
 }
-.hold-items-list-problem { color: [% css_colors.text_alert %]; }
 
 .hold_success_links > span { margin: 0 2em; }
 
@@ -1348,13 +1389,17 @@ a.opac-button-header:hover, #dash_wrapper a.opac-button:hover {
 }
 
 .rdetail_content {
-    margin-left: 1.5em;
-    padding-left: 1.5em;
+    margin-left: 2em;
+}
+
+.rdetail_subject {
+    margin-left: 2em;
 }
 
 .rdetail_content_type, .rdetail_subject_type {
     vertical-align: top;
     font-weight: bold;
+	width: 10em;
 }
 
 .bookbag-item-row td { vertical-align: top; }
@@ -1363,6 +1408,8 @@ a.opac-button-header:hover, #dash_wrapper a.opac-button:hover {
 .success {
     color: [% css_colors.text_greatnews %];
     font-weight: bold;
+	padding:10px;
+	font-size:1em;
 }
 
 .rdetail_related_subjects {
@@ -1390,9 +1437,16 @@ a.opac-button-header:hover, #dash_wrapper a.opac-button:hover {
 }
 h2.bookbag-name { margin-bottom: 0em; padding-bottom: 0em; }
 .bookbag-share .fixed { min-width: 4em; }
-.bookbag-specific { margin-left: 1em; }
-.bookbag-specific div.sort { float: left; width: 45%; text-align: left; }
-.bookbag-specific div.meta { float: right; width: 54%; text-align: right; }
+.bookbag-specific { 
+    width:97%;
+    margin-left: 3em;
+    border-left: 2px solid #ccc;
+    border-bottom: none;
+    border-right: none;
+    border-top: none;
+}
+.bookbag-specific div.sort { float: left; text-align: left; }
+.bookbag-specific div.meta { float: left; text-align: left; margin-left:20px; }
 #bbag-name-desc-form tr th { vertical-align: middle; }
 #bbag-name-desc-form .saver { vertical-align: middle; text-align: center; }
 .bookbag-description {
@@ -1404,9 +1458,9 @@ h2.bookbag-name { margin-bottom: 0em; padding-bottom: 0em; }
 #bbag-edit-name { width: 20em; }
 textarea { font-family: sans-serif; }
 table.bookbag-specific {
-    border-right: 1px solid [% css_colors.accent_dark %];
-    border-bottom: 1px solid [% css_colors.accent_medium %];
-    margin-bottom: 2ex;
+   # border-right: 1px solid [% css_colors.accent_dark %];
+   # border-bottom: 1px solid [% css_colors.accent_medium %];
+    margin-bottom: 2px;
 }
 .bookbag-share {
     float: left;
@@ -1417,6 +1471,11 @@ table.bookbag-specific {
     padding: 5px 0px 0px 10px;
 }
 
+.bookbag-specific td {
+    padding-top:10px;
+    padding-bottom:10px;
+}
+
 .bookbag-specific td.list_checkbox {
     padding-left: 10px !important;
 }
@@ -1627,6 +1686,7 @@ a.preflib_change {
 
 .record_title {
     font-weight: bold;
+	text-decoration: none;
 }
 
 .record_author {
@@ -1635,8 +1695,11 @@ a.preflib_change {
 
 .password_message {
     padding-top: 1em;
-    padding-bottom: 0.5em;
+    padding-bottom: 2em;
 	font-style: italic;
+	width:100%;
+	max-width:800px;
+	font-size:normal;
 }
 
 #maintenance_message {
@@ -1728,6 +1791,7 @@ a.preflib_change {
 
 .rdetail_authors_div {
     margin-bottom: 1em;
+	font-weight:bold;
 }
 
 #search_query_label, #search_qtype_label, #search_itype_label, #search_locg_label {
@@ -1738,6 +1802,7 @@ a.preflib_change {
 .result_table_title_cell {
     padding-top: 4px;
     padding-bottom: 4px;
+	margin-left:40px;
 }
 
 .record_title {
@@ -1797,8 +1862,8 @@ a.preflib_change {
         padding: 0px;
         margin: 0px;
     }
-    #homesearch_main_logo img {
-        width:75%;
+    #homesearch_main_logo {
+        display:none;
     }
     #format_selector {
         display:none;
diff --git a/Open-ILS/src/templates/opac/login.tt2 b/Open-ILS/src/templates/opac/login.tt2
index 0e82edf974..731398214e 100644
--- a/Open-ILS/src/templates/opac/login.tt2
+++ b/Open-ILS/src/templates/opac/login.tt2
@@ -4,11 +4,11 @@
     basic_search = "f";
     ctx.page_title = l("Account Login") %]
     <h2 class="sr-only">[% l('Account Login') %]</h2>
-    <div class='mobile_hide'>
-        [% INCLUDE "opac/parts/searchbar.tt2" %]
+	<div class='mobile_hide'>
+        [% #INCLUDE "opac/parts/searchbar.tt2" %] 
     </div>
-    <div id="content-wrapper">
-        <div id="main-content">
+	<div id="content-wrapper">
+        <div id="main-content" style="padding-top:80px;">
             <h3 class="sr-only">[% l('Account Login Form') %]</h3>
             [% INCLUDE "opac/parts/login/form.tt2" %]
             <div class="clear-both very-big-height"></div>	
diff --git a/Open-ILS/src/templates/opac/myopac/circs.tt2 b/Open-ILS/src/templates/opac/myopac/circs.tt2
index f75e74808e..2bfbba290b 100644
--- a/Open-ILS/src/templates/opac/myopac/circs.tt2
+++ b/Open-ILS/src/templates/opac/myopac/circs.tt2
@@ -6,7 +6,8 @@
 <h3 class="sr-only">[% l('Current Items Checked Out') %]</h3>
 <div id='myopac_checked_div'>
 
-    <div id="acct_checked_tabs">
+    <!--
+	<div id="acct_checked_tabs">
         <div class="align selected">
             <a href="#">[% l("Current Items Checked Out") %]</a>
         </div>
@@ -16,10 +17,12 @@
         </div>
         -->
     </div>
+	-->
 
     <div class="header_middle">
-        <span class="float-left">[% l('Current Items Checked Out') %]</span>
+        <span class="float-left">[% l('Items Currently Checked Out') %]</span>
     </div>
+
     <div class="clear-both"></div>
     [% IF ctx.circs.size < 1 %]
     <div class="warning_box">[% l('You have no items checked out.') %]</div>
@@ -43,18 +46,18 @@
                     <option value="renew">[% l('Renew Selected Titles') %]</option>
                 </select>
             </span>
-            <span style="padding-left:9px;">
+            <span style="padding-left:4px;">
                 <input type="submit"
                     value="[% l('Go') %]"
                     title="[% l('Go') %]"
                     class="opac-button" />
             </span>
-            <span style="padding-left:5px;">
+            <!--<span style="padding-left:5px;">
                 <a href="#"><img 
                     alt="[% l('Renewing Help') %]"
                     title="[% l('Actions for checked out items') %]"
                     src="[% ctx.media_prefix %]/images/question-mark.png" /></a>
-            </span>
+            </span>-->
         </div>
 
         <table id="acct_checked_main_header" 
@@ -149,19 +152,16 @@
                                     [%- circ.ATTRS.title.substr(0,circ.ATTRS.nonfiling_characters) | html %]</span>
                                     [%- circ.ATTRS.title.substr(circ.ATTRS.nonfiling_characters) | html %]</a>
                             [% END %]
-                        </td>
-                        <td name="author">
-                            [% IF circ.circ.target_copy.call_number.id == -1 %]
+                            [% IF circ.circ.target_copy.call_number.id == -1 %] &nbsp; / &nbsp; 
                                 [% circ.circ.target_copy.dummy_author | html %]
-                            [% ELSIF circ.ATTRS.author %]
-                                <a href="[% mkurl(ctx.opac_root _ '/results',
-                                    {qtype => 'author', query => circ.ATTRS.author.replace('[,\.:;]', '')},
-                                    1
-                                ) %]">[% circ.ATTRS.author | html %]</a>
+                            [% ELSIF attrs.author %] &nbsp; / &nbsp;
+                            <a href="[% mkurl(ctx.opac_root _ '/results',
+                                {qtype => 'author', query => attrs.author.replace('[,\.:;]', '')}
+                            ) %]">[% attrs.author | html %]</a>
                             [% END %]
                         </td>
-                        <td name="renewals">
-                            [% circ.circ.renewal_remaining %]
+                        <td name="renewals" style="text-align:center;">
+                            [% circ.circ.renewal_remaining %] *
                         </td>
                         [%
                             due_date = ctx.parse_datetime(circ.circ.due_date);
@@ -203,6 +203,8 @@
                     END %]
                 </tbody>
             </table>
+			<p style="font-style:italic;">* 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.</p>
         </form>
     </div>
     [% END %]
diff --git a/Open-ILS/src/templates/opac/myopac/holds.tt2 b/Open-ILS/src/templates/opac/myopac/holds.tt2
index 1454679a2f..c9df5eab48 100644
--- a/Open-ILS/src/templates/opac/myopac/holds.tt2
+++ b/Open-ILS/src/templates/opac/myopac/holds.tt2
@@ -11,7 +11,8 @@
 <h3 class="sr-only">[% l('My Holds') %]</h3>
 <div id='myopac_holds_div'>
 
-    <div id="acct_holds_tabs">
+    <!-- 
+	<div id="acct_holds_tabs">
         <div class="align selected">
             <a href='#'>[% l("Items on Hold") %]</a>
         </div>
@@ -21,14 +22,15 @@
         </div>
         -->
     </div>
+	-->
 
     <div class="header_middle">
         <span id="acct_holds_header" style="float:left;">
-            [%  if cgi.param("available");
-                    l("items ready for pickup");
-                else;
-                    l("current items on hold");
-                end
+            [%  IF CGI.param("available");
+                    l("Items Ready for Pickup");
+                ELSE;
+                    l("Items Currently on Hold");
+                END
             %]
         </span>
         <span class='float-left' style='padding-left: 10px;'>
@@ -51,6 +53,8 @@
         </span>
 
     </div>
+	<p style="font-style:italic;">If you require assistance placing a hold or have a question about a hold that you have placed, 
+	please <a href="http://www.georgialibraries.org/lib/directories/pineslibdir.html">contact your local library.</a></p>
     <div class="clear-both"></div>
     <div id='holds_main'>
         <form method="post">
@@ -63,21 +67,22 @@
                         <option id='myopac_holds_actions_none' value=''>
                         -- [% l("actions for selected holds") %] --
                         </option>
-                        <option value='suspend'>[% l("suspend") %]</option>
-                        <option value='activate'>[% l("activate") %]</option>
-                        <!-- xxx maybe later <option value='thaw_date'>[% l("set active date") %]</option> -->
-                        <option value='cancel'>[% l("cancel") %]</option>
+                        <option value='suspend'>[% l("Suspend selected holds") %]</option>
+                        <option value='activate'>[% l("Activate selected holds") %]</option>
+                        <!-- XXX maybe later <option value='thaw_date'>[% l("Set Active Date") %]</option> -->
+                        <option value='cancel'>[% l("Cancel selected holds") %]</option>
                     </select>
                 </td>
-                <td style="padding-left:9px;">
-                    <input type="submit" value="[% l('go') %]"
-                        title="[% l('go') %]" class="opac-button" />
+                <td style="padding-left:6px;padding-right:30px;">
+                    <input type="submit" value="[% l('Go') %]"
+                        title="[% l('Go') %]" class="opac-button" />
                 </td>
                 <td style="padding-left:5px;">
-                    <a href="#"><img
-                        alt="[% l('holds help') %]"
-                        title="[% l('actions for selected holds') %]"
+                    <!-- <a href="#"><img
+                        alt="[% l('Holds Help') %]"
+                        title="[% l('Actions for selected holds') %]"
                         src="[% ctx.media_prefix %]/images/question-mark.png" /></a>
+					-->
                 </td>
                 <td style="padding-left:5px;" class='error'>
                     [%  if ctx.hold_suspend_post_capture;
@@ -86,13 +91,13 @@
                     %]
                 </td>
                 <td align="right">
-                    [% if cgi.param("available") -%]
-                    <a href="[% mkurl('holds', {}, ['limit','offset','available']) %]">[% l('show all holds') %]</a> |
-                    <strong>[% l("show only available holds") %]</strong>
-                    [% else -%]
-                    <strong>[% l("show all holds") %]</strong> |
-                    <a href="[% mkurl('holds',{available => 1},['limit','offset']) %]">[% l("show only available holds") %]</a>
-                    [% end -%]
+                    [% IF CGI.param("available") -%]
+                    <a href="[% mkurl('holds', {}, ['limit','offset','available']) %]">[% l('Show All Holds') %]</a> &nbsp; | &nbsp; 
+                    <strong>[% l("Showing Holds That Are Ready to Pick Up") %]</strong>
+                    [% ELSE -%]
+                    <strong>[% l("Showing All Holds") %]</strong> &nbsp; | &nbsp; 
+                    <a href="[% mkurl('holds',{available => 1},['limit','offset']) %]">[% l("Show Holds That Are Ready to Pick Up") %]</a>
+                    [% END -%]
                 </td>
             </tr>
         </table>
@@ -103,19 +108,19 @@
             class="table_no_border_space table_no_cell_pad">
             <thead>
             <tr>
-                <th align="center">
-                    <input type="checkbox" title="[% l('select all holds') %]"
-                      onclick="var inputs=document.getelementsbytagname('input'); for (i = 0; i < inputs.length; i++) { if (inputs[i].name == 'hold_id' &amp;&amp; !inputs[i].disabled) inputs[i].checked = this.checked;}"/>
+                <th>
+                    <input type="checkbox" title="[% l('Select All Holds') %]"
+                      onclick="var inputs=document.getElementsByTagName('input'); for (i = 0; i < inputs.length; i++) { if (inputs[i].name == 'hold_id' &amp;&amp; !inputs[i].disabled) inputs[i].checked = this.checked;}"/>
                 </th>
-                <th>[% sort_head("sort_title", l('title')) %]</th>
-                <th>[% sort_head("author", l('author')) %]</th>
-                <th>[% sort_head("format", l('format')) %]</th>
-                <th>[% l('pickup location') %]</th>
-                <th>[% l('activate') %]</th>
-                <th>[% l('cancel if not filled by') %]</th>
-                <th>[% l('active') %]</th>
-                <th>[% l('status') %]</th>
-                <th>[% l('notes') %]</th>
+                <th>[% l('Title') %]</th>
+                <th>[% l('Author') %]</th>
+                <th>[% l('Status') %]</th>
+                <th>[% l('Active?') %]</th>
+                <!--<th>[% l('Format') %]</th>-->
+                <th>[% l('Hold Will Activate On') %]</th>
+                <th>[% l('Cancel If Not Filled By') %]</th>
+                <th>[% l('Pickup Location') %]</th>
+                <th>[% l('Edit Hold Details') %]</th>
             </tr>
             </thead>
             <tbody id="holds_temp_parent">
@@ -175,25 +180,55 @@
                     ahr = hold.hold.hold %]
                 <tr name="acct_holds_temp"
                     class="acct_holds_temp[% ahr.frozen == 't' ? ' inactive-hold' : '' %]">
-                    <td class="checkbox_column">
+                    <td valign="top"><div>
                         <input type="checkbox" name="hold_id" value="[% ahr.id %]" 
-                            [% html_text_attr('title', l('select hold [_1]', attrs.title)) %]/>
-                    </td>
-                    <td>
-                        <div>
-                            [% title = hold.attrs.title;
-                            if ahr.hold_type == 'p';
-                    	        title = l('[_1] ([_2])', title, hold.hold.part.label);
-                            end; %]
 
-                            <a href="[% mkurl(ctx.opac_root _ '/record/' _ 
-                                hold.hold.bre_id, {}, 1) %]"
-                                name="[% l('catalog record') %]"><span[%- deemphasize_class -%]>
-                                [%- title.substr(0,hold.attrs.nonfiling_characters) | html %]</span>
-                                [%- title.substr(hold.attrs.nonfiling_characters)   | html %]</a>
+                            [% html_text_attr('title', l('Select hold [_1]', attrs.title)) %]/>
+                        </div>
+					</td>
+                    <td valign="top">
+                        <div>
+                            [% 
+                                title = attrs.title;
+                                IF ahr.hold_type == 'P';
+                                    title = l('[_1] ([_2])', title, hold.hold.part.label);
+                                END;
+                            %]
+                            <a href="[% mkurl(ctx.opac_root _ '/record/' _ hold.hold.bre_id) %]">[% title | html %]</a><br/>
+							<!-- MOVED FORMAT HERE -->
+							<div class="format_icon">
+                          [% 
+                            formats = attrs.all_formats;
+                            IF ahr.hold_type == 'M';
+                              # only show selected formats for metarecords
+                              formats = [];
+                              FOR ccvm IN hold.metarecord_selected_filters.icons;
+                                NEXT IF ccvm.opac_visible == 'f';
+                                format = {};
+                                format.label = ccvm.search_label || ccvm.value;
+                                format.icon = PROCESS get_ccvm_icon ccvm=ccvm;
+                                formats.push(format);
+                              END;
+                            END;
+                            FOR format IN formats 
+                          %]
+                            <img title="[% format.label | html %]" 
+                              alt="[% format.label | html %]" src="[% format.icon %]" />
+                            [% END %]<br/>
+							<!-- MOVED NOTES HERE -->
+							    [%- FOREACH pubnote IN ahr.notes;
+                                    IF pubnote.pub == 't';
+                                %]
+                                <div class="hold_note">
+                                <span class="hold_note_title">[% pubnote.title | html %]</span>
+                                <br />
+                                <span class="hold_note_body">[% pubnote.body | html %]</span>
+                        </div>
+                    [%- END; END; %]
+                        </div>
                         </div>
                     </td>
-                    <td>
+                    <td valign="top">
                         <div>
                             <a href="[% mkurl(ctx.opac_root _ '/results',
                                 {qtype => 'author', query => hold.attrs.author.replace('[,\.:;]', '')},
@@ -201,6 +236,17 @@
                             ) %]">[% hold.attrs.author | html %]</a>
                         </div>
                     </td>
+					<td valign="top">
+                        <div name="acct_holds_status">
+                            [% PROCESS get_hold_status hold=hold; %]
+                        </div>
+                    </td>
+                    <td valign="top">
+					    <div>
+                        [% l(ahr.frozen == 'f' ? 'Yes' : 'No') %]
+						</div>
+                    </td>
+					<!-- Moved format underneath title
                     <td>
                         <div class="format_icon">
                           [% 
@@ -223,30 +269,30 @@
                             [% end %]
                         </div>
                     </td>
-                    <td>
-                        [% ctx.get_aou(ahr.pickup_lib).name | html %]
-                    </td>
-                    <td>
-                        [% if ahr.frozen == 't' and ahr.thaw_date;
-                            date.format(ctx.parse_datetime(ahr.thaw_date), date_format);
-                        end %]
-                    </td>
-                    <td>
-                        [% if ahr.expire_time;
-                            date.format(ctx.parse_datetime(ahr.expire_time), date_format);
-                        end %]
+					-->
+                    <td valign="top">
+					    <div style="text-align:center;">
+                        [% IF ahr.frozen == 't' AND ahr.thaw_date;
+                            date.format(ctx.parse_datetime(ahr.thaw_date), DATE_FORMAT);
+                        END %]
+						</div>
                     </td>
-                    <td>
-                        [% l(ahr.frozen == 'f' ? 'active' : 'suspended') %]
+                    <td valign="top">
+					    <div style="text-align:center;">
+                        [% IF ahr.expire_time;
+                            date.format(ctx.parse_datetime(ahr.expire_time), DATE_FORMAT);
+                        END %]
+						</div>
                     </td>
-                    <td>
-                        <div name="acct_holds_status">
-                            [% process get_hold_status hold=hold; %]
-                        </div>
+                    <td valign="top">
+					    <div>
+                        [% ctx.get_aou(ahr.pickup_lib).name | html %]
+						</div>
                     </td>
-                    <td class="hold_notes">
-                    [%- foreach pubnote in ahr.notes;
-                        if pubnote.pub == 't';
+					<!-- Moved notes under title
+                    <td class="hold_notes" valign="top">
+                    [%- FOREACH pubnote IN ahr.notes;
+                        IF pubnote.pub == 't';
                     %]
                         <div class="hold_note">
                             <span class="hold_note_title">[% pubnote.title | html %]</span>
@@ -255,11 +301,14 @@
                         </div>
                     [%- end; end; %]
                     </td>
-                    <td class="opac-auto-161">
+					-->
+                    <td class="opac-auto-161" valign="top">
+					    <div>
                         <a href="[% mkurl(ctx.opac_root _ '/myopac/holds/edit', {id => ahr.id}) %]"
                             [% html_text_attr('title', l('edit hold for item [_1]', attrs.title)) %]>
                             [% l('edit') %]
                         </a>
+						</div>
                     </td>
                 </tr>
                 [% end %]
diff --git a/Open-ILS/src/templates/opac/myopac/lists.tt2 b/Open-ILS/src/templates/opac/myopac/lists.tt2
index b2c26d2a75..13ae1e09ff 100644
--- a/Open-ILS/src/templates/opac/myopac/lists.tt2
+++ b/Open-ILS/src/templates/opac/myopac/lists.tt2
@@ -16,7 +16,10 @@
 
     <!-- new list creation -->
     <form action="[% mkurl(ctx.opac_root _ '/myopac/list/update') %]" method="post" id="create_form">
-        <h1>[% l('Create New List') %]</h1><a name="createnewlist"></a>
+	<p style="font-style:italic;">Lists allow you to keep track of books you'd like to read in the future, 
+	recommendations you'd like to share with other people, and more. 
+	<a href="http://pines.georgialibraries.org/catalog-help#my_list">Learn more about using lists.</a></p>
+    <div class="header_middle">[% l('Create a New List') %]</div><a name="createnewlist"></a>
         <table class="table_no_cell_pad" id="list_create_table">
             <tr>
                 <td>
@@ -39,23 +42,23 @@
                         <option value="0">[% l('No') %]
                         <option value="1">[% l('Yes') %]
                     </select>
-                    <a href="javascript:void(0);" 
+                    <!--<a href="javascript:void(0);" 
                         onclick="alert('[% bb_publish_text %]')">
                         <img alt="[% l('Sharing Help') %]"
                             [% html_text_attr('title', bb_publish_text) %]
                             src="[% ctx.media_prefix %]/images/question-mark.png" />
-                    </a>
+                    </a>-->
                 </td>
                 <td class="list-create-table-buttons">
-                    <input type="submit"
-                        value="[% l('Submit') %]"
-                        alt="[% l('Submit') %]"
-                        class="opac-button"/>
-                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                     <input type="reset"
                         value="[% l('Cancel') %]"
                         alt="[% l('Cancel') %]"
-                        class="opac-button" />
+                        class="opac-button"  style="padding:5px;background-color:#669999;" />
+						
+					<input type="submit"
+                        value="[% l('Submit') %]"
+                        alt="[% l('Submit') %]"
+                        class="opac-button" style="padding:5px 30px 5px 30px;" />
                 </td>
             </tr>
             <tr>
@@ -69,11 +72,11 @@
         </table>
     </form>
 
-    <h1>[% l("My Existing Lists") %]</h1>
+    <!--<div class="header_middle">[% l('My Existing Lists') %]</div>-->
     [% INCLUDE "opac/parts/anon_list.tt2" %]
     [% IF ctx.bookbags.size %]
-    <div class="header_middle">
-        <span class="float-left">[% l('Saved Lists') %]</span>
+    <div class="header_middle" style="margin-top:40px;">
+        <span class="float-left">[% l('My Lists') %]</span>
         [% IF limit < ctx.bookbag_count; %]
         <span class='float-left' style='padding-left: 10px;'>
             [%- IF offset > 0 -%]
@@ -125,7 +128,7 @@
     <div id='acct_lists_prime'>
         [% FOR bbag IN ctx.bookbags %]
         <div class="bookbag-controls-holder">
-            <div class="bookbag-controls most">
+            <div class="bookbag-controls most" style="width:200px;padding-left:10px;" >
                 [% baseurl = ctx.opac_root _ '/myopac/lists';
                 IF bbag.id != CGI.param("bbid");
                     url = mkurl(baseurl,{bbid => bbag.id, item_page => 1},['edit_notes','sort']);
@@ -150,47 +153,26 @@
                 </div>
             </form>
             [% END %]
+            [% setting = 'opac.default_list'; %]
             <form action="[% mkurl(ctx.opac_root _ '/myopac/list/update') %]" method="post">
-                <div class="bookbag-share">
+                <div class="bookbag-controls">
                     <input type="hidden" name="list" value="[% bbag.id %]" />
                     [%- INCLUDE "opac/parts/preserve_params.tt2"; %]
-                    [% IF bbag.pub != 't' %]
-                    <input type="hidden" name="action" value="show" />
-                    <input class="fixed" type="submit" value="[% l('Share') %]" />
+                    [% IF ctx.user_setting_map.$setting == bbag.id %]
+                    <input type="hidden" name="action" value="remove_default" />
+                    <input type="submit" value="[% l('Remove Default List') %]" style="width:150px;" />
                     [% ELSE %]
-                    <input type="hidden" name="action" value="hide" />
-                    <input class="fixed" type="submit" value="[% l('Hide') %]" />
+                    <input type="hidden" name="action" value="make_default" />
+                    <input type="submit" value="[% l('Make Default List') %]"  style="width:150px;" />
                     [% END %]
                 </div>
             </form>
-            <form action="[% mkurl(ctx.opac_root _ '/myopac/list/update') %]" method="post" onsubmit="return confirm('[% l('Do you really want to delete this list?') %]')">
-                <div class="bookbag-controls">
-                    <input type="hidden" name="list" value="[% bbag.id %]" />
-                    <input type="hidden" name="action" value="delete" />
-                    [%- INCLUDE "opac/parts/preserve_params.tt2"; %]
-                    <input type="submit" value="[% l('Delete List') %]" />
-                </div>
-            </form>
             <form action="[% mkurl(ctx.opac_root _ '/myopac/list/print') %]" method="post">
                 <div class="bookbag-controls">
                     <input type="hidden" name="list" value="[% bbag.id %]" />
                     <input type="hidden" name="sort" value="[% CGI.param('sort') | html %]" />
                     [%- INCLUDE "opac/parts/preserve_params.tt2"; %]
-                    <input type="submit" value="[% l('Download CSV') %]" />
-                </div>
-            </form>
-            [% setting = 'opac.default_list'; %]
-            <form action="[% mkurl(ctx.opac_root _ '/myopac/list/update') %]" method="post">
-                <div class="bookbag-controls">
-                    <input type="hidden" name="list" value="[% bbag.id %]" />
-                    [%- INCLUDE "opac/parts/preserve_params.tt2"; %]
-                    [% IF ctx.user_setting_map.$setting == bbag.id %]
-                    <input type="hidden" name="action" value="remove_default" />
-                    <input type="submit" value="[% l('Remove Default List') %]" />
-                    [% ELSE %]
-                    <input type="hidden" name="action" value="make_default" />
-                    <input type="submit" value="[% l('Make Default List') %]" />
-                    [% END %]
+                    <input type="submit" value="[% l('Download List Data') %]" />
                 </div>
             </form>
             [% IF ctx.is_staff %]
@@ -214,15 +196,29 @@
                 />
             </div>
             [% END %]
-            <div class="bookbag-controls">
-                [% IF bbag.pub == 't'; %]
+			<form action="[% mkurl(ctx.opac_root _ '/myopac/list/update') %]" method="post">
+                <div class="bookbag-share" style="margin-left:10px;" >
+                    <input type="hidden" name="list" value="[% bbag.id %]" />
+                    [%- INCLUDE "opac/parts/preserve_params.tt2"; %]
+                    [% IF bbag.pub != 't' %]
+                    <input type="hidden" name="action" value="show" />
+                    <input class="fixed" type="submit" value="[% l('Make Public') %]" style="width:100px;" />
+                    [% ELSE %]
+                    <input type="hidden" name="action" value="hide" />
+                    <input class="fixed" type="submit" value="[% l('Make Private') %]" style="width:100px;" />
+                    [% END %]
+                </div>
+            </form>
+            <div  class="bookbag-controls" style="width:100px;">
+			<div class="bookbag-controls">
+                [% IF bbag.pub == 't'; %]RSS: 
                 <a target='_blank' href='/opac/extras/feed/bookbag/rss2-full/[% bbag.id %]'><img
                     alt="[% l('RSS Feed') %]" border="0"
                     src="[% ctx.media_prefix %]/images/small-rss.png"/></a>
                 [% END %]
             </div>
             <div class="bookbag-controls">
-                [% IF bbag.pub == 't'; %]
+                 [% IF bbag.pub == 't'; %]
                 <a href='[%-
                     mkurl(
                         ctx.opac_root _ '/results',
@@ -232,13 +228,23 @@
                 -%]'>[% l('HTML View') %]</a>
                 [% END %]
             </div>
+			</div>
+			<form action="[% mkurl(ctx.opac_root _ '/myopac/list/update') %]" method="post" onsubmit="return confirm('[% l('Do you really want to delete this list?') %]')">
+                <div class="bookbag-controls">
+                    <input type="hidden" name="list" value="[% bbag.id %]" />
+                    <input type="hidden" name="action" value="delete" />
+                    [%- INCLUDE "opac/parts/preserve_params.tt2"; %]
+                    <input type="submit" value="[% l('Delete List') %]" />
+                </div>
+            </form>
             <div class="clear-both pad-bottom-five"></div>
         </div>
         [% IF CGI.param("bbid") == bbag.id %]
-        <div class="bookbag-specific">
-            <div class="sort">
+        <div class="bookbag-specific" style="height:10em;margin-bottom:0px;margin-top:0px;" >
+        <!-- Hide for PINES - it's unnecessary since the table columns can sort            
+           <div class="sort">
                 <form method="get">
-                    <label for="opac.result.sort">[% l("Sort list items by: ") %]</label>
+                    <label for="opac.result.sort"><strong>[% l("Sort list items by: ") %]</strong></label>
                     [%- INCLUDE "opac/parts/preserve_params.tt2" params=['loc', 'query', 'qtype']; %]
                     [% INCLUDE "opac/parts/filtersort.tt2"
                         value=CGI.param('sort') mode='bookbag' %]
@@ -247,6 +253,7 @@
                     <input type="submit" value="[% l('Sort') %]" />
                 </form>
             </div>
+        -->
             <div class="meta">
                 <form method="post">
                     <input type="hidden" name="bbid" value="[% bbag.id %]" />
@@ -257,22 +264,23 @@
                     <table id="bbag-name-desc-form">
                         <tr>
                             <th>
-                                <label for="bbag-edit-name">[% l('Name:') %]</label>
+                                <label for="bbag-edit-name">[% l('List Name:') %]</label>
                             </th>
                             <td>
-                                <input name="name" type="text"
+                                <input name="name" type="text" style="font-size:1em;"
                                     value="[% bbag.name | html %]"
                                     id="bbag-edit-name" />
                             </td>
                             <td rowspan="2" class="saver">
-                                [% l("Save changes to name or description?") %]<br />
-                                <input type="submit" value="[% l('Save') %]" />
+                                <!--[% l("Save changes to name or description?") %]--><br />
+                                <input type='submit' value="[% l('Save Changes') %]" alt="[% l('Save') %]" 
+                                    class="opac-button" style="padding-left:20px;padding-right:20px;" />
                             </td>
                         </tr>
                         <tr>
                             <th><label for="bbag-edit-description">[% l('Description:') %]</label></th>
                             <td>
-                                <textarea name="description"
+                                <textarea name="description" style="font-size:1em;"
                                     id="bbag-edit-description">[% bbag.description | html %]</textarea>
                             </td>
                         </tr>
@@ -284,7 +292,9 @@
         <form action="[% mkurl(ctx.opac_root _ '/myopac/list/update') %]" method="post">
         <input type="hidden" name="list" value="[% bbag.id %]" />
         <input type="hidden" name="sort" value="[% CGI.param('sort') | uri %]" />
-        <table class="bookbag-specific table_no_cell_pad table_no_border_space table_no_border">
+        <table class="bookbag-specific table_no_cell_pad table_no_border_space table_no_border" 
+            style="margin-bottom:10px;margin-top:-20px;border-bottom: 2px solid #ccc;">
+            [% IF bbag.items.size > 0 %]
             <thead id="acct_list_header">
                 <tr>
                     <td class="list_checkbox">
@@ -295,28 +305,28 @@
                                 inputs[i].checked = this.checked;}"/>
 
                     </td>
-                    <td class="list_entry">
+                    <td class="list_entry" style="font-weight:bold;">
                         <a href="[% mkurl(ctx.opac_root _ '/myopac/lists', {sort=> (CGI.param('sort') == 'titlesort' ? 'titlesort.descending' : 'titlesort')}) %]">[% l('Title') %]</a>
                     </td>
-                    <td class="list_entry">
-                        <a href="[% mkurl(ctx.opac_root _ '/myopac/lists', {sort=>(CGI.param('sort') == 'authorsort' ? 'authorsort.descending' : 'authorsort')}) %]">[% l('Author(s)') %]</a>
+                    <td class="list_entry" style="font-weight:bold;">
+                        <a href="[% mkurl(ctx.opac_root _ '/myopac/lists', {sort=>(CGI.param('sort') == 'authorsort' ? 'authorsort.descending' : 'authorsort')}) %]">[% l('Author') %]</a>
                     </td>
-                    <td class='list_entry'>
+                    <td class='list_entry' style="font-weight:bold;">
                         [% l('Local Call Number') %]
                     </td>
-                    <td class="list_entry">
+                    <td class="list_entry" style="font-weight:bold;">
                         <a href="[% mkurl(ctx.opac_root _ '/myopac/lists', {sort=>(CGI.param('sort') == 'pubdate' ? 'pubdate.descending' : 'pubdate')}) %]">[% l('Publication Date') %]</a>
                     </td>
-                    <td class="list_entry">
+                    <td class="list_entry" style="font-weight:bold;">
                          [% l('Format') %]
                     </td>
-                    <td class="list_entry">
+                    <td class="list_entry" style="font-weight:bold;">
                         [% l('Notes') %]
                         [% IF CGI.param("edit_notes") != bbag.id %]
                         | <a href="[% mkurl(ctx.opac_root _ '/myopac/lists', {edit_notes=> bbag.id}) %]">[% l('Edit') %]</a>
                         [% END %]
                     </td>
-                    <td class="list_actions">
+                    <td class="list_actions" style="font-weight:bold;">
                         <select name="action">
                             <option disabled="disabled">[% l('-- Actions for these items --') %]</option>
                             <option value="place_hold">[% l('Place hold') %]</option>
@@ -327,9 +337,10 @@
                     </td>
                 </tr>
             </thead>
+            [% END %]
             <tbody>
                 [% UNLESS bbag.items.size %]
-                <tr><td colspan="6" class="list_is_empty">
+                <tr><td colspan="6" class="list_is_empty" style="text-align:left;padding:10px;">
                     [% l("This list contains no items.") %]
                 </td></tr>
                 [% END %]
@@ -389,13 +400,14 @@
                     [% END %]
                 </tr>
                 [% END %]
-                [% IF CGI.param("edit_notes") == bbag.id %]
+                [% IF CGI.param("edit_notes") == bbag.id AND bbag.items.size %]
                 <tr>
-                    <td colspan="3"><!-- All space left of notes column --></td>
+                    <td colspan="6"><!-- All space left of notes column --></td>
                     <td class="save-notes">
                         [%- INCLUDE "opac/parts/preserve_params.tt2"; %]
                         <input type="hidden" name="bbid" value="[% CGI.param('bbid') | html %]" />
-                        <input type="submit" name="save_notes" value="[% l('Save Notes') %]" />
+                        <input type='submit' name="save_notes" value="[% l('Save Notes') %]" alt="[% l('Save Notes') %]" 
+                            class="opac-button" style="padding-left:20px;padding-right:20px;" />
                     </td>
                 </tr>
                 [% END %]
diff --git a/Open-ILS/src/templates/opac/myopac/prefs.tt2 b/Open-ILS/src/templates/opac/myopac/prefs.tt2
index f2462a5d6b..aee4e849ae 100644
--- a/Open-ILS/src/templates/opac/myopac/prefs.tt2
+++ b/Open-ILS/src/templates/opac/myopac/prefs.tt2
@@ -6,25 +6,25 @@
 <h3 class="sr-only">[% l('Account Preferences') %]</h3>
 <div id="acct_info_main">
 
-    <table width='70%' title="[% l('Account preference') %]"
-        class='light_border data_grid'>
+    <table title="[% l('Account preference') %]"
+        class='light_border data_grid' style="width:100%;max-width:600px;">
         <tbody id='myopac_summary_tbody'>
             <tr>
-                <td width='30%'
+                <td style="width:33%;max-width:200px;" 
                     class='color_4 light_border'>[% l("Name") %]</td>
 
-                <td class='light_border'>[% l(
+                <td class='light_border' style="width:33%;max-width:200px;" >[% l(
                     HUMAN_NAME_FORMAT,
                     ctx.user.prefix, ctx.user.first_given_name,
                     ctx.user.second_given_name, ctx.user.family_name,
                     ctx.user.suffix
                 ) | html %]</td>
 
-                <td></td>
+                <td style="width:33%;max-width:200px;" ></td>
             </tr>
 
             <tr>
-                <td class='color_4 light_border'>[% l("Day Phone") %]</td>
+                <td class='color_4 light_border'>[% l("Day (Primary) Phone") %]</td>
                 <td class='light_border'>[% ctx.user.day_phone | html %]</td>
                 <td></td>
             </tr>
@@ -51,7 +51,7 @@
                 <td></td>
                 [%- ELSE %]
                 <td class='light_border'><a href='update_username'
-                    title="[% l('Change Username') %]">[% l("Change") %]</a></td>
+                    title="[% l('Change Username') %]">[% l("Change User Name") %]</a></td>
                 [%- END %]
             </tr>
             <tr>
@@ -61,7 +61,7 @@
                 <td></td>
                 [%- ELSE %]
                 <td class='light_border'><a href='update_password'
-                    title="[% l('Change Password') %]">[% l("Change") %]</a></td>
+                    title="[% l('Change Password') %]">[% l("Change Password") %]</a></td>
                 [%- END %]
             </tr>
             <tr>
@@ -71,7 +71,7 @@
                 <td></td>
                 [%- ELSE %]
                 <td class='light_border'><a href='update_email'
-                    title="[% l('Update Email Address') %]">[% l('Change') %]</a></td>
+                    title="[% l('Update Email Address') %]">[% l('Change Email Address') %]</a></td>
                 [%- END %]
             </tr>
 
@@ -106,28 +106,29 @@
                 <td class='light_border'>[% date.format(ctx.parse_datetime(ctx.user.create_date), DATE_FORMAT) %]</td>
                 <td></td>
             </tr>
-            <tr>
+			<tr>
                 <td class='color_4 light_border'>[% l("Account Expiration Date") %]</td>
                 <td class='light_border'>
-                    [%- IF date.format(ctx.parse_datetime(ctx.user.expire_date), '%s') < date.format(date.now , '%s'); -%]
+				    [%- IF date.format(ctx.parse_datetime(ctx.user.expire_date), '%s') < date.format(date.now , '%s'); -%]
                         <span class="alert" style="font-weight:bold;">[% date.format(ctx.parse_datetime(ctx.user.expire_date), DATE_FORMAT) %]</span>
-                        </td>
-                    [% ELSE %]
-                        [% date.format(ctx.parse_datetime(ctx.user.expire_date), DATE_FORMAT) %]
-                    [% END %]
-                </td>
-                <td></td>
+						</td>
+						<td><span class="alert" style="font-weight:bold;">Please visit a PINES library to renew your card.</span></td>
+					[% ELSE %]
+					    [% date.format(ctx.parse_datetime(ctx.user.expire_date), DATE_FORMAT) %]
+						</td>
+						<td></td>
+					[% END %]
             </tr>
         </tbody>
     </table><br />
     <hr class='opac-auto-013' color="#DCDBDB" />
     <br />
 
-    <table width='100%' class='light_border data_grid' title="[% l('Addresses') %]">
+    <table class='light_border data_grid' title="[% l('Addresses') %]" style="width:100%;max-width:600px;">
         <thead>
             <tr>
                 <td><strong>[% l("Addresses") %]</strong></td>
-                <td><strong>[% l("Pending Addresses") %]</strong></td>
+                <!--<td><strong>[% l("Pending Addresses") %]</strong></td> -->
             </tr>
         </thead>
         <tbody>
@@ -153,7 +154,7 @@
             <tr>
                 <td>
                     <!-- read-only address display -->
-                    <table class='light_border' title="[% l('Active Addresses') %]">
+                    <table class='light_border' title="[% l('Active Addresses') %]" width="100%">
                         <tr><td>[% l("Address Type") %]</td><td>[% addr.address_type | html %]</td></tr>
                         <tr><td>[% l("Street") %]</td><td>[% addr.street1 | html %]</td></tr>
                         <tr><td>[% l("Street") %]</td><td>[% addr.street2 | html %]</td></tr>
@@ -174,7 +175,7 @@
                 </td>
 
                 <!-- pending address form -->
-                [% IF pending_addr OR edit_addr_id == cur_id;
+				[% IF pending_addr OR edit_addr_id == cur_id;
                     update_addr = pending_addr || addr %]
                 <td>
                     <form method='post'>
@@ -214,7 +215,8 @@
                         </table>
                     </form>
                 </td>
-                [% END %] <!-- if pending_addr -->
+                [% END %] 
+				<!-- if pending_addr -->
             </tr>
             [% END %]
         </tbody>
diff --git a/Open-ILS/src/templates/opac/myopac/prefs_my_lists.tt2 b/Open-ILS/src/templates/opac/myopac/prefs_my_lists.tt2
index a95ab7cc53..68d901385b 100644
--- a/Open-ILS/src/templates/opac/myopac/prefs_my_lists.tt2
+++ b/Open-ILS/src/templates/opac/myopac/prefs_my_lists.tt2
@@ -6,8 +6,11 @@
 
     <h3 class="sr-only">[% l('List Preferences') %]</h3>
     <form method='post'>
+	   <p style="width:100%;max-width:600px;">Lists allow you to keep track of books you'd like to read in the future, 
+	recommendations you'd like to share with other people, and more. 
+	<a href="http://pines.georgialibraries.org/catalog-help#my_list">Learn more about using lists.</a></p>
 
-       <table class="full-width data_grid" id="acct_search_main"
+       <table class="full-width data_grid" id="acct_search_main"   style="width:100%;max-width:600px;"
             title="[% l('List Preferences') %]">
             <tbody>
 
@@ -21,7 +24,7 @@
 
                 [%- setting = 'opac.lists_per_page' -%]
                 <tr >
-                    <td width='20%'><label for='[% setting %]'>[%l("Lists per page") %]</label></td>
+                    <td style="width:150px;"><label for='[% setting %]'>[%l("Lists per page") %]</label></td>
                     <td>
                         <select id='[% setting %]' name='[% setting %]'>
                             [%  UNLESS ctx.user_setting_map.$setting;
@@ -33,15 +36,15 @@
                                         selected='selected'[% END %]>[% val | html %]</option>
                             [% END %]
                         </select>
-                        <img alt="[% l('List Items Help') %]"
+                        <!--<img alt="[% l('List Items Help') %]"
                             src="[% ctx.media_prefix %]/images/question-mark.png"
                             title="[% l('The number of lists displayed per page.') %]"
-                        />
+                        />-->
                     </td>
                 </tr>
                 [%- setting = 'opac.list_items_per_page' -%]
                 <tr >
-                    <td width='20%'><label for='[% setting %]'>[%l("List items per page") %]</label></td>
+                    <td><label for='[% setting %]'>[%l("List items per page") %]</label></td>
                     <td>
                         <select id='[% setting %]' name='[% setting %]'>
                             [%  UNLESS ctx.user_setting_map.$setting;
@@ -53,15 +56,17 @@
                                         selected='selected'[% END %]>[% val | html %]</option>
                             [% END %]
                         </select>
-                        <img alt="[% l('List Items Help') %]"
+                        <!--<img alt="[% l('List Items Help') %]"
                             src="[% ctx.media_prefix %]/images/question-mark.png"
                             title="[% l('The number of list items displayed per page when viewing a selected list.') %]"
-                        />
+                        />-->
                     </td>
                 </tr>
             </tbody>
         </table>
-        <input type="submit" value="[% l('Save') %]" class="opac-button"/>
+    <div style="width:100%;max-width:600px;text-align:right;">
+	    <input type='submit' value="[% l('Save') %]" alt="[% l('Save') %]" class="opac-button" style="padding-left:20px;padding-right:20px;" />
+    </div>
     </form>
     [% INCLUDE "opac/parts/myopac/prefs_hints.tt2" %]
 [% END %]
diff --git a/Open-ILS/src/templates/opac/myopac/prefs_notify.tt2 b/Open-ILS/src/templates/opac/myopac/prefs_notify.tt2
index 47b7f72677..2422d69320 100644
--- a/Open-ILS/src/templates/opac/myopac/prefs_notify.tt2
+++ b/Open-ILS/src/templates/opac/myopac/prefs_notify.tt2
@@ -10,7 +10,7 @@
         [% IF ctx.user_setting_map.$setting; %] value='[% ctx.user_setting_map.$setting | html %]' [% END %]/>
 
     <table class="full-width data_grid" id="acct_search_main" 
-        title="[% l('Notification Preferences') %]">
+        title="[% l('Notification Preferences') %]" style="width:100%;max-width:900px;">
         <tbody>
 
             [% IF ctx.updated_user_settings %]
@@ -28,7 +28,7 @@
                     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?') %]
+                [% email_label = l('Notify by Email when a hold is ready for pickup?') %]
 
                 <td><label for='[% setting %].email'>[% email_label %]</label></td>
                 <td>
@@ -41,7 +41,7 @@
                 setting = 'opac.hold_notify'; 
             -%]
             <tr>
-                [% phone_label = l('Notify by Phone by default when a hold is ready for pickup?') %]
+                [% phone_label = l('Notify by Phone when a hold is ready for pickup?') %]
                 <td><label for='[% setting %].phone'>[% phone_label %]</label></td>
                 <td>
                     <input id='[% setting %].phone' name='[% setting %].phone' 
@@ -51,7 +51,7 @@
             </tr>
             [% setting = 'opac.default_phone' %]
             <tr>
-                <td><label for='[% setting %]'>[% l('Default Phone Number') %]</label></td>
+                <td><label for='[% setting %]'> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; [% l('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 %]/>
@@ -62,7 +62,7 @@
                setting = 'opac.hold_notify';
             -%]
             <tr>
-                [% sms_label = l('Notify by Text by default when a hold is ready for pickup?') %]
+                [% sms_label = l('Notify by Text when a hold is ready for pickup?') %]
                 <td><label for='[% setting %].sms'>[% sms_label %]</label></td>
                 <td>
                     <input id='[% setting %].sms' name='[% setting %].sms' 
@@ -71,16 +71,16 @@
                 </td>
             </tr>
             <tr>
-                <td>[% l('Default Mobile Carrier') %]</td>
+                <td> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; [% l('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><label for='[% setting %]'> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; [% l('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 #, no spaces, no dashes'); %]
+                    <br/><i>[% l('Hint: Use the full 10 digits of your phone #, no spaces, no dashes'); %]</i>
                 </td>
             </tr>
             [% END %]
@@ -97,9 +97,12 @@
             </tr>
             [% END %]
         </tbody>
-    </table>
-
-    <input type='submit' value="[% l('Save') %]" class="opac-button" />
+      </table>
+    </div>
+    [% END %]
+    <div style="width:100%;max-width:900px;text-align:right;">
+	    <input type='submit' value="[% l('Save') %]" alt="[% l('Save') %]" class="opac-button" style="padding-left:20px;padding-right:20px;" />
+    </div>
 </form>
 [% END %]
 
diff --git a/Open-ILS/src/templates/opac/myopac/prefs_settings.tt2 b/Open-ILS/src/templates/opac/myopac/prefs_settings.tt2
index 2e0f47024d..8c50b48dbe 100644
--- a/Open-ILS/src/templates/opac/myopac/prefs_settings.tt2
+++ b/Open-ILS/src/templates/opac/myopac/prefs_settings.tt2
@@ -9,7 +9,7 @@
     <form method='post'>
 
        <table class="full-width data_grid" id="acct_search_main"
-            title="[% l('Search and History Preferences') %]">
+            title="[% l('Search and History Preferences') %]" style="width:100%;max-width:900px;">
             <tbody>
 
                 [% IF ctx.confirm_history_delete %]
@@ -33,7 +33,7 @@
 
                 [%- setting = 'opac.hits_per_page' -%]
                 <tr >
-                    <td width='20%'><label for='[% setting %]'>[% l("Search hits per page") %]</label></td>
+                    <td><label for='[% setting %]'>[% l("Search hits per page") %]</label></td>
                     <td>
                         <select id='[% setting %]' name='[% setting %]'>
                             [%  UNLESS ctx.user_setting_map.$setting;
@@ -45,14 +45,14 @@
                                         selected='selected'[% END %]>[% val | html %]</option>
                             [% END %]
                         </select>
-                        <a href="#"><img alt="[% l('Search Hits Help') %]" 
+                        <!-- <a href="#"><img alt="[% l('Search Hits Help') %]" 
                             src="[% ctx.media_prefix %]/images/question-mark.png"
-                        /></a>
+                        /></a>-->
                     </td>
                 </tr>
                 [%- setting = 'opac.default_search_location'; -%]
                 <tr >
-                    <td width='20%'><label for='[% setting %]'>[% l("Preferred search location") %]</label></td>
+                    <td><label for='[% setting %]'>[% l("Preferred search location") %]</label></td>
                     <td>
                         [%- thang = ctx.user.home_ou.id;
                             IF ctx.user_setting_map.$setting;
@@ -65,7 +65,7 @@
                 </tr>
                 [%- setting = 'opac.default_pickup_location'; -%]
                 <tr>
-                    <td width='20%'><label for='[% setting %]'>[% l("Preferred pickup location") %]</label></td>
+                    <td><label for='[% setting %]'>[% l("Preferred pickup location") %]</label></td>
                     <td>
                         [%- thang = ctx.user.home_ou.id;
                             IF ctx.user_setting_map.$setting;
@@ -136,9 +136,9 @@
 
             </tbody>
         </table>
-        [% IF !ctx.confirm_history_delete %]
-        <input type="submit" value="[% l('Save') %]" class="opac-button"/>
-        [% END %]
+    <div style="width:100%;max-width:800px;text-align:right;">
+	    <input type='submit' value="[% l('Save') %]" alt="[% l('Save') %]" class="opac-button" style="padding-left:20px;padding-right:20px;" />
+    </div>
     </form>
     [% INCLUDE "opac/parts/myopac/prefs_hints.tt2" %]
 [% END %]
diff --git a/Open-ILS/src/templates/opac/myopac/update_email.tt2 b/Open-ILS/src/templates/opac/myopac/update_email.tt2
index a729953248..31b557fa54 100644
--- a/Open-ILS/src/templates/opac/myopac/update_email.tt2
+++ b/Open-ILS/src/templates/opac/myopac/update_email.tt2
@@ -30,7 +30,9 @@
         <tr><td>[% l('Current Email') %]</td><td>[% ctx.user.email | html %]</td></tr>
         <tr><td>[% l('Current Password') %]</td><td><input type='password' name='current_pw'/></td></tr>
         <tr><td>[% l('New Email') %]</td><td><input type='text' name='email' value='[% ctx.invalid_email | html %]'/></td></tr>
-        <tr><td colspan='2' align='center'><input value="[% l('Submit') %]" type='submit'/></td></tr>
+        <tr><td colspan='2' align='right' style="text-align:right;">
+		    <input type='submit' value="[% l('Save') %]" alt="[% l('Save') %]" class="opac-button" style="padding-left:20px;padding-right:20px;" />
+        </td></tr>
     </table>
 </form>
 
diff --git a/Open-ILS/src/templates/opac/myopac/update_password.tt2 b/Open-ILS/src/templates/opac/myopac/update_password.tt2
index 48f490f109..6d4c419ed7 100644
--- a/Open-ILS/src/templates/opac/myopac/update_password.tt2
+++ b/Open-ILS/src/templates/opac/myopac/update_password.tt2
@@ -33,8 +33,10 @@
         <tr><td>[% l('Current Password') %]</td><td><input type='password' name='current_pw'/></td></tr>
         <tr><td>[% l('New Password') %]</td><td><input type='password' name='new_pw'/></td></tr>
         <tr><td>[% l('New Password Again') %]</td><td><input type='password' name='new_pw2'/></td></tr>
-	<tr><td>[% l(' Note: Passwords must be 7 characters (or more) in length and contain at least one number.') %]</td><td></td></tr>
-        <tr><td colspan='2' align='center'><input value="[% l('Submit') %]" type='submit'/></td></tr>
+	<!--<tr><td>[% l(' Note: Passwords must be 7 characters (or more) in length and contain at least one number.') %]</td><td></td></tr>-->
+        <tr><td colspan='2' align='right' style="text-align:right;">
+		    <input type='submit' value="[% l('Save') %]" alt="[% l('Save') %]" class="opac-button" style="padding-left:20px;padding-right:20px;" />
+        </td></tr>
     </table>
 </form>
 
diff --git a/Open-ILS/src/templates/opac/myopac/update_username.tt2 b/Open-ILS/src/templates/opac/myopac/update_username.tt2
index 5c32c24e0b..fa7d703093 100644
--- a/Open-ILS/src/templates/opac/myopac/update_username.tt2
+++ b/Open-ILS/src/templates/opac/myopac/update_username.tt2
@@ -32,7 +32,9 @@
         <tr><td>[% l('Current Username') %]</td><td>[% ctx.user.usrname | html %]</td></tr>
         <tr><td>[% l('Current Password') %]</td><td><input type='password' name='current_pw'/></td></tr>
         <tr><td>[% l('New Username') %]</td><td><input type='text' name='username' value='[% ctx.invalid_username | html %]'/></td></tr>
-        <tr><td colspan='2' align='center'><input value="[% l('Submit') %]" type='submit'/></td></tr>
+        <tr><td colspan='2' align='right' style="text-align:right;">
+		    <input type='submit' value="[% l('Save') %]" alt="[% l('Save') %]" class="opac-button" style="padding-left:20px;padding-right:20px;" />
+        </td></tr>
     </table>
 </form>
 
diff --git a/Open-ILS/src/templates/opac/parts/advanced/expert.tt2 b/Open-ILS/src/templates/opac/parts/advanced/expert.tt2
index c883336fe8..a57e1a8bfa 100644
--- a/Open-ILS/src/templates/opac/parts/advanced/expert.tt2
+++ b/Open-ILS/src/templates/opac/parts/advanced/expert.tt2
@@ -1,5 +1,5 @@
 <form action="[% ctx.opac_root %]/results" method="get">
-    <div class="header_middle">[% l("Expert Search") %]</div>
+    <div class="header_middle">[% l("MARC Record Search") %]</div>
     <input type="hidden" name="_special" value="1" />
     <input id="detail" type="hidden" name="detail_record_view"
            value="[% show_detail_view %]"/>
@@ -37,7 +37,7 @@
             <tr>
                [%- lib_select_id = "expert_search_library"; -%]
                <td colspan="5" class="expert-search-row">
-                   <label for="[% lib_select_id %]"><strong>[% l("Search Library:") %]</strong>
+                   <label for="[% lib_select_id %]"><strong>[% l("Search within:") %]</strong>
                        [%- PROCESS "opac/parts/org_selector.tt2";
                            INCLUDE build_org_selector id=lib_select_id show_loc_groups=1 
                        %]
diff --git a/Open-ILS/src/templates/opac/parts/advanced/numeric.tt2 b/Open-ILS/src/templates/opac/parts/advanced/numeric.tt2
index 8aebe001b8..16291646c5 100644
--- a/Open-ILS/src/templates/opac/parts/advanced/numeric.tt2
+++ b/Open-ILS/src/templates/opac/parts/advanced/numeric.tt2
@@ -5,7 +5,7 @@
     <input id="detail" type="hidden" name="detail_record_view"
            value="[% show_detail_view %]"/>
     <div id='adv_numeric_block'>
-            <label for="numeric_qtype"><strong>[% l("Field:") %]</strong></label>
+            <label for="numeric_qtype"><strong>[% l("Search by:") %]</strong></label>
                 <select id="numeric_qtype" name="qtype">
                     <!-- TODO: Pull labels from config.metabib_field.label -->
                     <option value="identifier|isbn">[% l('ISBN') %]</option>
@@ -16,11 +16,11 @@
                     <option value="identifier|tcn">[% l('TCN') %]</option>
                     <option value="item_barcode">[% l('Item Barcode') %]</option>
                 </select>
-	
+	            <label for="query"><strong>[% l("For:") %]</strong></label>
                 <input type="text" name="query" size="16" autofocus placeholder='[% l("Identifier") %]' />
-	    <br/>
+	    <br/> <br/>
             [%- lib_select_id="numeric_search_library" -%]
-            <label for="[% lib_select_id %]"><strong>[% l("Search Library:") %]</strong>
+            <label for="[% lib_select_id %]"><strong>[% l("Search within:") %]</strong>
                   [% PROCESS "opac/parts/org_selector.tt2";
                      INCLUDE build_org_selector id=lib_select_id show_loc_groups=1
                   %]
diff --git a/Open-ILS/src/templates/opac/parts/advanced/search.tt2 b/Open-ILS/src/templates/opac/parts/advanced/search.tt2
index dc650a1c7b..8f98f201aa 100644
--- a/Open-ILS/src/templates/opac/parts/advanced/search.tt2
+++ b/Open-ILS/src/templates/opac/parts/advanced/search.tt2
@@ -12,7 +12,7 @@
                     <tr>
                         <td>
                             <div class="header_middle" id="adv_search_input">
-                                [% l("Search Input") %]
+                                [% l("Enter Search Words:") %]
                             </div>
                         </td>
                     </tr>
@@ -22,7 +22,7 @@
                     <!-- add a new row -->
                     <tr id='adv_global_addrow'>
                         <td align='left'>
-                            <a href="javascript:;" id="myopac_new_global_row" onclick='addSearchRow();'>[% l('Add Search Row') %]</a>
+                            <a href="javascript:;" id="myopac_new_global_row" onclick='addSearchRow();'>[% l('Add Another Search Row') %]</a>
                         </td>
                     </tr>
                 </tbody>
@@ -30,24 +30,12 @@
         </div>
     </div>
 
-    <div id='adv_search_submit'>
-        <input type="hidden" name="_adv" value="1" />
-        <input id="detail" type="hidden" name="detail_record_view"
-               value="[% show_detail_view %]"/>
-        <span>
-            <input id='search-submit-go' type="submit" value="[% l('Search') %]" title="[% l('Search') %]" class="opac-button"
-                onclick='setTimeout(function(){$("search-submit-spinner").className=""; $("search-submit-go").className="hidden"}, 2000)'/>
-            <img id='search-submit-spinner' src='/opac/images/progressbar_green.gif'
-                class='hidden' alt="[% l('Search in progress icon') %]"/>
-        </span>
 
-        <a href="[% mkurl(ctx.opac_root _ '/advanced', {$loc_name => loc_value}, 1) %]"
-            class="opac-button">[% l('Clear Form') %]</a>
-    </div>
-
-    <div id='adv_search_filters'>
-        <div class="header_middle">[% l('Search Filters') %]</div>
+	<div id='adv_search_filters' style="margin-top:30px;">
+        <div class="header_middle">[% l('Choose Search Limits:') %]</div>
+		<p style="font-style:italic;margin-bottom:0px;">Tip: Ctrl-Click to select multiple lines or to deselect lines (Shift-Click for Macs).</p>
 
+		
 [%
     in_row = 0;
     FOR adv_chunk IN search.adv_config;
@@ -58,24 +46,20 @@
 [%
         END; %]
             <div class='adv_filter_block_item'>
-            <div valign='top'[% IF adv_chunk.js_only %]
+            <div valign='top'[% IF adv_chunk.js_only %] 
                 id='adv_chunk_[% adv_chunk.adv_special %]'
                 class='hidden'[% END %]>
                 <strong><label for="[% adv_chunk.id %]">
                   [% adv_chunk.adv_label %] </label></strong><br />
+				  
 [%
         IF adv_chunk.adv_special;
             SWITCH adv_chunk.adv_special;
                 CASE "lib_selector";
                     PROCESS "opac/parts/org_selector.tt2";
                         INCLUDE build_org_selector show_loc_groups=1 id=adv_chunk.id %]
-                            <div class="adv_search_available">
-                                <input type='checkbox' name="modifier"
-                                    value="available"[% CGI.param('modifier').grep('available').size ? ' checked="checked"' : '' %]
-                                    id='opac.result.limit2avail' />
-                                <label for='opac.result.limit2avail'>
-                                    [% l("Limit to Available") %]</label>
-                            </div>
+					<br/><i>Tip: Choosing a library will<br/>allow you to select a<br/>shelving location.</i><br/> <br/>
+                            
 [%
                 CASE "pub_year"; %]
                             <select name='pubdate'
@@ -95,8 +79,7 @@
                             [% IF !ctx.exclude_electronic_checkbox %]
                             <br/>
                             <div id='adv_special_block'>
-                            [% END %]
-                                <input title="[% l('Search date') %]"
+                                Year: <input title="[% l('Search date') %]" 
                                   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'
@@ -168,7 +151,43 @@
         END;
     END; %]
 
+    <!-- Moved 'Limit to Available' to its own block for clarity -->
+	    <div style="clear:left;">
+            <input type='checkbox' name="modifier"
+                value="available"[% CGI.param('modifier').grep('available').size ? ' checked="checked"' : '' %]
+                id='opac.result.limit2avail' />
+            <label for='opac.result.limit2avail'><strong>
+            [% l("Limit Search Results to Currently Available Items") %]</strong></label>
+        </div>	
+
+	<!-- Moved 'Group Formats' to its own block for clarity -->
+	[% IF NOT metarecords.disabled %]
+        <div>
+            <input type='checkbox' name="modifier" value="metabib"
+                [%- CGI.param('modifier').grep('metabib').size ? 
+                ' checked="checked"' : '' %]
+                id='opac.result.ismetabib' />
+            <label for='opac.result.ismetabib'><strong>
+                [% l("Group Search Results by Format and Edition") %]</label></strong>
         </div>
-    </div>
+    [% END %]
+	
+
+	    </div>
+	</div>
 </div>
+
+<div id='adv_search_submit' style="clear:both;text-align:center;width:100%;max-width:700px;">
+        <input type="hidden" name="_adv" value="1" />
+		<a href="[% mkurl(ctx.opac_root _ '/advanced', {$loc_name => loc_value}, 1) %]"
+            class="opac-button" style="padding:10px;background-color:#669999;">[% l('Clear Form') %]</a>
+        <span>
+            <input id='search-submit-go' type="submit" value="[% l('Submit Search') %]" title="[% l('Search') %]" 
+			class="opac-button" style="padding:10px 50px 10px 50px;"
+                onclick='setTimeout(function(){$("search-submit-spinner").className=""; $("search-submit-go").className="hidden"}, 2000)'/>
+            <img id='search-submit-spinner' src='/opac/images/progressbar_green.gif' 
+                class='hidden' alt="[% l('Search in progress icon') %]"/>
+        </span>
+
+    </div>
 </form>
diff --git a/Open-ILS/src/templates/opac/parts/coded_value_selector.tt2 b/Open-ILS/src/templates/opac/parts/coded_value_selector.tt2
index c8eb62e71c..52e72ba261 100644
--- a/Open-ILS/src/templates/opac/parts/coded_value_selector.tt2
+++ b/Open-ILS/src/templates/opac/parts/coded_value_selector.tt2
@@ -19,7 +19,7 @@
 <select id='[% id %]' name='[% name %]'[%
     multiple ? ' multiple="multiple"' : '';
     size ? (' size="' _ size _ '"') : '';
-%] title="[% filter_label || l('Select item type:') %]">
+%] title="[% filter_label || l('Select item type:') %]" style="padding:3px;">
 [% IF none_ok %]
     <option value=''>[% none_label ? none_label : l('-- Any --') %]</option>
 [% END;
diff --git a/Open-ILS/src/templates/opac/parts/footer.tt2 b/Open-ILS/src/templates/opac/parts/footer.tt2
index 42bdc4d32c..2758b6d2c8 100644
--- a/Open-ILS/src/templates/opac/parts/footer.tt2
+++ b/Open-ILS/src/templates/opac/parts/footer.tt2
@@ -1,19 +1,21 @@
 [% IF !ctx.is_staff %]
 <div id="footer-wrap">
 <div id="footer">
+    <!-- <a href="/eg/opac/home">[% l("Home") %]</a> &nbsp;|&nbsp; -->
     [% IF ctx.get_org_setting(
         ctx.physical_loc || ctx.aou_tree.id, 'opac.allow_pending_user') %]
-    <a href="[% mkurl(ctx.opac_root _ '/register') %]">[% 
-        l('Request Library Card') %]</a> &nbsp;|&nbsp;
-    [% ELSE %]
-    <a href="/eg/opac/home">[% l("Home") %]</a> &nbsp;|&nbsp;
+    <a href="[% mkurl(ctx.opac_root _ '/register') %]">
+	    <img alt="[% l('Apply for a Card') %]" src="[% ctx.media_prefix %]/images/navbar-card.png" />
+		[% l('Apply for a PINES Library Card') %]</a> &nbsp; &nbsp; &nbsp; &nbsp;
     [% END %]
-    <a href="/eg/kpac/home">[% l("Kids' Catalog") %]</a> &nbsp;|&nbsp;
-    <a href="http://www.georgialibraries.org/lib/directories/pineslibdir.html">[% l('Find a Library Near Me') %]</a> &nbsp;|&nbsp;
-    <a href="http://pines.georgialibraries.org/catalog-help">[% l('Help') %]</a> &nbsp;|&nbsp;
-    <a href="http://pines.georgialibraries.org/about/">[% l('About PINES') %]</a> &nbsp;|&nbsp;
-    [% gurl = mkurl(ctx.opac_root _ '/galileo', {}, 1) %]
-    <a href="[% gurl %]"> [% l('GALILEO') %] </a>
+    <!-- <a href="/eg/kpac/home">[% l("Kids' Catalog") %]</a> &nbsp;|&nbsp; -->
+    <!-- <a href="http://www.georgialibraries.org/lib/directories/pineslibdir.html">[% l('Find a Library Near Me') %]</a> &nbsp;|&nbsp;-->
+    <!-- <a href="http://pines.georgialibraries.org/catalog-help">[% l('Help') %]</a> &nbsp;|&nbsp; -->
+    <a href="http://pines.georgialibraries.org/about">
+	    <img alt="[% l('About PINES') %]" src="[% ctx.media_prefix %]/images/navbar-about.png" />[%- l('Learn More About PINES') %]</a> <!-- &nbsp;|&nbsp; -->
+    <!-- <a href="/">[% l('Dynamic catalog') -%]</a> &nbsp;|&nbsp; -->
+    <!-- [% gurl = mkurl(ctx.opac_root _ '/galileo', {}, 1) %]
+    <a href="[% gurl %]"> [% l('GALILEO') %] </a> -->
     [% IF ctx.timing %]
     <div id="timing">
         [% FOR event IN ctx.timing %]
@@ -29,7 +31,7 @@
         [% l('Powered by') %]
         <a href="http://evergreen-ils.org">
             <img src="[% ctx.media_prefix %]/opac/images/eg_tiny_logo.png"
-                style="border:none; width: 94px; height: 16px;"
+                style="border:none; width: 94px; height: 18px;"
                 alt="[% l('Evergreen') %]"
             />
         </a>
diff --git a/Open-ILS/src/templates/opac/parts/hold_error_messages.tt2 b/Open-ILS/src/templates/opac/parts/hold_error_messages.tt2
index 58f468e5f8..33ea33c920 100644
--- a/Open-ILS/src/templates/opac/parts/hold_error_messages.tt2
+++ b/Open-ILS/src/templates/opac/parts/hold_error_messages.tt2
@@ -9,25 +9,25 @@
 
     FAIL_PART_MSG_MAP = {
         "actor.usr.barred" => l("There appears to be a problem with your library account.  Please contact your local library for assistance."),
-        "asset.copy.circulate" => l("The title you have requested is not allowed to circulate.  Please contact your local library for assistance."),
-        "asset.copy_location.circulate" => l("The title you have requested is not allowed to circulate.  Please contact your local library for assistance."),
-        "asset.copy.status" => l("The title you have requested is not available at this time.  Please contact your local library for assistance."),
-        "circ.holds.target_skip_me" => l("The title you have requested is not available at this time.  Please contact your local library for assistance."),
+        "asset.copy.circulate" => l("This item cannot be checked out.  Please contact your local library for assistance."),
+        "asset.copy_location.circulate" => l("This item cannot be checked out.  Please contact your local library for assistance."),
+        "asset.copy.status" => l("This item is not available at this time.  Please contact your local library for assistance."),
+        "circ.holds.target_skip_me" => l("This item is not available at this time.  Please contact your local library for assistance."),
         "config.circ_matrix_circ_mod_test" => l("There are too many items of this type checked out on your account to be able to place this hold request.  Please contact your local library for assistance."),
-        "config.circ_matrix_test.available_copy_hold_ratio" => l("The title you have requested is not available at this time.  Please contact your local library for assistance."),
-        "config.circ_matrix_test.circulate" => l("The title you have requested is not available for hold requests.  Please contact your local library for assistance."),
-        "config.circ_matrix_test.total_copy_hold_ratio" => l("The title you have requested is not available at this time.  Please contact your local library for assistance."),
-        "config.hold_matrix_test.holdable" => l("The title you have requested is not available for hold requests.  Please contact your local library for assistance."),
-        "config.hold_matrix_test.max_holds" => l("Your account has reached the maximum number of hold requests.  Please contact your local library for assistance."),
-        "config.rule_age_hold_protect.prox" => l("The title you have requested is not available for hold requests at this time.  Please contact your local library for assistance."),
-        "item.holdable" => l("The title you have requested is not available for hold requests.  Please contact your local library for assistance."),
-        "location.holdable" => l("The title you have requested is not available for hold requests.  Please contact your local library for assistance."),
-        "status.holdable" => l("The title you have requested is not available for hold requests.  Please contact your local library for assistance."),
-        "no_item" => l("The title you have requested is not available at this time.  Please contact your local library for assistance."),
-        "no_ultimate_items" => l("The title you have requested is not available at this time.  Please contact your local library for assistance."),
+        "config.circ_matrix_test.available_copy_hold_ratio" => l("This item is not available at this time.  Please contact your local library for assistance."),
+        "config.circ_matrix_test.circulate" => l("Holds cannot be placed on this item. Please contact your local library for assistance."),
+        "config.circ_matrix_test.total_copy_hold_ratio" => l("This item is not available at this time.  Please contact your local library for assistance."),
+        "config.hold_matrix_test.holdable" => l("Holds cannot be placed on this item.  Please contact your local library for assistance."),
+        "config.hold_matrix_test.max_holds" => l("Your account has reached the maximum number of hold requests allowed at once. Please contact your local library for assistance."),
+        "config.rule_age_hold_protect.prox" => l("This is a new item that is not owned by your local library, so you will be unable to place a hold on it for 3-6 months. Please contact your local library for assistance."),
+        "item.holdable" => l("Holds cannot be placed on this item.  Please contact your local library for assistance."),
+        "location.holdable" => l("Holds cannot be placed on this item.  Please contact your local library for assistance."),
+        "status.holdable" => l("Holds cannot be placed on this item.  Please contact your local library for assistance."),
+        "no_item" => l("There are no copies of this item available at this time.  Please contact your local library for assistance."),
+        "no_ultimate_items" => l("This item is not available at this time.  Please contact your local library for assistance."),
         "no_matchpoint" => l("There was a problem processing this hold request.  Please contact your local library for assistance."),
         "no_user" => l("There was a problem processing this hold request.  Please contact your local library for assistance."),
-        "transit_range" => l("The title you have requested is not available for hold requests at your library.  Please contact your local library for assistance.")
+        "transit_range" => l("The title you have requested is not available for hold requests from your local library.  Please contact your local library for assistance.")
     };
 
 
@@ -37,6 +37,6 @@
     # Wait until these are used to pass them through l() for i18n.
 
     EVENT_MSG_MAP = {
-        "PATRON_EXCEEDS_FINES" => l("There appears to be a problem with your library account.  Please contact your local library for assistance.")
+        "PATRON_EXCEEDS_FINES" => l("You will be unable to place holds until you have reduced the fines on your account.  Please contact your local library for assistance.")
     };
 %]
diff --git a/Open-ILS/src/templates/opac/parts/homesearch.tt2 b/Open-ILS/src/templates/opac/parts/homesearch.tt2
index 6fce85fd97..85942281f9 100644
--- a/Open-ILS/src/templates/opac/parts/homesearch.tt2
+++ b/Open-ILS/src/templates/opac/parts/homesearch.tt2
@@ -1,4 +1,19 @@
-<div id="homesearch_main_logo">
-    <img src="[% ctx.media_prefix %]/opac/images/main_logo.png" 
-        [% img_alt(l('Evergreen Logo')) %]/>
+<div id="homesearch_main_logo" style="width:800px;float:left;text-align:center;">
+    <!-- <img src="[% ctx.media_prefix %]/opac/images/main_logo.png" 
+        [% img_alt(l('Evergreen Logo')) %]/> -->
+		
+	<div style="border:0px;text-align:center;height:300px;width:300px;float:left;margin-left:100px;">
+	    <a href="http://georgialibraries.org/directories/pineslibdir.php" target="_blank" style="text-decoration:none;">
+		    <img alt="[% l('Library Locations') %]" src="[% ctx.media_prefix %]/images/pines-map.gif" style="height:150px;" /><br/>
+			<span style="font-size:125%;font-weight:bold;">Find a PINES Library</span>
+		</a><br/>
+		<p>Your PINES card gives you access to<br/>more than 275 libraries across Georgia!</p>
+    </div>
+	<div style="border:0px;text-align:center;height:300px;width:300px;float:left;margin-left:50px;">
+	    <a href="http://pines.georgialibraries.org/catalog-help" target="_blank" style="text-decoration:none;">
+		    <img alt="[% l('Help') %]" src="[% ctx.media_prefix %]/images/home-largehelp.png" style="height:150px;" /><br/>
+			<span style="font-size:125%;font-weight:bold;">PINES Catalog Help</span>
+		</a><br/>
+		<p>Tips on searching the catalog, placing holds, and other frequently asked questions.</p>
+    </div>
 </div>
diff --git a/Open-ILS/src/templates/opac/parts/login/form.tt2 b/Open-ILS/src/templates/opac/parts/login/form.tt2
index 165785527f..89f39069b7 100644
--- a/Open-ILS/src/templates/opac/parts/login/form.tt2
+++ b/Open-ILS/src/templates/opac/parts/login/form.tt2
@@ -14,28 +14,28 @@
 [% END %]
 
 <div id='login-form-box' class='login_boxes left_brain' style='float:left'>
-    <h1>[% l('Log in to Your Account') %]</h1>
-    [% l('Please enter the following information:') %]
+	<div class="header_middle" style="margin-bottom:30px;">[% l('PINES Account Login') %]</div>
+
     <form method='post'>
         <div style="float: left; padding-bottom: 10px; margin-right: 40px;">
-            <label for='username_field' class="lbl1" >[% l('Library Card Number or Username') %]</label>
+            <label for='username_field' style="font-weight:bold;font-size:1.2em;">[% l('Library Card Number') %]</label>
             <div class="input_bg">
-                <input type='text' id="username_field" name="username" autofocus />
+                <input type='text' id="username_field" name="username" autofocus style="width:250px;" />
             </div>
-            <div class="lbl2">[% l('Please include leading zeros.') %]</div>
-            <div class="lbl2">[% l('Example: 0026626051') %]</div>
+            <div style="font-size:normal;padding:15px 0px 5px 12px;width:300px;font-style:italic;">[% l('Enter your PINES library card number. Example: 220110026626051') %]
+			<br/>[% l('If you have set up a user name, you may enter that instead of the card number.') %]</div>
         </div>
         <div style="float: left;">
-            <label for="password_field" class="lbl1" >[% l('PIN Number or Password') %]</label>
+            <label for="password_field" style="font-weight:bold;font-size:1.2em;">[% l('Password') %]</label>
             <div class="input_bg">
-                <input id="password_field" name="password" type="password" />
+                <input id="password_field" name="password" type="password" style="width:250px;" />
             </div>
             [% INCLUDE "opac/parts/login/password_hint.tt2" %]
             [% IF reset_password == 'true' %]
             <a style="font-size: 80%" href='[% mkurl(ctx.opac_root _ '/password_reset', {}, 1) %]'>[% l('Forgot your password?') %]</a>
             [% END %]
         </div>
-        <div style="clear: both; padding-top: 15px;">
+        <div style="clear: both; padding-top: 15px;padding-left: 15px;">
         [%
             redirect = CGI.param('redirect_to');
             # Don't use referer unless we got here from elsewhere within the TPAC
@@ -50,8 +50,8 @@
                 redirect = redirect  | replace('^http:', 'https:');
             %]
             <input type='hidden' name='redirect_to' value='[% redirect %]'/>
-            <input type="checkbox" name="persist" id="login_persist" /><label for="login_persist"> [% l('Stay logged in?') %]</label>
-            <input type="submit" value="[% l('Log in') %]" alt="[% l('Log in') %]" class="opac-button" />
+            <input type="checkbox" name="persist" id="login_persist"/><label for="login_persist" style="font-weight:bold;"> [% l('Stay logged in?') %]</label>
+            <input type="submit" value="[% l('Log in') %]" alt="[% l('Log in') %]" class="opac-button" style="padding-left:20px;padding-right:20px;" />
         </div>
     </form>
 </div>
diff --git a/Open-ILS/src/templates/opac/parts/login/help.tt2 b/Open-ILS/src/templates/opac/parts/login/help.tt2
index 2e0f4712e7..df472bdfc8 100644
--- a/Open-ILS/src/templates/opac/parts/login/help.tt2
+++ b/Open-ILS/src/templates/opac/parts/login/help.tt2
@@ -1,15 +1,23 @@
 <div class="login-help-box">
     <div class="login-help-button">
-        <a href="http://pines.georgialibraries.org/catalog-help" class="opac-button">[% l('Questions?') %]</a>
+        <a href="http://pines.georgialibraries.org/catalog-help#my_account" class="opac-button">[% l('Account Help') %]</a>
     </div>
     <div>
-        [% l('Visit our FAQs section for answers to common questions about how to use your account.') %]
+        <!--[% l('Learn more about using your PINES account.') %] -->
     </div>
 
+	<!--
     <div class="login-help-button">
         <div class="opac-multiline-button">
         <a href="http://pines.georgialibraries.org/pines-frequently-asked-questions">[% l('FAQs') %]</a>
-	</div>
+	    </div>
+    </div>
+	-->
+	
+	<div class="login-help-button">
+        <div class="opac-multiline-button">
+        <a href="http://www.georgialibraries.org/lib/directories/pineslibdir.html">[% l('Contact Your Library') %]</a>
+	    </div>
     </div>
 
 </div>
diff --git a/Open-ILS/src/templates/opac/parts/login/password_hint.tt2 b/Open-ILS/src/templates/opac/parts/login/password_hint.tt2
index 76b32ef0fc..f9552d30e0 100644
--- a/Open-ILS/src/templates/opac/parts/login/password_hint.tt2
+++ b/Open-ILS/src/templates/opac/parts/login/password_hint.tt2
@@ -1,3 +1,3 @@
-<div class="lbl2">
+<div style="font-size:normal;padding:15px 0px 5px 12px;width:300px;font-style:italic;">
 [%- l('If this is your first time logging in, please enter the 4 digit PIN you were assigned by library staff. Example: 0926'); %]
 </div>
diff --git a/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2 b/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2
index bf84e80294..13ca4ad3b6 100644
--- a/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2
+++ b/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2
@@ -32,20 +32,20 @@
         <div id="acct_sum_block">
             <div style="padding:10px 0px;">
             [%- IF date.format(ctx.parse_datetime(ctx.user.expire_date), '%s') < date.format(date.now , '%s');
-               fmt_expire_date = date.format(ctx.parse_datetime(ctx.user.expire_date), DATE_FORMAT);
+                fmt_expire_date = date.format(ctx.parse_datetime(ctx.user.expire_date), DATE_FORMAT);
             %]
-            <span class="alert">[% l("Your library card expired on [_1]. Please contact a librarian to resolve this issue.", fmt_expire_date) %]</span>
+			    <span class="alert" style="font-weight:bold;">[% l("Your library card expired on [_1]. Please visit a PINES library to renew your card.", fmt_expire_date) %]</span>
             [% END %]
             </div>
             <table class="acct_sum_table" title="[% l('Account Summary') %]">
-                <tr>
-                    <td>[% l("Account Expiration Date") %]</td>
-                    <td align="right">
-                        [% date.format(ctx.parse_datetime(ctx.user.expire_date), DATE_FORMAT) %]
-                    </td>
+			    <tr>
+				    <td>[% l("Account Expiration Date") %]</td>
+					<td align="right">
+						[% date.format(ctx.parse_datetime(ctx.user.expire_date), DATE_FORMAT) %]
+				    </td>
                 </tr>
                 <tr>
-                    <td>[% l("Items Currently Checked out ([_1])", ctx.user_stats.checkouts.total_out) %]</td>
+                    <td>[% l("Items Currently Checked Out ([_1])", ctx.user_stats.checkouts.total_out) %]</td>
                     <td align="right">
                         <a href="[% mkurl(ctx.opac_root _ '/myopac/circs') %]"
                             title="[% l('View My Checked Out Items') %]">
@@ -63,7 +63,7 @@
                     </td>
                 </tr>
                 <tr>
-                    <td>[% l('Items ready for pickup ([_1])', ctx.user_stats.holds.ready) %]</td>
+                    <td>[% l('Items Ready for Pickup ([_1])', ctx.user_stats.holds.ready) %]</td>
                     <td align="right">
                         <a href="[% mkurl(ctx.opac_root _ '/myopac/holds', {available => 1}) %]"
                             title="[% l('View My Holds Ready for Pickup') %]">
diff --git a/Open-ILS/src/templates/opac/parts/myopac/prefs_base.tt2 b/Open-ILS/src/templates/opac/parts/myopac/prefs_base.tt2
index c8c26f0e28..ca7185104c 100644
--- a/Open-ILS/src/templates/opac/parts/myopac/prefs_base.tt2
+++ b/Open-ILS/src/templates/opac/parts/myopac/prefs_base.tt2
@@ -4,7 +4,7 @@
         [% acct_prefs_pages = [
            {url => "prefs", name => l("Personal Information")},
            {url => "prefs_notify", name => l("Notification Preferences")},
-           {url => "prefs_settings", name => l("Search and History Preferences")},
+           {url => "prefs_settings", name => l("Search Preferences")},
            {url => "prefs_my_lists", name => l("My Lists Preferences")}
            ];
            skin_root = "../"
@@ -27,14 +27,16 @@
          </div>
     </div>
 
-    <div class="clear-both"></div> <br/>
+    <div class="clear-both"></div> 
 
-    <div class="header_middle">
+    <!--
+	<div class="header_middle">
         <span id="acct_prefs_header">[% l('Account Information and Preferences') %]</span>
         <span class="float-right"> 
-            <a class="hide_me" href="#">[% l('Export List') %]</a><!-- what does this do? -->
+            <a class="hide_me" href="#">[% l('Export List') %]</a>
         </span>
     </div>
+	-->
 
     [%- # Select box navigation for mobile view %]
     <div id="acct_prefs_select">
diff --git a/Open-ILS/src/templates/opac/parts/myopac/prefs_hints.tt2 b/Open-ILS/src/templates/opac/parts/myopac/prefs_hints.tt2
index dc90c92895..b42e83769e 100644
--- a/Open-ILS/src/templates/opac/parts/myopac/prefs_hints.tt2
+++ b/Open-ILS/src/templates/opac/parts/myopac/prefs_hints.tt2
@@ -1,5 +1,7 @@
+<!--
 <p>
     [% l('Ensure your account has a valid email address so that we can notify ' _
          'you about available holds, items that are about to be overdue, and ' _
          'overdue items!') %]
 </p>
+-->
\ No newline at end of file
diff --git a/Open-ILS/src/templates/opac/parts/org_selector.tt2 b/Open-ILS/src/templates/opac/parts/org_selector.tt2
index ab4d7c91f0..a97f94c1bf 100644
--- a/Open-ILS/src/templates/opac/parts/org_selector.tt2
+++ b/Open-ILS/src/templates/opac/parts/org_selector.tt2
@@ -29,7 +29,7 @@ BLOCK build_org_selector;
 
     <select [% IF id %] id='[% id %]' [% END -%]
             title='[% arialabel || l("Select Library") %]' 
-            name='[% name %]'>
+            name='[% name %]' style="padding:3px;">
     [%- 
         WHILE node_stack.size > 0; 
             node = node_stack.pop();
@@ -122,8 +122,11 @@ BLOCK build_org_selector;
                 porg = ctx.get_aou(porg.parent_ou);
             END;
 
-            pad_depth = pad_depth * 2;
+            pad_depth = pad_depth * 7;
             display_name = loc_grp ? loc_grp.name : org_unit.name %]
+			[% IF node_value == 1 %]
+			    [% display_name = "All PINES Libraries" %]
+		    [% END %]
 
             <option value='[% node_value %]' [% selected %] [% disabled %] [% css_class %]> 
                 [% '&nbsp;' FOR [0..pad_depth]; display_name | html %]
diff --git a/Open-ILS/src/templates/opac/parts/place_hold.tt2 b/Open-ILS/src/templates/opac/parts/place_hold.tt2
index c4f197d177..cc61bd422f 100644
--- a/Open-ILS/src/templates/opac/parts/place_hold.tt2
+++ b/Open-ILS/src/templates/opac/parts/place_hold.tt2
@@ -4,7 +4,9 @@
 %]
 
 <div id='holds_box' class='canvas' style='margin-top: 6px;'>
-    <h1>[% l('Place Hold') %]</h1>
+    <div class="header_middle">
+       <span class="float-left">[% l('Place Hold On:') %]</span>
+    </div>
 
     [% some_holds_allowed = -1 %]
 
@@ -129,8 +131,13 @@
                         <!-- Grab the bre_id so that we can restore it if user accidentally clicks advanced options -->
                            [% bre_id = hdata.target.id %]
                             <a  id='advanced_hold_link'
+<<<<<<< HEAD
                                 href="[% mkurl('', {hold_type => 'M', hold_target => hdata.record.metarecord.id, bre_id => bre_id}) %]">
                                 [% l('Advanced Hold Options') %]</a>
+=======
+                                href="[% mkurl('', {hold_type => 'M', hold_target => hdata.record.metarecord.id}) %]">
+                                <br/><b>[% l('Advanced Hold Options') %]</a></b>
+>>>>>>> a25fe69... OPAC UI modifications as per OPAC Working Group suggestions.
                         [% END %]
                         [% IF CGI.param('hold_type') == 'M' AND CGI.param('bre_id') %]
                             <input type="hidden" name="bre_id" value="[% CGI.param('bre_id') %]" />
@@ -179,14 +186,14 @@
                     <label for="email_notify">[% l('Yes, by Email') %]</label><br/>
                 <blockquote>
                     [% IF !ctx.user.email and !ctx.is_staff; l('No configured Email address. See "My Account" for setting your Email address.');
-                     ELSE; l('Email Address:') %] <span name="email_address">[% ctx.user.email %]</span>[% END %]
+                     ELSE; l('Email Address: ') %] <span name="email_address">[% ctx.user.email %]</span>[% END %]
                 </blockquote>
                 [%- IF allow_phone_notifications == 'true' %]
                 <input type="checkbox" id="phone_notify_checkbox" name="phone_notify_checkbox"
                     [% IF ctx.default_phone_notify %]checked="checked"[% END %]/>
                     <label for="phone_notify_checkbox">[% l('Yes, by Phone') %]</label><br/>
                 <blockquote>
-                    <label>[% l('Phone Number:') %]<input type="text" name="phone_notify" [% setting = 'opac.default_phone';
+                    <label>[% l('Phone Number: ') %]<input type="text" 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>
                 </blockquote>
@@ -196,15 +203,20 @@
                     [% IF ctx.default_sms_notify %]checked="checked"[% END %]/>
                     <label for="sms_notify_checkbox">[% l('Yes, by Text Messaging') %]</label><br/>
                 <blockquote>
-                    [% INCLUDE "opac/parts/sms_carrier_selector.tt2" %]<br/>
+                    [% INCLUDE "opac/parts/sms_carrier_selector.tt2" %]<br/> <br/>
                     [% INCLUDE "opac/parts/sms_number_textbox.tt2" %]<br/>
                 </blockquote>
                 [% END %]
             </blockquote>
         </p>
+
+	<div style="width:100%;max-width:600px;text-align:center;">
+        <input type="reset" name="cancel" onclick="javascript:history.go(-1);"
+            value="[% l('Cancel') %]" id="holds_cancel" 
+			class="opac-button" style="padding:10px;background-color:#669999;" />
         <input id="place_hold_submit" type="submit" name="submit" 
             value="[% l('Submit') %]" title="[% l('Submit') %]"
-            alt="[% l('Submit') %]" class="opac-button" />
+            alt="[% l('Submit') %]" class="opac-button" style="padding:10px 50px 10px 50px;" />
         [% END # some_holds_allowed %]
         <input type="reset" name="cancel" onclick="window.location='[% redirect | html %]'" value="[% l('Cancel') %]" id="holds_cancel" class="opac-button" />
     </form>
diff --git a/Open-ILS/src/templates/opac/parts/place_hold_result.tt2 b/Open-ILS/src/templates/opac/parts/place_hold_result.tt2
index 61ed68008c..0c1e4149b6 100644
--- a/Open-ILS/src/templates/opac/parts/place_hold_result.tt2
+++ b/Open-ILS/src/templates/opac/parts/place_hold_result.tt2
@@ -7,7 +7,10 @@
 <!-- TODO: CSS for big/strong-->
 
 <div id='holds_box' class='canvas' style='margin-top: 6px;'>
-    <h1>[% l('Place Hold') %]</h1>
+    <div class="header_middle">
+       <span class="float-left">[% l('Result of Placing Hold:') %]</span>
+    </div>
+
 
     <form method="post">
         <input type="hidden" name="override" value="1" />
@@ -29,9 +32,11 @@
                             override = 1;
                         END;
                     %]
-                    <input 
+                   <!-- WHY IS THIS CHECKBOX HERE?
+				   <input 
                         type="checkbox" name="hold_target" value="[% hdata.target.id | html %]"
                         [% IF override %] checked='checked' [% ELSE %] disabled='disabled' [% END %]/>
+					-->
                 </td>
                 <td>
                     [%
@@ -52,7 +57,7 @@
                     <div>
                         [% IF hdata.hold_success %]
 
-                        <div class='success'>[% l("Hold was successfully placed"); %]</div>
+                        <div class='success'>[% l("Hold was successfully placed!"); %]</div>
 
                         [% IF ctx.is_staff %]
                             <script>
@@ -78,12 +83,12 @@
 
                         [% ELSIF hdata.hold_failed; any_failures = 1 %]
 
-                            <div><big><strong>[% l("Hold was not successfully placed"); %]</strong></big></div>
+                            <div style="padding:10px;font-weight:bold;color:red;font-size:1em;">[% l("Hold could not be placed."); %]</div>
                             [% IF hdata.hold_local_block %]
                                 <div>[% l("There is already a copy available at your local library.") %]</div>
                             [% ELSIF hdata.hold_failed_event || hdata.hold_local_alert %]
-                                <div>
-                                    <span class='hold-items-list-problem'>[% l('Problem:') %]</span>
+                                <div style="width:100%;max-length:800px;">
+                                    <span class='hold-items-list-problem'>[% l('Reason:') %]</span>
                                     <span title="[% hdata.hold_failed_event.textcode | html %]">
                                         <em>[%
                                                 fail_part_key = hdata.hold_failed_event.payload.fail_part;
@@ -91,7 +96,7 @@
 
                                                 # display:
                                                 (hdata.age_protect ?
-                                                    l("The title you have requested is not available for hold requests at this time.  Please contact your local library for assistance.") :
+                                                    l("The title you have requested is not available for hold requests at this time. Please contact your local library for assistance.") :
                                                     FAIL_PART_MSG_MAP.$fail_part_key ||
                                                     EVENT_MSG_MAP.$event_key ||
                                                     FAIL_PART_MSG_MAP.$fail_part_key ||
diff --git a/Open-ILS/src/templates/opac/parts/pref_lib_display.tt2 b/Open-ILS/src/templates/opac/parts/pref_lib_display.tt2
index 9fe7d9cecf..192dbb080e 100644
--- a/Open-ILS/src/templates/opac/parts/pref_lib_display.tt2
+++ b/Open-ILS/src/templates/opac/parts/pref_lib_display.tt2
@@ -1,6 +1,6 @@
 [%- IF ctx.pref_ou && ctx.pref_ou != ctx.search_ou; %]
 <span class="preflib">[%
-    l('Preferred library: [_1]', '<span class="bold">' _ ctx.get_aou(ctx.pref_ou).name _ '</span>');
+    l('Preferred search location: [_1]', '<span class="bold">' _ ctx.get_aou(ctx.pref_ou).name _ '</span>');
     IF NOT ctx.is_staff %]<a href="[% mkurl(ctx.opac_root _ '/myopac/prefs_settings')
     %]" class="preflib_change" title="[% l("Change preferred library"); %]">[% l('?') %]</a>[% END; %]
 </span>
diff --git a/Open-ILS/src/templates/opac/parts/qtype_selector.tt2 b/Open-ILS/src/templates/opac/parts/qtype_selector.tt2
index 608b76d8e7..3ab07d5df4 100644
--- a/Open-ILS/src/templates/opac/parts/qtype_selector.tt2
+++ b/Open-ILS/src/templates/opac/parts/qtype_selector.tt2
@@ -6,7 +6,7 @@
     {value => "series", label => l("Series"), plural_label => l("Series"), browse => 1}
 ] %]
 <select name="[% name || 'qtype' %]"[% IF id; ' id="'; id ; '"' ; END -%]
-    title="[% l('Select query type:') %]">
+    title="[% l('Select query type:') %]" style="padding:3px;">
     [%  query_type = query_type || CGI.param('qtype') || search.default_qtypes.0;
       FOR qt IN query_types;
         NEXT IF browse_only AND NOT qt.browse -%]
diff --git a/Open-ILS/src/templates/opac/parts/record/cnbrowse.tt2 b/Open-ILS/src/templates/opac/parts/record/cnbrowse.tt2
index 835eab3145..dc6cf0f3c7 100644
--- a/Open-ILS/src/templates/opac/parts/record/cnbrowse.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/cnbrowse.tt2
@@ -6,7 +6,8 @@
 <div id='cn_browse' class='cn_browser'>
     <div id='cn_browse_div'> 
         <p class='color_4'>
-            [% l("You are now browsing [_1]", ctx.browsing_ou.name) | html %]
+            [% l("You are now browsing [_1]", ctx.browsing_ou.name) | html %]<br/>
+            <span style="font-style:italic;font-weight:normal;">(Shelf browsing works best if you are browsing a single library location and not an entire library system.)</span>
         </p>
         <table class='data_grid bookshelf' width='100%'>
                 <tr>
@@ -14,7 +15,7 @@
                         <a class='classic_link lbl1' 
                             href="[% mkurl('', {cnoffset => cnoffset - 1}) %]#cnbrowse">[% l("&lt;&lt; Previous Page") %]</a>
                     </td>
-                    <td colspan='1' align='center'>[% l("Shelf Browser") %]</td>
+                    <td colspan='1' align='center'>[% l("") %]</td>
                     <td>
                         <a class='classic_link lbl1' 
                             href="[% mkurl('', {cnoffset => cnoffset + 1}) %]#cnbrowse">[% l("Next Page &gt;&gt;") %]</a>
@@ -33,10 +34,10 @@
                     <td class='cn_browse_item' width='25%' valign='top'>
                         [%  rec_attrs = {marc_xml => cn.record.marc};
                             PROCESS get_marc_attrs args=rec_attrs; %]
-                        <a href="[% mkurl(ctx.opac_root _ '/record/' _ cn.record.id, {$loc_name => loc_value}, 1) %]"><img height='60' width='50' 
-                            class='cn_browse_info' name='cn_browse_pic' border='0' 
+                        <a href="[% mkurl(ctx.opac_root _ '/record/' _ cn.record.id, {$loc_name => loc_value}, 1) %]"><img height='150'  
+                            class='cn_browse_info' name='cn_browse_pic' border='0' style="border:1px solid #ccc;margin:5px;"
                             [% img_alt(l('Go to record [_1]', rec_attrs.title)) %]
-                            src="[% ctx.media_prefix %]/opac/extras/ac/jacket/small/r/[% cn.record.id | uri %]" /></a>
+                            src="[% ctx.media_prefix %]/opac/extras/ac/jacket/medium/r/[% cn.record.id | uri %]" /></a>
                         <div class='cn_browse_info bold' name='cn_browse_cn'>[% cn.label | html %]</div>
                         <div class='cn_browse_info'>
                             <a name='cn_browse_title' class='classic_link record_title'
diff --git a/Open-ILS/src/templates/opac/parts/record/contents.tt2 b/Open-ILS/src/templates/opac/parts/record/contents.tt2
index 29fc33b4cd..df0f0ff216 100644
--- a/Open-ILS/src/templates/opac/parts/record/contents.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/contents.tt2
@@ -7,64 +7,64 @@ contents =  [
         label => l('With Note: '),
         xpath => '//*[@tag="501"]'
     }, {
-        label => l('Dissertation Note: '),
+        label => l('Dissertation: '),
         xpath => '//*[@tag="502"]'
     }, {
-        label => l('Bibliography, etc. Note: '),
+        label => l('Bibliography, etc.: '),
         xpath => '//*[@tag="504"]'
     }, {
-        label => l('Formatted Contents Note: '),
+        label => l('Contents: '),
         xpath => '//*[@tag="505"]'
     }, {
-        label => l('Restrictions on Access Note: '),
+        label => l('Restrictions on Access: '),
         xpath => '//*[@tag="506"]'
     }, {
         label => l('Scale Note for Graphic Material: '),
         xpath => '//*[@tag="507"]'
     }, {
-        label => l('Creation/Production Credits Note: '),
+        label => l('Creation/Production Credits: '),
         xpath => '//*[@tag="508"]'
     }, {
-        label => l('Citation/References Note: '),
+        label => l('Citation/References: '),
         xpath => '//*[@tag="510"]'
     }, {
-        label => l('Participant or Performer Note: '),
+        label => l('Participant or Performer: '),
         xpath => '//*[@tag="511"]'
     }, {
-        label => l('Type of Report and Period Covered Note: '),
+        label => l('Type of Report and Period Covered: '),
         xpath => '//*[@tag="513"]'
     }, {
-        label => l('Data Quality Note: '),
+        label => l('Data Quality: '),
         xpath => '//*[@tag="514"]'
     }, {
-        label => l('Numbering Peculiarities Note: '),
+        label => l('Numbering Peculiarities: '),
         xpath => '//*[@tag="515"]'
     }, {
-        label => l('Type of Computer File or Data Note: '),
+        label => l('Type of Computer File or Data: '),
         xpath => '//*[@tag="516"]'
     }, {
-        label => l('Date/Time and Place of an Event Note: '),
+        label => l('Date/Time and Place of an Event: '),
         xpath => '//*[@tag="518"]'
     }, {
         label => l('Summary, etc.: '),
         xpath => '//*[@tag="520"]'
     }, {
-        label => l('Target Audience Note: '),
+        label => l('Target Audience: '),
         xpath => '//*[@tag="521"]'
     }, {
-        label => l('Geographic Coverage Note: '),
+        label => l('Geographic Coverage: '),
         xpath => '//*[@tag="522"]'
     }, {
-        label => l('Preferred Citation of Described Materials Note: '),
+        label => l('Preferred Citation: '),
         xpath => '//*[@tag="524"]'
     }, {
         label => l('Supplement Note: '),
         xpath => '//*[@tag="525"]'
     }, {
-        label => l('Study Program Information Note: '),
+        label => l('Study Program Information: '),
         xpath => '//*[@tag="526"]'
     }, {
-        label => l('Additional Physical Form available Note: '),
+        label => l('Additional Physical Form Available: '),
         xpath => '//*[@tag="530"]'
     }, {
         label => l('Reproduction Note: '),
@@ -73,58 +73,58 @@ contents =  [
         label => l('Original Version Note: '),
         xpath => '//*[@tag="534"]'
     }, {
-        label => l('Location of Originals/Duplicates Note: '),
+        label => l('Location of Originals/Duplicates: '),
         xpath => '//*[@tag="535"]'
     }, {
-        label => l('Funding Information Note: '),
+        label => l('Funding Information: '),
         xpath => '//*[@tag="536"]'
     }, {
-        label => l('System Details Note: '),
+        label => l('System Details: '),
         xpath => '//*[@tag="538"]'
     }, {
-        label => l('Terms Governing Use and Reproduction Note: '),
+        label => l('Terms Governing Use and Reproduction: '),
         xpath => '//*[@tag="540"]'
     }, {
-        label => l('Immediate Source of Acquisition Note: '),
+        label => l('Immediate Source of Acquisition: '),
         xpath => '//*[@tag="541"]'
     }, {
         label => l('Information Relating to Copyright Status: '),
         xpath => '//*[@tag="542"]'
     }, {
-        label => l('Location of Other Archival Materials Note: '),
+        label => l('Location of Other Archival Materials: '),
         xpath => '//*[@tag="544"]'
     }, {
         label => l('Biographical or Historical Data: '),
         xpath => '//*[@tag="545"]'
     }, {
-        label => l('Language Note: '),
+        label => l('Language: '),
         xpath => '//*[@tag="546"]'
     }, {
         label => l('Former Title Complexity Note: '),
         xpath => '//*[@tag="547"]'
     }, {
-        label => l('Issuing Body Note: '),
+        label => l('Issuing Body: '),
         xpath => '//*[@tag="550"]'
     }, {
-        label => l('Entity and Attribute Information Note: '),
+        label => l('Entity and Attribute Information: '),
         xpath => '//*[@tag="552"]'
     }, {
-        label => l('Cumulative Index/Finding Aids Note: '),
+        label => l('Cumulative Index/Finding Aids: '),
         xpath => '//*[@tag="555"]'
     }, {
-        label => l('Information About Documentation Note: '),
+        label => l('Information About Documentation: '),
         xpath => '//*[@tag="556"]'
     }, {
         label => l('Ownership and Custodial History: '),
         xpath => '//*[@tag="561"]'
     }, {
-        label => l('Copy and Version Identification Note: '),
+        label => l('Copy and Version Identification: '),
         xpath => '//*[@tag="562"]'
     }, {
         label => l('Binding Information: '),
         xpath => '//*[@tag="563"]'
     }, {
-        label => l('Case File Characteristics Note: '),
+        label => l('Case File Characteristics: '),
         xpath => '//*[@tag="565"]'
     }, {
         label => l('Methodology Note: '),
@@ -133,22 +133,22 @@ contents =  [
         label => l('Linking Entry Complexity Note: '),
         xpath => '//*[@tag="580"]'
     }, {
-        label => l('Publications About Described Materials Note: '),
+        label => l('Publications About Described Materials: '),
         xpath => '//*[@tag="581"]'
     }, {
         label => l('Action Note: '),
         xpath => '//*[@tag="583"]'
     }, {
-        label => l('Accumulation and Frequency of Use Note: '),
+        label => l('Accumulation and Frequency of Use: '),
         xpath => '//*[@tag="584"]'
     }, {
-        label => l('Exhibitions Note: '),
+        label => l('Exhibitions: '),
         xpath => '//*[@tag="585"]'
     }, {
-        label => l('Awards Note: '),
+        label => l('Awards: '),
         xpath => '//*[@tag="586"]'
     }, {
-        label => l('Source of Description Note: '),
+        label => l('Source of Description: '),
         xpath => '//*[@tag="588"]'
     } 
 ];
@@ -186,7 +186,7 @@ END
         IF content.match('\S');
 -%]
 <tr>
-    <td class='rdetail_content_type'>[% cont.label %]</td>
+    <td class='rdetail_content_type' nowrap>[% cont.label %]</td>
     <td class='rdetail_content_value' property='keywords'>[% content %]</td>
 </tr>
         [%- END; %]
@@ -196,7 +196,7 @@ END
 [%-  content_html = PROCESS render_all_contents;
     IF content_html.length > 0;
 %]
-<h2 class='rdetail_contents'>[% l('Content descriptions') %]</h2>
+<h2 class='rdetail_contents'>[% l('Contents / Notes') %]</h2>
 <table class='rdetail_content'>
     <tbody>
 [%- content_html %]
diff --git a/Open-ILS/src/templates/opac/parts/record/copy_counts.tt2 b/Open-ILS/src/templates/opac/parts/record/copy_counts.tt2
index eee85e8f09..bb41a7b94a 100644
--- a/Open-ILS/src/templates/opac/parts/record/copy_counts.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/copy_counts.tt2
@@ -1,5 +1,5 @@
 <span id="rdetail_copy_counts">
-    <h2>[% l('Available copies') %]</h2>
+    <h2>[% l('Currently available copies') %]</h2>
     <ul>
     [%- depths = ctx.copy_summary.size;
         depth = 0;
@@ -24,7 +24,7 @@
         IF ou_count > 0 && this_depth != ctx.copy_depth %]
     <a href="[% mkurl('', {copy_depth => this_depth}, ['copy_offset']); %]"
        title="[% l('Show copies at [_1]', ou_name); %]">
-       [%- l('(Show)'); %]</a>
+       [%- l('(Show copies)'); %]</a>
     [%- END; %]
     </li>
     [%- depth = depth + 1;
diff --git a/Open-ILS/src/templates/opac/parts/record/copy_table.tt2 b/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
index d00af536d2..e4e56ba977 100644
--- a/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
@@ -26,7 +26,7 @@ FOREACH copy_info IN copies;
 END;
 -%]
 [%- IF has_copies; %]
-<table class="table_no_border_space table_no_cell_pad table_no_border" width="100%" id="rdetails_status">
+<table class="table_no_border_space table_no_cell_pad table_no_border" width="100%" id="rdetails_status" style="border:1px #999 solid;">
     <thead>
         <tr>
             [% IF serial_holdings -%]
@@ -101,7 +101,7 @@ END; # FOREACH bib
             </td>
         [% END %]
             <td property="availableAtOrFrom">[% copy_info.copy_location | html %]</td>
-            <td><span property="sku">[% callnum | html %]</span> [% IF ctx.get_org_setting(CGI.param('loc') OR ctx.aou_tree.id, 'sms.enable') == 1 %](<a href="[% mkurl(ctx.opac_root _ '/sms_cn', {copy_id => copy_info.id}) %]">Text</a>)[% END %]</td>
+            <td><span property="sku">[% callnum | html %]</span> [% IF ctx.get_org_setting(CGI.param('loc') OR ctx.aou_tree.id, 'sms.enable') == 1 %](<a href="[% mkurl(ctx.opac_root _ '/sms_cn', {copy_id => copy_info.id}) %]">Send Text</a>)[% END %]</td>
             [%- IF has_parts == 'true' %]
             <td>[% copy_info.part_label | html %]</td>
             [%- END %]
diff --git a/Open-ILS/src/templates/opac/parts/record/extras.tt2 b/Open-ILS/src/templates/opac/parts/record/extras.tt2
index 211423279b..a132646fe2 100644
--- a/Open-ILS/src/templates/opac/parts/record/extras.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/extras.tt2
@@ -56,13 +56,13 @@
         extras = [
             {name => 'summaryplus',  label => l('Summaries & More'), hide => hide_summary},
             {name => 'annotation', label => l('Annotation'), hide => 1}, 
-            {name => 'awards',  label => l('Awards, Reviews, & Suggested Reads')}, 
+            {name => 'awards',  label => l('Recommended Reads and Reviews')}, 
             {name => 'excerpt',  label => l('Excerpt'), hide => 1},
             {name => 'issues',   label => l('Issues Held'), hide => !(ctx.have_holdings_to_show || ctx.have_mfhd_to_show)},
             {name => 'preview',  label => l('Preview'), hide => 1}, 
             {name => 'addedcontent',  label => l('Additional Content'), hide => hide_ac},  # hide if all content is known to not exist
-            {name => 'cnbrowse', label => l('Shelf Browser')},
-            {name => 'marchtml', label => l('MARC Record')}
+            {name => 'cnbrowse', label => l('Browse the Shelves')},
+            {name => 'marchtml', label => l('View MARC Record')}
         ];
 
         FOREACH extra IN extras;
@@ -73,10 +73,10 @@
             <div class="rdetail_extras_hr"></div>
             <div class="rdetail_extras_link">
                 [%  
-                    IF tab_is_active(name) OR name == 'awards'; # force awards section to be open
+                    IF tab_is_active(name) OR name == 'awards';
                         href = mkurl('', {}, ['expand', 'ac']);
-                        arrow = arrow_down;
-                    ELSE;
+                        arrow = arrow_down;			    
+					ELSE;
                         IF name == 'addedcontent' AND default_ac;
                             href = mkurl('', {expand => name, ac => default_ac}) _ '#' _ name; 
                         ELSE;
@@ -89,7 +89,7 @@
             </div>
         </div>
         <div class='rdetail_extras_div'>
-            [%  IF tab_is_active(name) OR name == 'awards'; # force awards section to be open
+            [%  IF tab_is_active(name) OR name == 'awards';
                     IF name == 'marchtml';
                         ctx.marchtml;
                     ELSE;
@@ -102,3 +102,4 @@
         [% END %]
     </div>
 </div>
+
diff --git a/Open-ILS/src/templates/opac/parts/record/navigation.tt2 b/Open-ILS/src/templates/opac/parts/record/navigation.tt2
index e44e8da928..f7c905bc69 100644
--- a/Open-ILS/src/templates/opac/parts/record/navigation.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/navigation.tt2
@@ -1,14 +1,14 @@
 [% IF ctx.search_result_index.defined && ctx.search_result_index >= 0 %]
 <div class="rdetail_header">
     <span class="rdetail_results">
-        <a href='[% mkurl(ctx.opac_root _ '/results', {}, stop_parms); %]'><span class="nav_arrow_fix">&#9668;</span> [% l('Search Results') %]</a>
+        <a href='[% mkurl(ctx.opac_root _ '/results', {}, stop_parms); %]'><span class="nav_arrow_fix">&#9668;</span> [% l('Return to Search Results') %]</a>
         <!-- stash these in JS for the web staff client to find -->
         <script>
             window.search_result_hit_count = [% ctx.hit_count %];
             window.search_result_index = [% ctx.search_result_index %];
         </script>
-        <span class="rdetail_result_count">
-            [% l('Showing Item [_1] of [_2]', ctx.search_result_index + 1, ctx.hit_count) %]
+                <span class="rdetail_result_count">
+            [% l('Now showing item [_1] of about [_2]', ctx.search_result_index + 1, ctx.hit_count) %]
         </span>
     </span>
     [%- INCLUDE "opac/parts/pref_lib_display.tt2" %]
@@ -35,7 +35,7 @@
                 ctx.next_rec_url = mkurl(ctx.next_search_record, next_args, stop_parms);
         %]
         <a class='np_nav_link classic_link' title='[% l("Next Record") %]'
-            href='[% ctx.next_rec_url %]'>[% l('Next') %] <span class="nav_arrow_fix">&#9658;</span></a>
+            href='[% ctx.next_rec_url %]' rel="nofollow" vocab="">[% l('Next Item') %] <span class="nav_arrow_fix">&#9658;</span></a>
         [% END %]
 
     </div>
diff --git a/Open-ILS/src/templates/opac/parts/record/series.tt2 b/Open-ILS/src/templates/opac/parts/record/series.tt2
index 4be6b8326c..a8ac5e1374 100644
--- a/Open-ILS/src/templates/opac/parts/record/series.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/series.tt2
@@ -44,7 +44,7 @@ END;
 
 [%- series_anchors = PROCESS render_series;
     IF series_anchors.length > 0; %]
-<h2 class='rdetail_related_series'>[% l('Search for related items by series') %]</h2>
+<h2 class='rdetail_related_series'>[% l('Find related items by series') %]</h2>
 <ul>
     [% series_anchors %]
 </ul>
diff --git a/Open-ILS/src/templates/opac/parts/record/subjects.tt2 b/Open-ILS/src/templates/opac/parts/record/subjects.tt2
index b0702a427d..34293dbf9b 100644
--- a/Open-ILS/src/templates/opac/parts/record/subjects.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/subjects.tt2
@@ -101,6 +101,6 @@
 [%-  subject_html = PROCESS render_all_subjects;
     IF subject_html.length > 0;
 %]
-<h2 class='rdetail_related_subjects'>[% l('Search for related items by subject') %]</h2>
+<h2 class='rdetail_related_subjects'>[% l('Find similar items by subject') %]</h2>
 [%- subject_html %]
 [%- END %]
diff --git a/Open-ILS/src/templates/opac/parts/record/summary.tt2 b/Open-ILS/src/templates/opac/parts/record/summary.tt2
index 4fa0ba898d..01349e7b2b 100644
--- a/Open-ILS/src/templates/opac/parts/record/summary.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/summary.tt2
@@ -6,12 +6,11 @@
 <!-- ****************** rdetail_summary.xml ***************************** -->
 <abbr class="unapi-id" title='tag:[% ctx.hostname %],[% date.format(date.now, '%Y') %]:biblio-record_entry/[% ctx.bre_id %]'></abbr>
 
-<hr />
 
 [%-# This holds the record summary information %]
 <div id="rdetail_summary_header">
     <div id='rdetail_title_div'>
-        <h1 id='rdetail_title' property="name">[% attrs.title_extended | html %]</h1>
+        <h1 id='rdetail_title' property="name" style="font-size:1.75em;">[% attrs.title_extended | html %]</h1>
         [%-
             FOR link880 IN attrs.graphic_titles;
                 FOR alt IN link880.graphic;
@@ -28,7 +27,8 @@
     <div id="rdetail_image_div">
         <a href='[% ctx.media_prefix %]/opac/extras/ac/jacket/large/r/[% ctx.bre_id | uri %]'><img
             alt="[% l('Image of item') %]" id='rdetail_image'
-            src='[% ctx.media_prefix %]/opac/extras/ac/jacket/[% record.summary.jacket_size %]/r/[% ctx.bre_id | uri %]' /></a>
+            src='[% ctx.media_prefix %]/opac/extras/ac/jacket/[% record.summary.jacket_size %]/r/[% ctx.bre_id | uri %]'
+            style="margin-right:10px;margin-bottom:10px;height:250px;border:1px solid #ccc;"	/></a>
         <br />
     </div>
     <div id="format_actions">
@@ -61,19 +61,23 @@
             %]
             [%  ELSE;
                 operation = ctx.mylist.grep(ctx.bre_id).size ? "delete" : "add";
-                label = (operation == "add") ? l("Add to my list") : l("Remove from my list"); 
+                label = (operation == "add") ? l("Add To My List") : l("Remove From My List"); 
             %]
                 <a href="[% mkurl(ctx.opac_root _ '/mylist/' _ operation, {record => ctx.bre_id}, stop_parms) %]" class="no-dec" rel="nofollow" vocab="">
                     <img src="[% ctx.media_prefix %]/images/clipboard.png" alt="" />
                     [% label %]
                 </a>
+				<a href="http://pines.georgialibraries.org/catalog-help#my_list" target="_blank">
+	                <img src="[% ctx.media_prefix %]/images/question-mark.png" alt="Learn about lists" border=0></a>
             [% END %]
             </div>
+			<!-- Hide for PINES since they do not include call number or holdings information
             <div class="rdetail_aux_utils">
                 <img src="[% ctx.media_prefix %]/images/clipboard.png" alt="[% l('Print / Email Actions Image') %]" />
                 <a href="[% mkurl(ctx.opac_root _ '/record/print/' _ ctx.bre_id) %]" class="no-dec" rel="nofollow" vocab="">[% l('Print') %]</a> /
                 <a href="[% mkurl(ctx.opac_root _ '/record/email/' _ ctx.bre_id) %]" class="no-dec" rel="nofollow" vocab="">[% l('Email') %]</a>
             </div>
+			-->
             [%- IF ctx.refworks.enabled == 'true' %]
                 [%- INCLUDE 'opac/parts/record/refworks.tt2' %]
             [%- END %]
@@ -154,6 +158,7 @@ IF num_uris > 0;
     [%- IF num_uris > 1 %]</ul>[% END %]
 </div>
 [%- END %]
+
 [%- # Hold/copy summary
     IF ctx.copy_summary.0.count
 %]
@@ -173,16 +178,41 @@ IF num_uris > 0;
                     END;
                     count_entry = count_entry + 1;
                 END;
-                l("[quant,_1,current hold,current holds] with [quant,_2,total copy,total copies].", 
+                l("[quant,_1,current hold,current holds] on [quant,_2,total copy,total copies]", 
                     ctx.record_hold_count, ctx.copy_summary.$count_entry.count) 
             %]
         </p>
     </span>
+
+<!-- Electronic Resources Section -->
+[%- merged_uris = args.uris.merge(args.online_res);
+num_uris = merged_uris.size;
+IF num_uris > 0;
+-%]
+<h2 class="rdetail_uris">[% l("Related electronic resources") %]</h2>
+<div class="rdetail_uris">
+    [%- IF num_uris > 1 %]<ul>[% END %]
+    [%- FOR uri IN merged_uris %]
+        [%- IF num_uris == 1 -%]
+            <p class="rdetail_uri" property="offers" vocab="http://schema.org/" typeof="Offer">
+        [%- ELSE -%]
+            <li class="rdetail_uri" property="offers" vocab="http://schema.org/" typeof="Offer">
+        [%- END -%]
+        <a href="[% uri.href %]">[% uri.link %]</a>[% ' - ' _ uri.note IF uri.note %]
+        <link property="availability" href="http://schema.org/OnlineOnly" />
+        [%- IF attrs.gtin13; '<meta property="gtin13" content="' _ attrs.gtin13 _ '" />'; END; %]
+        [%- IF num_uris == 1 %]</p>[% ELSE %]</li>[% END %]
+    [%- END %]
+    [%- IF num_uris > 1 %]</ul>[% END %]
+</div>
+[%- END %]
+	
 [%- INCLUDE "opac/parts/record/copy_table.tt2" copies=ctx.copies %]
+
 </div>
 [%- END %]
 
-<h2 id='rdetail_record_details'>[% l("Record details") %]</h2>
+<h2 id='rdetail_record_details'>[% l("Item details") %]</h2>
 <ul>
     [%- IF attrs.isbns.0;
           FOR isbn IN attrs.isbns;
diff --git a/Open-ILS/src/templates/opac/parts/result/copy_counts.tt2 b/Open-ILS/src/templates/opac/parts/result/copy_counts.tt2
index dc8aab797c..7824f01445 100644
--- a/Open-ILS/src/templates/opac/parts/result/copy_counts.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/copy_counts.tt2
@@ -11,7 +11,7 @@
 %]
 <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].',
+    [% l('[_1] out of [quant,_2,copy,copies] are currently available at [_3]',
         attrs.copy_counts.$depth.available,
         attrs.copy_counts.$depth.count,
         ou_name) | html
@@ -31,7 +31,7 @@
 [%- IF attrs.plib_copy_counts.$depth.count > 0 AND (
         hiding_disabled OR ctx.org_within_hiding_scope(org_unit.id)) %]
 <div class="result_count preferred">[%
-     l('[_1] of [quant,_2,copy,copies] available at [_3].',
+     l('[_1] out of [quant,_2,copy,copies] are currently available at [_3].',
         attrs.plib_copy_counts.$depth.available,
         attrs.plib_copy_counts.$depth.count,
         ou_name) | html
diff --git a/Open-ILS/src/templates/opac/parts/result/facets.tt2 b/Open-ILS/src/templates/opac/parts/result/facets.tt2
index c8c7196f65..5f244b9c04 100644
--- a/Open-ILS/src/templates/opac/parts/result/facets.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/facets.tt2
@@ -1,4 +1,9 @@
 <div class="facet_box_wrapper">
+    <div  style="border-right:1px solid #eee;width:15em;margin-bottom:10px;">
+	    <div class="header_middle">
+		    [% l('Narrow Your Search') %]</div>
+	    <i>Tip: Click on the links below to narrow down your search results. To remove a search limit you've selected, click on the link again.</i>
+	</div>
 [% 
 
 long_facets = CGI.param('long_facet') || [];
diff --git a/Open-ILS/src/templates/opac/parts/result/paginate.tt2 b/Open-ILS/src/templates/opac/parts/result/paginate.tt2
index 86de79894e..2fee02e659 100644
--- a/Open-ILS/src/templates/opac/parts/result/paginate.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/paginate.tt2
@@ -1,11 +1,11 @@
 [% BLOCK results_count_header %]
 <div class="results_header_nav1">
-    <span class="h1">[% ctx.bookbag ? l('List Contents') : l('Search Results') %]</span>
+    <!--<span class="h1">[% ctx.bookbag ? l('List Contents') : l('Search Results') %]</span>-->
     <span class="result_number">
                 [%~ |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 about [_3]
+                Now showing results [_1] - [_2] of about [_3]
                 [%~ END %]
                 <span style='padding-left: 6px;'>
                     [%~ |l('<span class="result_count_number">' _ (page + 1) _ '</span>',
@@ -13,7 +13,7 @@
                     (page [_1] of [_2])
                     [%~ END %]
                 </span>
-    </span>
+    </span> &nbsp; &nbsp; &nbsp;
     [%- INCLUDE "opac/parts/pref_lib_display.tt2" %]
     <span>
                 <span class='start_end_links_span'>
diff --git a/Open-ILS/src/templates/opac/parts/result/table.tt2 b/Open-ILS/src/templates/opac/parts/result/table.tt2
index 02fe684ec4..b056add45c 100644
--- a/Open-ILS/src/templates/opac/parts/result/table.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/table.tt2
@@ -70,8 +70,8 @@
                                                 %].</td>
                                             <td class='result_table_pic_header'>
                                                 <a href="[% record_url %]"><img alt="[% l('Book cover') %]"
-                                                        name='item_jacket' class='result_table_pic' width="55"
-                                                        src='[% ctx.media_prefix %]/opac/extras/ac/jacket/small/r/[% rec.bre_id | uri %]' /></a><br />
+                                                        name='item_jacket' class='result_table_pic' width="85" style="border:1px solid #ccc;"
+                                                        src='[% ctx.media_prefix %]/opac/extras/ac/jacket/medium/r/[% rec.bre_id | uri %]' /></a><br />
                                             </td>
                                             <td class='result_table_title_cell' name='result_table_title_cell'>
                                                <div class="result_metadata">
@@ -147,10 +147,10 @@ END;
                                                     [%- UNLESS show_detail_view;
                                                             IF attrs.pubdate;
                                                                 pubdate_clean = attrs.pubdate | html;
-                                                                l(" ([_1])", pubdate_clean);
+                                                                l("Publication Date: ([_1])", pubdate_clean);
                                                             ELSIF attrs.copyright;
                                                                 copyright_clean = attrs.copyright | html;
-                                                                l(" ([_1])", copyright_clean);                                                                
+                                                                l("Copyright Date: ([_1])", copyright_clean);                                                                
                                                             END;
                                                         END
                                                     -%]
@@ -163,7 +163,8 @@ END;
                                                     <table 
                                                        role="presentation"
                                                        title="[% l('Record Holdings Summary') %]"
-                                                       class="table_no_border_space table_no_cell_pad table_no_border results_info_table">
+                                                       class="table_no_border_space table_no_cell_pad table_no_border results_info_table"
+													   style="margin-left:40px;">
                                                         [% UNLESS rec.mmr_id %]
                                                            [% IF args.holdings.size > 0 %]
                                                         <tr name='bib_cn_list' class='result_table_title_cell'>
@@ -317,7 +318,7 @@ END;
                                                             <tr name='bib_cn_list' class='result_table_title_cell'>
                                                                 <td colspan='2'>
                                                                     <table title="[% l('Record Holdings Details') %]"
-                                                                           class='result_holdings_table'>
+                                                                           class='result_holdings_table' width="600">
                                                                         <thead><tr>
                                                                             <th>[% l('Library') %]</th>
                                                                             <th>[% l('Shelving location') %]</th>
@@ -351,6 +352,7 @@ END;
                                                              %]
                                                         [% END %] <!-- END detail_record_view -->
                                                     </table>
+													<hr style="border:0px;height:1px;" />
                                                     [% PROCESS "opac/parts/result/copy_counts.tt2" %]
                                                     [% IF rec.user_circulated %]
                                                     <div class="result_item_circulated">
@@ -384,7 +386,7 @@ END;
                                                                     class="no-dec" rel="nofollow" vocab=""><img
                                                                 src="[% ctx.media_prefix %]/images/green_check.png"
                                                                 alt=""/><span class="result_place_hold">[% l('Place Hold') %]</span></a>
-                                                        </div>
+                                                        </div><br/>
 [%- END -%]
                                                         <div class="results_aux_utils result_util">
                                                             [%  IF ctx.user;
@@ -392,7 +394,7 @@ END;
                                                             %]
                                                             [%  ELSE;
                                                                 operation = ctx.mylist.grep(rec.id).size ? "delete" : "add";
-                                                                label = (operation == "add") ?  l("Add to my list") : l("Remove from my list");
+                                                                label = (operation == "add") ?  l("Add To My List") : l("Remove From List");
                                                                 title_label = (operation == "add") ? 
                                                                   l("Add [_1] to my list", attrs.title) : 
                                                                   l("Remove [_1] from my list", attrs.title);
@@ -404,6 +406,8 @@ END;
                                                                 <img src="[% ctx.media_prefix %]/images/clipboard.png" alt="" />
                                                                 [% label %]
                                                             </a>
+															<a href="http://pines.georgialibraries.org/catalog-help#my_list" target="_blank">
+															    <img src="[% ctx.media_prefix %]/images/question-mark.png" alt="Learn about lists" border=0></a>
                                                             [% END %]
                                                         </div>
                                                         [% IF ENV.OILS_CONTENT_CAFE_USER %]
diff --git a/Open-ILS/src/templates/opac/parts/searchbar.tt2 b/Open-ILS/src/templates/opac/parts/searchbar.tt2
index a48c4a0e6f..d2c4db0248 100644
--- a/Open-ILS/src/templates/opac/parts/searchbar.tt2
+++ b/Open-ILS/src/templates/opac/parts/searchbar.tt2
@@ -5,7 +5,7 @@
     <form action="[% ctx.opac_root %]/results" method="get">
     [%- END %]
     <div id="search-box">
-        <span class="search_catalog_lbl mobile_hide">[% l('Search the Catalog') %]</span>
+        <span class="search_catalog_lbl mobile_hide">[% l('Basic Search') %]</span>
         <span class="adv_search_catalog_lbl"><a href="[% mkurl(ctx.opac_root _ '/advanced', {},  expert_search_parms.merge(browse_search_parms, facet_search_parms)) %]"
             id="home_adv_search_link">[% l('Advanced Search') %]</a></span>
         <span class="browse_the_catalog_lbl"><a href="[% mkurl(ctx.opac_root _ '/browse', {}, expert_search_parms.merge(general_search_parms, facet_search_parms, ['fi:has_browse_entry'])) %]">[% l('Browse the Catalog') %]</a></span>
@@ -14,8 +14,8 @@
         <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">[% l('Search: ') %]
-            <input type="text" id="search_box" name="query" aria-label="[%
+            <label id="search_box_label" for="search_box">[% l('Search for: ') %]
+            <input type="text" id="search_box" name="query" style="width:90%;max-width:600px;height:20px;padding:3px;" aria-label="[%
                     l('Enter search query:');
                 %]" value="[% is_advanced ? ctx.naive_query_scrub(ctx.processed_search_query) : CGI.param('query') | html %]"
                 [%- IF use_autosuggest.enabled == "t" %]
@@ -29,15 +29,16 @@
                 [%- END # autosuggest enabled %] />
             </label>
         </span>
+		<br/>
         <label id="search_qtype_label" for="qtype">
         [%- 
-            l('Type: ');
+            l('Search by:&nbsp;');
             INCLUDE "opac/parts/qtype_selector.tt2" id="qtype";
         -%]
-        </label>
+        </label> &nbsp; &nbsp; 
         <label id="search_itype_label" for="search_itype_selector">
         [%-
-            l('Format: ');
+            l('Limit to: ');
             IF search.basic_config.type == 'attr';
                 INCLUDE "opac/parts/coded_value_selector.tt2"
                     attr=search.basic_config.group none_ok=1 
@@ -50,10 +51,10 @@
                     none_label=search.basic_config.none_label;
             END;
         -%]
-        </label>
+        </label> &nbsp; &nbsp;
         <label id="search_locg_label" for="search_org_selector">
         [%- 
-            l('Library: ');
+            l('Search within: ');
             select_lib_label = l("Select search library");
             INCLUDE build_org_selector arialabel=select_lib_label 
               id='search_org_selector' show_loc_groups=1
diff --git a/Open-ILS/src/templates/opac/parts/sms_carrier_selector.tt2 b/Open-ILS/src/templates/opac/parts/sms_carrier_selector.tt2
index 919ba074d1..35a96d79d8 100644
--- a/Open-ILS/src/templates/opac/parts/sms_carrier_selector.tt2
+++ b/Open-ILS/src/templates/opac/parts/sms_carrier_selector.tt2
@@ -24,5 +24,5 @@
         default_carrier == carrier.id ? ' selected="selected"' : ''
     %]>[% carrier.name | html %] ([% carrier.region | html %])</option>
     [% END -%]
-</select>
-[% IF NOT sms_carrier_hide_warning; l('Note: carrier charges may apply'); END; %]
+</select><br/><i>
+[% IF NOT sms_carrier_hide_warning; l('Note: Carrier charges may apply.'); END; %]</i>
diff --git a/Open-ILS/src/templates/opac/parts/sms_number_textbox.tt2 b/Open-ILS/src/templates/opac/parts/sms_number_textbox.tt2
index e8d7eb8029..98c9b4717b 100644
--- a/Open-ILS/src/templates/opac/parts/sms_number_textbox.tt2
+++ b/Open-ILS/src/templates/opac/parts/sms_number_textbox.tt2
@@ -1,4 +1,4 @@
 [% IF NOT sms_number_hide_label; l('Mobile number:'); END; %]
 <input 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 NOT sms_number_hide_hint; l('Hint: use the full 10 digits of your phone #, no spaces, no dashes'); END; %]
+IF ctx.user_setting_map.$setting; %] value='[% ctx.user_setting_map.$setting | html %]' [% END %]/><br/><i>
+[% IF NOT sms_number_hide_hint; l('Hint: Use the full 10 digits of your phone number, no spaces, no dashes'); END; %]</i>
diff --git a/Open-ILS/src/templates/opac/parts/topnav.tt2 b/Open-ILS/src/templates/opac/parts/topnav.tt2
index 719ffa1390..dd6b48bb8b 100644
--- a/Open-ILS/src/templates/opac/parts/topnav.tt2
+++ b/Open-ILS/src/templates/opac/parts/topnav.tt2
@@ -12,6 +12,7 @@
         <div id="your-acct-login">
             <a href="[% mkurl(ctx.opac_root _ '/myopac/main') %]" 
                 class="opac-button opac-button-header" id="home_myopac_link">
+                <img alt="[% l('My Account Icon') %]" src="[% ctx.media_prefix %]/images/login-person.png" />
                 [% l('My Account') %]
             </a>
         </div>
@@ -35,11 +36,15 @@
                     [% END %]
                 </div>
                 <a href="[% mkurl(ctx.opac_root _ '/myopac/main', {}, ['single', 'message_id', 'sort','sort_type']) %]"
-                    class="opac-button">[% l('My Account') %]</a>
+                    class="opac-button">
+                    <img alt="[% l('My Account') %]" src="[% ctx.media_prefix %]/images/login-person.png" />
+                    [% l('My Account') %]</a>
                 <a href="[% mkurl(ctx.opac_root _ '/myopac/lists', {}, ['single', 'message_id']) %]"
                     class="opac-button">[% l('My Lists') %]</a>
                 <a href="[% mkurl(ctx.opac_root _ '/logout', {}, 1) %]"
-                    class="opac-button" id="logout_link">[% l('Logout') %]</a>
+                    class="opac-button" id="logout_link">
+                    <img alt="[% l('Logout') %]" src="[% ctx.media_prefix %]/images/logout-x.png" />
+                    [% l('Logout') %]</a>
                 </span>
             </div>
             <div id="dashboard">
diff --git a/Open-ILS/src/templates/opac/parts/topnav_logo.tt2 b/Open-ILS/src/templates/opac/parts/topnav_logo.tt2
index f1211d203a..708dc5306f 100644
--- a/Open-ILS/src/templates/opac/parts/topnav_logo.tt2
+++ b/Open-ILS/src/templates/opac/parts/topnav_logo.tt2
@@ -1,2 +1,2 @@
-       <div id="topnav_logo"> <a href="/eg/opac/home"><img alt="[% l('PINES Logo') %]" 
+       <div id="topnav_logo"> <a href="/eg/opac/home"><img alt="[% l('PINES Home Page - New Search') %]" 
             src="[% ctx.media_prefix %]/opac/images/small_logo.png" /></a></div>
diff --git a/Open-ILS/src/templates/opac/password_reset.tt2 b/Open-ILS/src/templates/opac/password_reset.tt2
index 6639a5885b..6946dc700f 100644
--- a/Open-ILS/src/templates/opac/password_reset.tt2
+++ b/Open-ILS/src/templates/opac/password_reset.tt2
@@ -5,7 +5,7 @@
 -%]
 <h2 class="sr-only">[% l('Reset Password') %]</h2>
 <div class="mobile_hide">
-[% INCLUDE "opac/parts/searchbar.tt2" %]
+[% #INCLUDE "opac/parts/searchbar.tt2" %]
 </div>
 
 [%  
@@ -22,6 +22,7 @@
 %]
 <div id="content-wrapper">
     <div id="main-content">
+	<div class="header_middle" style="padding-top:50px;">[% l('Reset Password') %]</div>
         <br/>
         <p class='[% ctx.pwreset.style %]'>[% stat = ctx.pwreset.status; msg_map.$stat %]</p>
         [% IF uuid %]
@@ -48,23 +49,23 @@
             </form>
             [% END %]
         [% ELSIF !ctx.pwreset.status %]
-        <h2>[% l('Please enter your user name or barcode to identify your library account and request a password reset') %]</h2>
+        <h3>[% l('Please enter either your PINES library card number OR your user name to request a password reset.') %]</h3>
         [%- INCLUDE "opac/password_reset_msg.tt2" %]
         <form method="post">
             <table>
                 <tr>
-                    <td><label for="barcode">[% l('Barcode:') %] </label></td>
+                    <td><label for="barcode"><strong>[% l('Barcode:') %]</strong></label></td>
                     <td><input type="text" id="barcode" name="barcode"/></td>
                 </tr>
                 <tr>
-                    <td><label for="username">[% l('User name:') %] </label></td>
+                    <td><label for="username"><strong>[% l('User name:') %]</strong></label></td>
                     <td><input type="text" id="username" name="username"/></td>
                 </tr>
             </table>
             [% IF ctx.get_org_setting(ctx.physical_loc || ctx.aou_tree.id, 'circ.password_reset_request_requires_matching_email') %]
             <label for="email">[% l('Email address associated with the account:') %] </label><input type="text" name="email"/><br/>
             [% END %]
-            <button name="submit" id="submitButton" class="opac-button" type="submit">[% l('Submit') %]</button>
+            <button name="submit" id="submitButton" class="opac-button" type="submit" style="margin-left:80px;padding-left:20px;padding-right:20px;margin-bottom:80px;">[% l('Submit') %]</button>
         </form>
         [% END %]
     </div>
diff --git a/Open-ILS/src/templates/opac/password_reset_msg.tt2 b/Open-ILS/src/templates/opac/password_reset_msg.tt2
index c453768111..f79db59145 100644
--- a/Open-ILS/src/templates/opac/password_reset_msg.tt2
+++ b/Open-ILS/src/templates/opac/password_reset_msg.tt2
@@ -1,3 +1,6 @@
 <div class="password_message">
-[% l('Note: You must have a valid email address associated with your library account. If not, please contact your local library for further assistance.'); %]
+[% l('You must have a valid email address associated with your library account, and it may take up to one hour to receive your 
+password reset message. If you require assistance, please contact your local library:'); %]<br/>
+<a href="http://www.georgialibraries.org/lib/directories/pineslibdir.html"><b>Contact information for all PINES libraries.</b></a>
 </div>
+
diff --git a/Open-ILS/src/templates/opac/register.tt2 b/Open-ILS/src/templates/opac/register.tt2
index 962fa9ff73..b30b1f1e32 100644
--- a/Open-ILS/src/templates/opac/register.tt2
+++ b/Open-ILS/src/templates/opac/register.tt2
@@ -42,21 +42,20 @@ register_fields = [
 # The dojo date widget in the patron edit UI only accepts default 
 # values in ISO8601 format.  It will not accept locale-shaped dates.
 IF !ctx.register.settings.stgu.dob.example;
-    ctx.register.settings.stgu.dob.example = l('YYYY-MM-DD or YYYY/MM/DD');
+    ctx.register.settings.stgu.dob.example = l('YYYY-MM-DD');
 END;
 
 %]
 
 <h2 class="sr-only">[% l('Account Registration') %]</h2>
-<div id="content-wrapper">
+<div id="content-wrapper" style="font-size:.9em;font-weight:normal;">
     <div id="main-content-register">
         <div class="common-full-pad"></div>
-        <h1>[% l('Request a Library Card')%]</h1>
-        <hr/>
+		<div class="header_middle" style="margin-bottom:30px;margin-top:30px;">[% l('Apply for a PINES Library Card') %]</div>
 
         [% IF ctx.register.success %]
-            <h3>[% l('Registration successful!') %]<h3>
-            <h4>[% l('Please see library staff to complete your registration.') %]</h4>
+            <div class="header_middle" style="margin-bottom:30px;margin-top:30px;">[% l('Registration successful!') %]</div>
+            <h4>[% l('Please visit your Home Library within 14 days to complete your registration.') %]</h4>
 
             [% IF ctx.register.username_taken %]
             <p>
@@ -96,7 +95,7 @@ END;
                 ) | html %]</h4>
         [% END %]
 
-        <form method='POST' onSubmit="return dobValidate(document.getElementById('stgu.dob'))">
+        <form method='POST'>
             <table>
                 <tr>
                     <td>
@@ -141,8 +140,7 @@ FOR field_def IN register_fields;
     </td>
     <td>
         <input 
-            type='text'
-            id='[% field_path %]'
+            type='text' 
             name='[% field_path %]'
             value='[% value || CGI.param(field_path) | html %]'/>
         [% IF require %]
diff --git a/Open-ILS/src/templates/opac/results.tt2 b/Open-ILS/src/templates/opac/results.tt2
index ccf1ba27ef..2ab902906e 100644
--- a/Open-ILS/src/templates/opac/results.tt2
+++ b/Open-ILS/src/templates/opac/results.tt2
@@ -22,10 +22,10 @@
     <h2 class="sr-only">[% l('Search Results') %]</h2>
     <form action="[% ctx.opac_root %]/results" method="get">
     [% INCLUDE "opac/parts/searchbar.tt2" took_care_of_form=1 %]
+	<div class="header_middle" style="background-color:#fff;padding:20px 0px 10px 10px;margin:0px;font-size:2em;">[% l('Search Results') %]</div>
     <h3 class="sr-only">[% l('Additional search filters and navigation') %]</h3>
     <div class="almost-content-wrapper">
-
-        [%# hide the header bar when displaying metarecord constituents
+        [%# hide the header bar when displaying metarecord constituents 
           instead of skipping it altogether to allow the search form
           variables to propagate %]
         [% IF ctx.metarecord;
@@ -44,14 +44,18 @@
           <br/>
           [% END %]
         [% END %]
-        <div id="results_header_bar" [%- IF ctx.metarecord %]class="hidden"[% END -%]>
+		<div id="results_header_bar" [%- IF ctx.metarecord %]class="hidden"[% END -%]>
             <div id="results_header_inner">
+                <!-- Hide unnecessarily duplicated buttons -->
+				<!-- 
+
                 <div class="results_header_btns">
                     <a href="[% mkurl(ctx.opac_root _ '/home', {$loc_name => loc_value, 'detail_record_view' => show_detail_view}, 1) %]">[% l('Another Search') %]</a>
                 </div>
                 <div class="results_header_btns">
                     <a href="[% mkurl(ctx.opac_root _ '/advanced',{}, expert_search_parms.merge(browse_search_parms, facet_search_parms)) %]">[% l('Advanced Search') %]</a>
                 </div>
+				-->
                 <div id="refine_hits" class="results_header_btns result_block_visible"><a onclick="getFacety();">[% l('Refine these results') %]</a></div>
                 <div id="return_to_hits" class="results_header_btns"><a onclick="getResulty();">[% l('Back to results') %]</a></div>
                 [% IF ctx.mylist.size %]
@@ -63,7 +67,8 @@
                     [%- END %]
                 </div>
                 [% END %]
-                    <label class="results_header_lbl" for="opac.result.sort">[% l('Sort by') %]
+				
+				    <label class="results_header_lbl" for="opac.result.sort">[% l('Sort search results:') %]
                     [% INCLUDE "opac/parts/filtersort.tt2" value=CGI.param('sort') submit_on_change=1 %]
                     </label>
 
@@ -79,7 +84,7 @@
                         <input type="checkbox" id="limit_to_available" name="modifier" value="available"
                             onchange="search_modifier_onchange('available', this, true)"
                             [% CGI.param('modifier').grep('available').size ? ' checked="checked"' : '' %] />
-                        [% l('Limit to Available Items') %]
+                        [% l('Limit results to available items') %]
                     </label>
                     [% IF NOT metarecords.disabled %]
                         <label class="results_header_lbl" for="metabib_search_modifier">
@@ -87,7 +92,7 @@
                                 name="modifier" value="metabib"
                                 onchange="search_modifier_onchange('metabib', this, true)"
                                 [% CGI.param('modifier').grep('metabib').size ? ' checked="checked"' : '' %] />
-                            [% l('Group Formats and Editions') %]
+                            [% l('Group results by format and edition') %]
                         </label>
                     [% END %]
                     [% IF ctx.depth_sel_checkbox %]
diff --git a/Open-ILS/web/images/home-largehelp.png b/Open-ILS/web/images/home-largehelp.png
new file mode 100644
index 0000000000..139ca87acf
Binary files /dev/null and b/Open-ILS/web/images/home-largehelp.png differ
diff --git a/Open-ILS/web/images/login-person.png b/Open-ILS/web/images/login-person.png
new file mode 100644
index 0000000000..933353d190
Binary files /dev/null and b/Open-ILS/web/images/login-person.png differ
diff --git a/Open-ILS/web/images/logout-x.png b/Open-ILS/web/images/logout-x.png
new file mode 100644
index 0000000000..15c6e73916
Binary files /dev/null and b/Open-ILS/web/images/logout-x.png differ
diff --git a/Open-ILS/web/images/navbar-about.png b/Open-ILS/web/images/navbar-about.png
new file mode 100644
index 0000000000..5ae731296f
Binary files /dev/null and b/Open-ILS/web/images/navbar-about.png differ
diff --git a/Open-ILS/web/images/navbar-card.png b/Open-ILS/web/images/navbar-card.png
new file mode 100644
index 0000000000..27fa4afa76
Binary files /dev/null and b/Open-ILS/web/images/navbar-card.png differ
diff --git a/Open-ILS/web/images/navbar-findalibrary.png b/Open-ILS/web/images/navbar-findalibrary.png
new file mode 100644
index 0000000000..2455e7515d
Binary files /dev/null and b/Open-ILS/web/images/navbar-findalibrary.png differ
diff --git a/Open-ILS/web/images/navbar-galileo.png b/Open-ILS/web/images/navbar-galileo.png
new file mode 100644
index 0000000000..d44aca1665
Binary files /dev/null and b/Open-ILS/web/images/navbar-galileo.png differ
diff --git a/Open-ILS/web/images/navbar-help.png b/Open-ILS/web/images/navbar-help.png
new file mode 100644
index 0000000000..1f6ebca2f7
Binary files /dev/null and b/Open-ILS/web/images/navbar-help.png differ
diff --git a/Open-ILS/web/images/navbar-home.png b/Open-ILS/web/images/navbar-home.png
new file mode 100644
index 0000000000..fbabe0161c
Binary files /dev/null and b/Open-ILS/web/images/navbar-home.png differ
diff --git a/Open-ILS/web/images/navbar-kids.png b/Open-ILS/web/images/navbar-kids.png
new file mode 100644
index 0000000000..f4609cc248
Binary files /dev/null and b/Open-ILS/web/images/navbar-kids.png differ
diff --git a/Open-ILS/web/images/pines-map.gif b/Open-ILS/web/images/pines-map.gif
new file mode 100644
index 0000000000..559d1bdf85
Binary files /dev/null and b/Open-ILS/web/images/pines-map.gif differ
diff --git a/Open-ILS/web/js/dojo/openils/actor/nls/register.js b/Open-ILS/web/js/dojo/openils/actor/nls/register.js
index ebca55de60..1203df6c09 100644
--- a/Open-ILS/web/js/dojo/openils/actor/nls/register.js
+++ b/Open-ILS/web/js/dojo/openils/actor/nls/register.js
@@ -47,7 +47,7 @@
     "SECONDARY_GROUP_NOT_ALLOWED": "You do not have permission to add this group.",
     "SECONDARY_GROUP_IS_PROFILE": "That is already the primary profile group for this patron.",
     "SECONDARY_GROUP_EXISTS": "This group is on the list already.",
-    "SECONDARY_GROUP_ERROR": "Error saving secondary groups."
-
+    "SECONDARY_GROUP_ERROR": "Error saving secondary groups.",
+	"PARENT_REQUIRED": "Parent/Guardian is required for patrons under 18"
 
 }
diff --git a/Open-ILS/web/js/ui/default/actor/user/register.js b/Open-ILS/web/js/ui/default/actor/user/register.js
index b48946f6dc..210e24ec8a 100644
--- a/Open-ILS/web/js/ui/default/actor/user/register.js
+++ b/Open-ILS/web/js/ui/default/actor/user/register.js
@@ -607,7 +607,7 @@ function generatePasswordHandler() {
  */
 function setExpireDateHandler() {
     var profileWidget, expireWidget;
-    profileWidget = findWidget('au', 'profile');
+	profileWidget = findWidget('au', 'profile');
     expireWidget = findWidget('au', 'expire_date');
 
     // This technique is borrowed with slight modifications
@@ -1908,7 +1908,6 @@ function ueLoadContextHelp(fmcls, fmfield) {
     dojo.byId('uedit-help-text').innerHTML = fieldDoc[fmcls][fmfield].string();
 }
 
-
 /* creates a new patron object with card attached */
 function uEditNewPatron() {
     patron = new au();
@@ -1922,6 +1921,11 @@ function uEditNewPatron() {
     patron.cards([card]);
     patron.net_access_level(orgSettings['ui.patron.default_inet_access_level'] || 1);
     patron.ident_type(orgSettings['ui.patron.default_ident_type']);
+	/* PINES customization - force patron profile to default to 2 (Patrons) and set default exp date to 2 years */
+	patron.profile(2);
+        var d = new Date();
+	    d.setDate(d.getDate() + 730);
+	    patron.expire_date(d);
     patron.stat_cat_entries([]);
     patron.survey_responses([]);
     patron.addresses([]);
@@ -1947,8 +1951,27 @@ function uEditWidgetVal(w) {
     return val;
 }
 
-function uEditSave() { _uEditSave(); }
-function uEditSaveClone() { _uEditSave(true); }
+function uEditSave() { 
+    // if patron is juvenile, require parent or guardian name
+    var juvWidget = findWidget('au','juvenile').widget.attr('value');
+    var pgWidget = findWidget('au','ident_value2').widget.attr('value');
+    if(juvWidget != false && pgWidget.trim() == '') {
+        dojo.byId('parentGuardianRequired').style.display = 'inline';
+        return;
+    }
+    _uEditSave(); 
+}
+
+function uEditSaveClone() { 
+    // if patron is juvenile, require parent or guardian name
+    var juvWidget = findWidget('au','juvenile').widget.attr('value');
+    var pgWidget = findWidget('au','ident_value2').widget.attr('value');
+    if(juvWidget != false && pgWidget.trim() == '') {
+        dojo.byId('parentGuardianRequired').style.display = 'inline';
+        return;
+    }
+    _uEditSave(true); 
+}
 
 function _uEditSave(doClone) {