From e496677ac92bcf5bc571fbec3b5ae0a11466cbbf Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Tue, 13 Nov 2007 16:20:37 -0600
Subject: [PATCH] Beginning redesign of the OPAC. At this stage it's a move to
 make it more like the dev_week design, but this is only a starting point.
 This commit makes most OPAC page layouts very broken.

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
---
 C4/Search.pm                                  |  18 +-
 koha-tmpl/opac-tmpl/prog/en/css/colors.css    | 418 ------------
 koha-tmpl/opac-tmpl/prog/en/css/opac.css      | 620 +++++++++---------
 .../includes/doc-head-close-basket-print.inc  |   5 +-
 .../en/includes/doc-head-close-basket.inc     |   4 +-
 .../en/includes/doc-head-close-results.inc    |   1 -
 .../prog/en/includes/doc-head-close.inc       |  15 +-
 .../opac-tmpl/prog/en/includes/masthead.inc   |  33 +-
 .../opac-tmpl/prog/en/includes/navigation.inc |  10 +-
 .../prog/en/includes/opac-bottom.inc          |  25 +-
 .../opac-tmpl/prog/en/modules/kohaerror.tmpl  |   2 +
 .../prog/en/modules/maintenance.tmpl          |   2 +
 .../prog/en/modules/opac-ISBDdetail.tmpl      |  12 +-
 .../prog/en/modules/opac-MARCdetail.tmpl      |   3 +-
 .../prog/en/modules/opac-account.tmpl         |   4 +-
 .../en/modules/opac-addbybiblionumber.tmpl    |   4 +-
 .../prog/en/modules/opac-advsearch.tmpl       |   4 +-
 .../opac-tmpl/prog/en/modules/opac-auth.tmpl  |   4 +-
 .../en/modules/opac-authorities-home.tmpl     |   3 +-
 .../en/modules/opac-authoritiesdetail.tmpl    |   3 +-
 .../opac-authoritiessearchresultlist.tmpl     |   3 +-
 .../prog/en/modules/opac-basket.tmpl          |  35 +-
 .../prog/en/modules/opac-browser.tmpl         |   3 +-
 .../prog/en/modules/opac-detail.tmpl          |  25 +-
 .../prog/en/modules/opac-detailprint.tmpl     |   3 +-
 .../prog/en/modules/opac-dictionary.tmpl      |   4 +-
 .../en/modules/opac-full-serial-issues.tmpl   |  15 +-
 .../opac-tmpl/prog/en/modules/opac-main.tmpl  | 102 +--
 .../prog/en/modules/opac-passwd.tmpl          |   5 +-
 .../prog/en/modules/opac-readingrecord.tmpl   |   4 +-
 .../prog/en/modules/opac-recacquisitions.tmpl |   2 +
 .../prog/en/modules/opac-reserve.tmpl         |   3 +-
 .../prog/en/modules/opac-results.tmpl         | 152 +++--
 .../prog/en/modules/opac-review.tmpl          |   6 +-
 .../prog/en/modules/opac-sendbasketform.tmpl  |   3 +-
 .../prog/en/modules/opac-serial-issues.tmpl   |   2 +
 .../prog/en/modules/opac-shelves.tmpl         |   1 +
 .../prog/en/modules/opac-showreviews.tmpl     |   6 +-
 .../prog/en/modules/opac-suggestions.tmpl     |   2 +
 .../prog/en/modules/opac-tags_subject.tmpl    |   3 +-
 .../prog/en/modules/opac-topissues.tmpl       |   3 +-
 .../opac-tmpl/prog/en/modules/opac-user.tmpl  |   4 +-
 .../prog/en/modules/opac-userdetails.tmpl     |   4 +-
 .../prog/en/modules/opac-userupdate.tmpl      |   4 +-
 opac/opac-search.pl                           |   2 +-
 45 files changed, 575 insertions(+), 1011 deletions(-)

diff --git a/C4/Search.pm b/C4/Search.pm
index 9d506bd650..9d345d4a22 100644
--- a/C4/Search.pm
+++ b/C4/Search.pm
@@ -1028,16 +1028,16 @@ sub searchResults {
 				$term =~ s/\*//g;
 
                 #FIXME: is there a better way to do this?
-                $oldbiblio->{'title'} =~ s/$term/<span class=term>$&<\/span>/gi;
+                $oldbiblio->{'title'} =~ s/$term/<span class=\"term\">$&<\/span>/gi;
                 $oldbiblio->{'subtitle'} =~
-                  s/$term/<span class=term>$&<\/span>/gi;
-
-                $oldbiblio->{'author'} =~ s/$term/<span class=term>$&<\/span>/gi;
-                $oldbiblio->{'publishercode'} =~ s/$term/<span class=term>$&<\/span>/gi;
-                $oldbiblio->{'place'} =~ s/$term/<span class=term>$&<\/span>/gi;
-                $oldbiblio->{'pages'} =~ s/$term/<span class=term>$&<\/span>/gi;
-                $oldbiblio->{'notes'} =~ s/$term/<span class=term>$&<\/span>/gi;
-                $oldbiblio->{'size'}  =~ s/$term/<span class=term>$&<\/span>/gi;
+                  s/$term/<span class=\"term\">$&<\/span>/gi;
+
+                $oldbiblio->{'author'} =~ s/$term/<span class=\"term\">$&<\/span>/gi;
+                $oldbiblio->{'publishercode'} =~ s/$term/<span class=\"term\">$&<\/span>/gi;
+                $oldbiblio->{'place'} =~ s/$term/<span class=\"term\">$&<\/span>/gi;
+                $oldbiblio->{'pages'} =~ s/$term/<span class=\"term\">$&<\/span>/gi;
+                $oldbiblio->{'notes'} =~ s/$term/<span class=\"term\">$&<\/span>/gi;
+                $oldbiblio->{'size'}  =~ s/$term/<span class=\"term\">$&<\/span>/gi;
             }
         }
 
diff --git a/koha-tmpl/opac-tmpl/prog/en/css/colors.css b/koha-tmpl/opac-tmpl/prog/en/css/colors.css
index 65db541668..e69de29bb2 100644
--- a/koha-tmpl/opac-tmpl/prog/en/css/colors.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/colors.css
@@ -1,418 +0,0 @@
-/* COLORS, BACKGROUNDS, AND BORDERS */
-
-a {
-	color : #006699;
-}
-
-a:active {
-	color : #990033;
-}
-
-a:visited {
-	color : #006699;
-}
-
-a:hover {
-	color : #990033;
-}
-
-a:link.current {
-	background-color : transparent;
-	color : #3366CC;
-}
-
-a:hover.current {
-	background-color : #CCFF00;
-	color : #CC3333;
-}
-
-a:visited.current {
-	background-color : transparent;
-	color : #3366CC;
-}
-
-a:active.current {
-	background-color : #99CC00;
-	color : #FFFF99;
-}
-
-a:link.nav {
-	background-color : #EFF1DC;
-	border : 1px solid #CCCC99;
-	color : #3366CC;
-}
-
-a:hover.nav {
-	background-color : #FFFFCC;
-	border : 1px solid #CCCC99;
-	color : #CC3333;
-}
-
-a:active.nav {
-	background-color : #FFFFCC;
-	border : 1px solid #CCCC99;
-	color : #D25500;
-}
-
-a:visited.nav {
-	background-color : #EFF1DC;
-	border : 1px solid #CCCC99;
-	color : #3366CC;
-}
-
-.menu a:link.logout {
-	background-color : #FFDD75;
-	color : Black;
-}
-
-.menu a:active.logout {
-	background-color : #FFDD75;
-	color : Black;	
-}
-
-
-.menu a:visited.logout {
-	background-color : #FFDD75;
-	color : Black;
-}
-
-.menu a:hover.logout {
-	background-color : #FFCC33;
-	color : Black;
-}
-
-body {
-	background-color : #FFFFFF;
-}
-
-caption {
-	color : #000066;
-}
-
-div.form, div.details {
-	background-color : #FFFFFF;
-}
-
-h1,h2,h3,h4,h5,h6 {
-	color : #000066;
-}
-
-h1.logo {
-	color : #D3DFAD;
-}
-
-p.error, div.error {
-	background-color : #FFFFCC;
-	border : 1px dashed #cc6600;
-}
-
-div.error h3 {
-	color : #990000;
-}
-
-table {
-	background-color : #ffffff;
-}
-
-td {
-	border-bottom : 1px solid #DDDDDD;
-	border-right : 1px solid #DDDDDD;
-}
-
-th {
-	background-color : #EFF1DC;
-	border-bottom : 1px solid #CCCCCC;
-	border-right : 1px solid #CCCCCC;
-}
-
-th[scope="row"] {
-	background-color : #E7E7CA;
-}
-
-tr.highlight th[scope="row"] {
-	background-color : #EEEEEE;
-}
-
-th:last-child {
-	background-color : #EFF1DC;
-	border-bottom : 1px solid #CCCCCC;
-	border-right : 0 solid #CCCCCC;
-}
-
-td.input, div.form td, div.details td {
-	border-bottom : 1px solid #CCCCCC;
-	border-left : 0;
-	border-right : 0;
-	color : #000000;
-}
-
-td.label, div.form th, div.details th {
-	background-color : #FFF;
-	border-bottom : 1px solid #CCCCCC;
-	border-left : 1px solid #CCCCCC;
-	border-right : 0;
-	border-top : 0;
-	color : #000088;
-}
-
-td.label {
-	border-bottom : 1px solid #CCCCCC;
-	border-left : 1px solid #CCCCCC;
-	color : #000088;
-}
-
-td:last-child {
-	border-bottom : 1px solid #CCCCCC;
-	border-right : 0 solid #CCCCCC;
-}
-
-tr.highlight {
-	background-color : #F8F8EB;
-}
-
-.content-block {
-	background-color : #FFFFFF;
-}
-
-.current {
-	background-color : #FFFFFF;
-	color : #3366CC;
-}
-
-.further {
-	color: #CCCC99;
-	border: 2px solid #DDDED3;
-	background-color : #EEEEEB;
-}
-
-.further h4 {
-	background-color : #D8DEB8;
-}
-
-.further li {
-	border-bottom : 1px solid #DDDED3;
-	}
-
-.detail-sidebar {
-	background-color : #EEEEEB;
-}
-
-.operations li a, .operations li a:visited {
-	border: 2px solid #D8DEB8;
-	color: #FFFFCC;
-	background-color : #6699CC;
-}
-
-.operations li a:hover {
-	color: #FFFF99;
-	background-color: #0099FF;
-}
-
-.operations li a:active {
-	color: : #FFFF99;
-	background-color: #0099FF;
-}
-
-.loggedin {
-	color : #D8DEB8;
-}
-
-.marctag {
-	color : #000000;
-	background-color : #E7E7CA;
-}
-
-.marcsubfieldletter {
-	background-color: #EFF1DC;
-}
-
-.marcsubfieldname {
-	background-color: #EFF1DC;
-}
-
-.subfield {
-	background-color: #EFF1DC;
-}
-
-.subfieldvalue {
-	background-color : #FFFFFF;
-}
-
-.menu {
-	color : #000000;
-}
-
-#members a {
-	text-decoration : none;
-}
-
-.menu a:link, #members a:link {
-	color : #0099CC;
-}
-
-.menu a:visited, #members a:visited {
-	color : #0099CC;
-}
-
-.menu a:hover, #members a:hover {
-	color : #990000;
-}
-
-.menu a:active, #members a:active {
-	color : #990000;
-}
-
-.opac-detail {
-	background-color : #FFFFCC;
-}
-
-em.new {
-	color : #CC3333;
-}
-
-.note {
-	background-color : #EEEEEB;
-	border-left : 1px solid #DDDED3;
-	border-top : 1px solid #DDDED3;
-	border-right : 1px solid #DDDED3;
-	border-bottom : 1px solid #DDDED3;
-}
-.opac-detail dd {
-	border-bottom : 1px solid #E7E7CA;
-	color : #000000;
-}
-
-.submit {
-	background-color : #6699CC;
-	color : #FFFFCC;
-}
-
-input.icon {
-	background-color : #6699CC;
-	color : #FFFFCC;
-}
-
-#footer {
-	border-top : 1px solid #EEEEEE;
-}
-
-#main {
-	background-color : transparent;
-	border-right  : 1px solid #EEEEEE;
-}
-
-#window {
-	background-color : #E7E7CA;
-	border-left : 1px solid #CCCC99;
-}
-
-#masthead {
-	background-color : White;
-	border-bottom : 1px solid #EEEEEE;
-}
-
-#nav {
-	background-color : #EFF1DC;
-}
-
-#nav ul li {
-	background-color : #EFF1DC; /*width : 100%;*/
-	border-bottom : 1px solid #CCCC99;
-	border-left : 0 solid #FFFFCC;
-	border-right : 0 solid #006699;
-	border-top : 0 solid #FFFFCC;
-}
-
-#nav ul li+li {
-	border-bottom : 1px solid #CCCC99;
-	border-left : 0 solid #FFFFCC;
-	border-right : 0 solid #006699;
-}
-
-#nav li ul li {
-	background-color : #E7E7CA;
-	border-bottom : 1px solid #D8DEB8;
-	border-left : 0 solid #FFFFCC;
-	border-right : 0 solid #006699;
-	border-top : 0 solid #FFFFCC;
-}
-
-#nav li ul li a {
-	color: Blue;
-}
-
-#nav li ul li a:link {
-	color: #359;
-}
-
-#nav li ul li a:visited {
-	color: #359;
-}
-
-#nav li ul li a:hover {
-	color: #CC3333;
-}
-
-#results, .results {
-	color : #000066;
-}
-
-#sidebar {
-	background-color : #F8F8EB;
-	border : 1px dashed #666666;
-}
-
-#sidebar h3 {
-	color : #000066;
-}
-
-#sidebar .submit {
-	background-color : #6699CC;
-	color : #FFFFCC;
-}
-
-#search-sidebar {
-	background-color : #F8F8EB;
-}
-
-.sidebar-box {
-	border : 1px dashed #cccccc;
-}
-
-.issued {
-	color : #999999;
-}
-
-tr.overdue td {
-	background-color : #fea7a7;
-}
-
-td.overdue {
-	color : #cc0000;
-}
-
-	
-#members {
-	background-color : transparent;
-	border : 0px dashed #666666;
-	color : #000066;
-	}
-
-#members a.logout {
-	background-color : #FFDD75;
-	color : Black;
-}
-
-#members a:hover.logout {
-	background-color : #FFCC33;
-}
-
-.loggedinusername {
-	color : #666666;
-}
-
-/* Amazon CSS Stuff */
-
-#itemReviews dt {
-        border-bottom: 1px solid #ddd;
-}
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
index 86abb314b5..ac200bfd6a 100644
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -1,445 +1,415 @@
-@import url("/intranet-tmpl/prog/en/lib/yui/reset-fonts-grids.css");
+@import url("/opac-tmpl/prog/en/lib/yui/reset-fonts-grids.css");  
 
-/* color scheme :
-- #6699CC smooth blue for buttons background
-- #FFFFCC smooth yellow for button text
-- grey (
-
-- #990033 (red) for hovered links
-- #384b73 : light blue, for menus, text enhancement, footer & header
+a {
+	font-weight : bold;
+}
 
-- #eeeeee : light grey, for background color
-- #CCCCCC : for table backgrounds
-- #6BA037 : green for action buttons
-*/
+a, a:visited {
+	color : #006699;
+}
 
-/* attribute for standard html tags */
+a:hover {
+	text-decoration : none;
+	color : #990033;
+}
 
 body {
-    font-family : Verdana, Geneva, Arial, sans-serif;
-    font-size : 1em;
-    background-color : white;
-    text-align: left;
-    margin-bottom:0px;
+	background-color : white;
+	text-align : left;
+}
+
+caption {
+	font-size : 140%;
+	text-align : left;
+	font-weight : bold;
+}
+
+fieldset {
+	border : 1px solid #dddddd;
 }
 
 h1 {
-    padding-top:25px;
-    color: #384b73;
-    font-size:1.5em;
-    text-align:left;
+	font-size : 138.5%;
 }
 
-h2 {
-    color:#384b73;
+h1#libraryname {
+	font-weight : normal;
+	margin : .2em 0 .2em .5em;
 }
 
-h3 {
-    color:#384b73;
+h1#libraryname a {
+	text-decoration : none;
 }
 
-p {
-    margin:0px;
-    padding:0px;
-    clear:left;
+h1#libraryname a:hover {
+	color : #384B73;
 }
 
-label {
-    vertical-align:top;
-    display:block;
-    float:left;
-    margin-right:0.2em;
-    width:10em;
-    font-size:0.8em;
+h1,h2,h3,h4,h5,h6 {
+	font-weight : bold;
+	margin : .5em 0;
 }
 
-a:link, a:visited, a:active {
-    text-decoration : none;
-    color :#384b73;
+h2 {
+	font-size : 131%;
 }
 
-a:hover {
-    text-decoration : none;
-    color: #990033;
+h3 {
+	font-size : 123.1%;
+}
 
+h4 {
+	font-size : 116%;
 }
 
-fieldset {
-    display:inline;
-    border: 1px solid #384b73;
-    background-color:#F9F9FF;
+h5 {
+	font-size : 108%;
 }
 
-table {
-    border-collapse : collapse;
-    border : 1px solid #CCCCCC;
-    margin : 1em 0;
+h6 {
+	font-size : 100%;
 }
 
-caption {
-    font-size : 140%;
-    text-align : left;
-    font-weight : bold;
+input[type=submit], input[type=button], input[type=reset] {
+	background-color : #6BA037;
+	color : #FFFFFF;
+	font-weight : bold;
+	padding : 2px;
+}
+
+p.searchresults {
+	background-color : #EFF1DC;
+}
+
+table {
+	border-collapse : collapse;
+	margin : 1em 0;
+	border-right : 1px solid #dddddd;
+	border-top : 1px solid #dddddd;
 }
 
 td,th {
-    border : 1px solid #CCCCCC;
-    border-bottom : 1px solid #CCCCCC;
-    padding : 5px;
+	border-left : 1px solid #dddddd;
+	border-bottom : 1px solid #dddddd;
+	padding : 5px;
 }
 
 th {
-    background:url( /opac-tmpl/prog/images/member-menu-background.gif);
-    background-repeat:repeat-x;
-    background-color:#ADC4E2;
-    color:#096C9D;
-    font-size:0.8em;
-    border : 1px solid #CCCCCC;
-    border-right: 1px solid #CCCCCC;
+	background-color : #eeeeee;
 }
 
 th[scope=row] {
-    text-align : right;
+	text-align : right;
 }
 
-input[type=submit], input[type=button], input[type=reset] {
-    background-color : #6BA037;
-    color : #FFFFFF;
-    font-size : 0.8em;
-    font-weight : bold;
-    border: 1px outset #666666;
+tr.highlight td, tr.highlight th {
+	background-color : #EEEEEE;
+	border : 1px solid #DDDDDD;
+	border-right : 1px solid #DDDDDD;
+}
+
+ul {
+	list-style : disc;
+	padding-left : 1em;
 }
 
 li {
-    list-style-type:square;
+	list-style : disc;
 }
 
-ul {
-    margin:0px;
+.available {
+	font-size : 0.75em;
 }
 
-/* attributes for search result list */
-.searchresults td, .searchresults th, .searchresults table {
-    border: 0;
+.inwait {
+	background-color : #33CC99;
 }
-.searchresults tr {
-    border-bottom : 1px solid #CCCCCC;
+
+/* css styles for reserves color alerts */
+.onloan {
+	background-color : #FFED3D;
 }
-.searchresults table {
-    border-top : 0px solid #CCCCCC;
-    border: 1px solid #CCCCCC;
+
+.other {
+	background-color : #FF0000;
 }
-p.searchresults {
-    background-color : #EFF1DC;
+
+/* "problem" enhancement */
+.problem {
+	color : white;
+	background-color : red;
+}
+
+.reserved {
+	background-color : #8EBAFF;
+}
+
+/* style for search terms in catalogsearch */
+.term {
+	background-color : #ffffe0;
+	color : #990033;
 }
-.searchresults a.reserve {
-    background-color : transparent;
-    color : #006699;
+
+a .term {
+	text-decoration : underline;
 }
-.searchresults table tr:hover {
-    background-color: #FFFFCC;
+
+.transfered {
+	background-color : #F9FF9A;
 }
-tr.highlight td, tr.highlight th {
-    background-color : #EEEEEE;
-    border: 1px solid #DDDDDD;
-    border-right: 1px solid #DDDDDD;
+
+.unavailable {
+	background-color : #FFED3D;
 }
 
-/* the top part of the opac : (the LibraryName) */
-#masthead {
-    color: #000066;
-    margin-left:15%;
-    text-align:left;
-    font-size:150%;
-    font-weight:bold;
-    margin-bottom:5px;
+/* action buttons */
+#action {
+	margin-top : 15px;
 }
 
-/* The image on the top-left (the logo) */
-#masthead-image {
-    position:absolute;
-    left:10px;
-    top:10px;
-    background-color:white;
+#action a {
+	background-color : #6699cc;
+	color : #eeeeee;
+	font-size : 0.8em;
+	font-weight : bold;
+	border : 1px outset #666666;
+	margin-right : 5px;
+	padding : 0 5px 0 5px;
 }
 
-#masthead-image img {
-    background-color:white;
+#action a:hover {
+	color : white;
+	border : 1px inset;
 }
 
 /* the itemtype list in advanced search */
 #advsearch-itemtype table {
-    border-collapse: separate;
-    border-spacing: 3px;
-    border : 0px;
-    margin : 0px;
-    background-color: white;
-    border: 0px solid #D8DEB8;
-}
+	border-collapse : separate;
+	border-spacing : 3px;
+	border : 0px;
+	margin : 0px;
+	background-color : white;
+	border : 0px solid #D8DEB8;
 }
+
 #advsearch-itemtype table tr td {
-    background-color: #F8F8EB;
-    border : 0px;
-    margin : 0px;
-    width:700px;
+	background-color : #F8F8EB;
+	border : 0px;
+	margin : 0px;
+	width : 700px;
 }
+
 #advsearch-itemtype td {
-    font-size:0.8em;
-    background-color:#F8F8EB;
-}
-
-/* the content part of every page */
-#main {
-    margin-left:15%;
-    margin-bottom:0px;
-}
-
-/* the main menu (home, adv search) */
-
-#menu {
-    position:absolute;
-    padding:10px;
-    left:0px;
-    top:100px;
-    width:12%;
-    font-size:0.8em;
-    font-weight:bold;
-    color:#384b73;
-    background-color:#dddddd;
-}
-#menu ul a {
-    display:block;
-    margin:5px 5px 0px 5px;
-    padding :5px 5px 0px 5px;
-    text-decoration:none;
-    color:#384b73;
-    white-space: nowrap;
-    margin:0px;
-    padding:0px;
-}
-#menu ul a:hover {
-    display:block;
-    margin:0;
-    padding :0;
-    text-decoration:none;
-    color:#990033;
-    white-space: nowrap;
-}
-#menu ul {
-    padding:0 0 0 10px;
-    margin-left:5px;
-}
-#menu li {
-    list-style-type:none;
-    margin:0px;
-    padding:0 0 10px 0;
-}
-#menu ul li {
-    list-style-type:circle;
-    margin:0px;
-    padding:0 0 10px 0;
-}
-
-
-
-/***************/
-/* login block */
-/***************/
-#login {
-    position:absolute;
-    left:0px;
-    bottom:10px;
-    font-size:0.8em;
-    background-color : #dddddd;
-    padding:10px;
-    margin-right:84%;
-    width:12%;
-}
-#login input {
-    font-size:0.8em;
-}
-#login label {
-    width:5em;
-}
-#login p {
-    margin:0px;
+	font-size : 0.8em;
+	background-color : #F8F8EB;
 }
 
-/***********************************************************/
-/* the user menu, for user option (and biblio detail view) */
-/***********************************************************/
-#usermenu {
-    float:right;
+#auth {
+	float : left;
 }
-#usermenu a {
-    background-color : #6BA037;
-    color : #FFFFFF;
-    font-size : 0.8em;
-    font-weight : bold;
-    border: 1px outset #666666;
-    display:block;
-    margin-bottom:3px;
+
+#facets {
+	
 }
-#usermenu a:hover {
-    border: 1px inset #666666;
+
+/* the footer */
+#footer {
+	margin-top : 30px;
+	margin-left : 30%;
+	margin-right : 20%;
+	border-top : 1px solid #384b73;
+	color : #384b73;
+	font-size : 1em;
+	text-align : center;
 }
 
-/* the opac-news */
-#news {
-    width:20%;
-    float:right;
-    font-size:11px;
+/* facets bloc */
+/* the USER information block */
+#librarian_information {
+	float : right;
+	font-size : 10pt;
 }
-#news th {
-background-color:white;
-color:#384b73;
+
+#members {
+	font-size : .8em;
+	font-weight : bold;
+	padding : 4px 0 4px 0;
+	background-image : url(../../images/member-menu-background.gif);
+	background-repeat : repeat-x;
+	border-top : 1px solid #9999CC;
+	border-bottom : 1px solid #9999CC;
+	background-color : #AFBCCF;
+	color : #000066;
 }
 
-/* "problem" enhancement */
-.problem {
-color: white;
-background-color:red;
+#members a {
+	text-decoration : none;
 }
 
-/* action buttons */
-#action {
-    margin-top:15px;
+#members a.card {
+	background-image : url(../images/card.gif);
+	background-position : left;
+	background-repeat : no-repeat;
+	display : block;
+	padding-left : 39px;
 }
-#action a {
-    background-color : #6699cc;
-    color : #eeeeee;
-    font-size : 0.8em;
-    font-weight : bold;
-    border: 1px outset #666666;
-    margin-right:5px;
-    padding:0 5px 0 5px;
+
+#members a.logout {
+	font-weight : bold;
+	padding : 0 .3em 0 .3em;
+	text-decoration : none;
 }
-#action a:hover {
-    color : white;
-    border: 1px inset;
+
+#members a.logout:link, #members a.logout:visited, #members a.logout:hover, #members a.logout:active {
+	background-image : url(../images/member-menu-background-logout.gif);
+	background-repeat : repeat-x;
+	color : #000000;
 }
 
-#auth {
-    float:left;
+#members a:hover.logout {
+	background-image : url(../images/member-menu-background-logout-hover.gif);
+	background-repeat : repeat-x;
+	color : #000000;
 }
 
-/* facets bloc */
-#facets {
-    position:absolute;
-    right:1em;
-    font-size:0.8em;
-    margin:0px;
-    background-color:#eeeeee;
-    border:0px;
+#members li {
+	display : inline;
+	list-style : none;
+	margin : 0;
 }
 
-#facets dl {
-    margin:0px;
-    border:1px solid #CCCCCC;
+#members ul {
+	margin : 0;
+	padding : 0;
+	text-align : right;
 }
-#facets dd {
-    margin:0px;
+
+#members ul li a:link, #members ul li a:visited, #members span.members {
+	background-image : url(../images/member-menu-background-link.gif);
+	background-repeat : repeat-x;
+	border-left : 1px solid #9999CC;
+	color : #006699;
 }
-#facets dt {
-    font-weight:bold;
-    background-color:#6BA037;
-    border: 1px outset #666666;
-    color:white;
+
+#members ul li a:link, #members ul li a:visited, #members ul li a:hover, #members ul li a:active, #members span.members {
+	padding : 4px;
 }
 
-#facets li {
-    list-style-type: none;
-    margin-left:0px;
+#members ul li a:hover {
 }
 
-#facets ul {
-    list-style-type: none;
-    padding-left:10px;
-    margin-bottom:0px;
-    margin-top:0px;
+#members ul li a:hover, #members ul li a:active {
+	background-image : url(../images/member-menu-background-hover.gif);
+	background-repeat : repeat-x;
 }
 
-/* the USER information block */
-#librarian_information {
-float:right;
-font-size:10pt;
+#members ul li:last-child {
 }
 
-/* the footer */
-#footer {
-    margin-top:30px;
-    margin-left:30%;
-    margin-right:20%;
-    border-top:1px solid #384b73;
-    color: #384b73;
-    font-size:1em;
-    text-align:center;
+#members ul li:last-child a {
+	border-right : 1px solid #9999CC;
 }
 
+#opac-main-search {
+	background-image : url( /opac-tmpl/prog/images/menu-background.gif);
+	background-repeat : repeat-x;
+	background-color : #6699CC;
+	border-top : 1px solid #335599;
+	border-bottom : 1px solid #335599;
+	padding : 15px 0 15px 10px;
+	color : #FFFFCC;
+	font-size : 108%;
+	line-height : 116%;
+}
 
-legend {
-font-weight:bold;
-color:#384b73;
+#opac-main-search a, #opac-main-search a, #opac-main-search a:visited {
+	color : #FFFFCC;
 }
 
+#opac-main-search a:hover {
+	color : #FFFFFF;
+}
 
-/* css styles for reserves color alerts */
-.onloan {
-    background-color: #FFED3D;
+#opac-main-search form {
+	display : inline;
 }
 
-.reserved {
-    background-color: #8EBAFF;
+#opac-main-search label {
+	font-weight : bold;
 }
 
-.transfered {
-    background-color: #F9FF9A;
+/***********************************************************/
+/* the user menu, for user option (and biblio detail view) */
+/***********************************************************/
+#usermenu {
+	float : right;
 }
 
-.inwait {
-    background-color: #33CC99;
+#usermenu a {
+	background-color : #6BA037;
+	color : #FFFFFF;
+	font-size : 0.8em;
+	font-weight : bold;
+	border : 1px outset #666666;
+	display : block;
+	margin-bottom : 3px;
 }
 
-.other {
-    background-color: #FF0000;
+#usermenu a:hover {
+	border : 1px inset #666666;
 }
 
-.available {
-    font-size:0.75em;
+.suggestion {
+	background-color : #EEEEEB;
+	border : 1px solid #DDDED3;
+	margin : 10px auto;
+	padding : 4px;
+	width : 35%;
 }
 
-.unavailable {
-    background-color: #FFED3D;
-    font-size:0.75em;
+#facets ul {
+	margin : 0;
+	padding : 0;
 }
 
-/* style for search terms in catalogsearch */
-.term {
-background-color:lightyellow;
-color: #990033;
+#facets ul li {
+	font-weight : bold;
+	text-align : left;
+	list-style : none;
 }
 
-#opac-main-search {
-    background-image:url( /opac-tmpl/prog/images/menu-background.gif);
-    background-repeat:repeat-x;
-    background-color: #6699CC;
-    border-top: 1px solid #335599;
-    border-bottom: 1px solid #335599;
-    margin: 0 0 0 15%;
-    padding: 15px 0 15px 10px;
-    color:#FFFFCC;
-    font-weight:bold;
-}
-#opac-main-search a {
-    color:#FFFFCC;
-}
-#opac-main-search a:visited {
-    color:#FFFFCC;
+#facets ul ul li {
+	border : 0;
+	font-size : 85%;
+	font-weight : normal;
+	padding : 2px;
+	text-align : left;
 }
-#opac-main-search a:hover {
-    color:#FFFFFF;
+
+#facets ul ul li a {
+	font-weight : normal;
+	text-decoration : underline;
 }
 
-#opac-main-search form {
-    display:inline;
+#facets h4 {
+	font-size : 93%;
+	padding:3px;
+	text-align:center;
+	background-color:#E7E7CA;
+	line-height:1.8em;
+	margin-left:-1px;
+	margin-right:-1px;
+	margin-top:-1px;
+}
+
+#breadcrumbs {
+	padding : .7em;
+}
+
+strong {
+	font-weight : bold;
+}
+
+em {
+	font-style : italic;
 }
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-basket-print.inc b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-basket-print.inc
index 465f4bd6ad..5f0868dced 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-basket-print.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-basket-print.inc
@@ -12,7 +12,4 @@
         var MSG_NO_RECORD_ADDED = "No biblio added";
         var MSG_CONFIRM_DEL_BASKET = "Are you sure you want to empty your book bag?"
         var MSG_CONFIRM_DEL_RECORDS = "Are you sure you want to remove the selected items?";
-    </script>
-
-</head>
-<body onload="print();">
\ No newline at end of file
+    </script>
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-basket.inc b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-basket.inc
index eb2724f8f4..0241f39e8e 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-basket.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-basket.inc
@@ -22,6 +22,4 @@
     var MSG_NO_RECORD_ADDED = "No biblio added";
     var MSG_CONFIRM_DEL_BASKET = "Are you sure you want to empty your book bag?"
     var MSG_CONFIRM_DEL_RECORDS = "Are you sure you want to remove the selected items?";
-</script>
-</head>
-<body>
+</script>
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-results.inc b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-results.inc
index b413dda6bf..5a4806f6b2 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-results.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-results.inc
@@ -28,4 +28,3 @@
 </script>	
 <!-- /TMPL_IF -->
 <script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/js/main.js"></script>
-</head>
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
index 7d73f2ab62..f4a578856b 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
@@ -1,7 +1,7 @@
 </title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <!-- TMPL_IF name="RSS" -->
-    <link rel="alternate" type="application/rss+xml" title="Koha - RSS" href="<!-- TMPL_VAR name="site_url"-->/opac-rss.pl?q=<!-- TMPL_VAR name="searchdesc"-->">
+    <link rel="alternate" type="application/rss+xml" title="Koha - RSS" href="<!-- TMPL_VAR name="site_url"-->/opac-rss.pl?q=<!-- TMPL_VAR name="searchdesc"-->" />
 <!-- /TMPL_IF -->
 <!-- TMPL_IF name="opacstylesheet" -->
         <style type="text/css"> 
@@ -17,10 +17,10 @@
         @import url(<!-- TMPL_VAR NAME="themelang" -->/css/<!-- TMPL_VAR NAME="opaclayoutstylesheet" -->);
     </style>
 <!-- /TMPL_IF -->
-<script type="text/javascript" language="javascript" src="../..<!-- TMPL_VAR NAME="themelang" -->/js/main.js" ></script>
-<!-- TMPL_IF NAME="AmazonContent" --><script type="text/javascript" language="javascript" src="../..<!-- TMPL_VAR NAME="themelang" -->/js/amazonimages.js" ></script><!-- /TMPL_IF -->
-<script type="text/javascript" language="javascript" src="../..<!-- TMPL_VAR NAME="themelang" -->/js/script.js" ></script>
-<script type="text/javascript" language="javascript" src="../..<!-- TMPL_VAR NAME="themelang" -->/js/basket.js" ></script>
+<script type="text/javascript" language="javascript" src="../..<!-- TMPL_VAR NAME="themelang" -->/js/main.js"></script>
+<!-- TMPL_IF NAME="AmazonContent" --><script type="text/javascript" language="javascript" src="../..<!-- TMPL_VAR NAME="themelang" -->/js/amazonimages.js"></script><!-- /TMPL_IF -->
+<script type="text/javascript" language="javascript" src="../..<!-- TMPL_VAR NAME="themelang" -->/js/script.js"></script>
+<script type="text/javascript" language="javascript" src="../..<!-- TMPL_VAR NAME="themelang" -->/js/basket.js"></script>
 <script type="text/javascript" language="javascript">
     function _(s) { return s } // dummy function for gettext
     var MSG_BASKET_EMPTY = _("You book bag is currently empty");
@@ -30,7 +30,4 @@
     var MSG_NRECORDS_IN_BASKET = _("already in the bag");
     var MSG_NO_RECORD_SELECTED = _("No item was selected");
     var MSG_NO_RECORD_ADDED = _("No item was added to your book bag");
-</script>
-
-</head>
-<body>
+</script>
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
index 1d4408b2f5..539a6e7a73 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
@@ -1,23 +1,30 @@
-<div id="masthead-image">
-        <!-- TMPL_IF NAME="opacsmallimage" -->
-        <img alt="<!-- TMPL_VAR NAME="LibraryName" -->" src="<!-- TMPL_VAR NAME="opacsmallimage" -->" />
-        <!-- TMPL_ELSE -->
-			<img src="/opac-tmpl/<!-- TMPL_VAR name="theme" -->/images/koha-logo-blue.png" alt="koha logo"/>
-
-        <!-- /TMPL_IF -->
-</div>
 <div id="masthead">
-        <!-- TMPL_VAR NAME="LibraryName" -->
+<h1 id="libraryname"><a href="/cgi-bin/koha/opac-main.pl"><!-- TMPL_VAR NAME="LibraryName" --></a></h1>
 </div>
+
+<div id="members">
+	<ul><!--TMPL_IF NAME="virtualshelves" --><li><a href="/cgi-bin/koha/opac-shelves.pl">Virtual Shelves</a></li><!-- /TMPL_IF --><!-- TMPL_IF NAME="loggedinusername" --><li><a href="/cgi-bin/koha/opac-user.pl">Your Account</a></li><!-- /TMPL_IF --><!-- TMPL_IF NAME="loggedinusername" --><li><span class="members">Logged in as <span class="loggedinusername"><!-- TMPL_LOOP NAME="USER_INFO" --><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --><!-- /TMPL_LOOP --></span></span></li><li><a class="logout" href="/cgi-bin/koha/opac-logout.pl">Log Out</a></li><!-- TMPL_ELSE --><li><a href="/cgi-bin/koha/opac-user.pl">Your Account</a></li><!-- /TMPL_IF -->
+	</ul>	
+</div>
+
 <div id="opac-main-search">
-    Search
-    <!-- TMPL_IF name="mylibraryfirst" --> <!-- TMPL_IF name="loggedinusername" -->(in <!-- TMPL_VAR name="LoginBranchcode" --> only)<!-- /TMPL_IF --><!-- /TMPL_IF -->
+   
     <form name="searchform" method="post" action="/cgi-bin/koha/opac-search.pl" id="searchform">
+	<label for="masthead_search"> Search <!-- TMPL_IF name="mylibraryfirst" --> <!-- TMPL_IF name="loggedinusername" -->(in <!-- TMPL_VAR name="LoginBranchcode" --> only)<!-- /TMPL_IF --><!-- /TMPL_IF --></label>
+	<select name="idx" id="masthead_search">
+        <option selected="selected" value="">Library Catalog</option>
+        <option value="ti">Title</option>
+        <option value="au">Author</option>
+        <option value="su">Subject</option>
+		<option value="isbn">ISBN</option>
+        <option value="se">Series</option>
+        <option value="callnum">Call Number</option>
+</select>
         <input type="text" name="q" style="width: 30%;" />
         <!-- TMPL_IF name="mylibraryfirst" --><!-- TMPL_IF name="loggedinusername" -->
             <input name="limit" value="<!-- TMPL_VAR name="LoginBranchcode" -->" type="hidden" />
         <!-- /TMPL_IF --><!-- /TMPL_IF -->
-        <input type="submit" value="OK" class="submit" />
+        <input type="submit" value="Search" class="submit" />
     </form>
-    <a href="/cgi-bin/koha/opac-search.pl">more search options</a>
+     <a href="/cgi-bin/koha/opac-search.pl">Advanced Search</a>
 </div>
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc b/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc
index 5643485963..cc93252591 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc
@@ -1,11 +1,11 @@
 <div id="menu">
-			
+            
+            <ul>			
             <!-- TMPL_VAR NAME="OpacNav" -->
             <li><a href="/cgi-bin/koha/opac-main.pl">Search Home</a></li>
             <li><a href="/cgi-bin/koha/opac-search.pl">Advanced Search</a></li>
             <li>Browse catalogue:</li>
-            
-            <ul>
+
             <!-- TMPL_IF name="OpacBrowser" -->
                 <li><a href="/cgi-bin/koha/opac-browser.pl">by hierarchy</a></li>
             <!-- /TMPL_IF -->
@@ -27,7 +27,6 @@
                     </script></span>
                 </a>
             </li>
-            </ul>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF NAME="loggedinusername" -->
                 <!-- TMPL_IF name="virtualshelves" -->
@@ -37,7 +36,6 @@
                     <li><a href="opac-suggestions.pl">Suggestions</a></li>
                 <!-- /TMPL_IF -->
             <!-- /TMPL_IF -->
+            </ul>
             
  </div>
-
- <div id="main"> <!-- MAIN Body start here -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc
index c01fe50f15..bdeff07b62 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc
@@ -1,28 +1,9 @@
-</div>
-<!-- TMPL_IF NAME="opacuserlogin" -->
-<div id="login">
-    <!-- TMPL_IF NAME="loggedinusername" -->
-        <a href="/cgi-bin/koha/opac-user.pl"><b>User Info</b></a>
-        <p>Logged in as: <b> <!-- TMPL_VAR NAME="loggedinusername" --> </b></p>
-        <p><a href="/cgi-bin/koha/opac-logout.pl?logout=Log Out">Log Out</a></p>
-    <!-- TMPL_ELSE -->
-        <form action="/cgi-bin/koha/opac-user.pl" method="post" name="auth" id="auth">
-            <p>Login:</p>
-            <input type="text" id="userid" size="10" name="userid" />
-            <p>Pass:</p>
-            <input type="password" id="password" size="10" name="password" />
-            <p>
-                <input type="submit" value="Log In" class="submit" />
-            </p>
-       </form>
-    <!-- /TMPL_IF -->
-</div>
-<!-- /TMPL_IF -->
+
 <!-- TMPL_IF NAME="opaccredits" -->
-    <div id="footer">
+    <div id="ft">
         <!-- TMPL_VAR NAME="opaccredits" -->
     </div>
 <!-- /TMPL_IF -->
-
+</div>
 </body>
 </html>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/kohaerror.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/kohaerror.tmpl
index 7274e5650b..a06afc20b2 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/kohaerror.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/kohaerror.tmpl
@@ -1,5 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- An Error Has Occurred
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+</head>
+<body>
 <!--TMPL_INCLUDE NAME="masthead.inc" -->
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/maintenance.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/maintenance.tmpl
index 9240688760..f1c1bc644f 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/maintenance.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/maintenance.tmpl
@@ -1,6 +1,8 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <!-- TMPL_VAR NAME="LibraryNameTitle" --> -- Library Catalog
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+</head>
+<body>
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 
 <div id="main">
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl
index 1be9aec25e..36906ec296 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl
@@ -1,6 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- ISBD
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
+</head>
+<body>
 <!--TMPL_INCLUDE NAME="masthead.inc" -->
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 
@@ -50,14 +51,11 @@
                 <tr><th>Issue number</th><th>Date</th><th>Status</th></tr>
                 <!--TMPL_LOOP Name="latestserials"-->
                     <tr>
-                        <td>
-                            <!--TMPL_VAR Name="serialseq"-->
+                        <td>            <!--TMPL_VAR Name="serialseq"-->
                         </td>
-                        <td>
-                            <!--TMPL_VAR Name="planneddate"-->
+                        <td>            <!--TMPL_VAR Name="planneddate"-->
                         </td>
-                        <td>
-                            <!--TMPL_IF Name="status1"-->Pending
+                        <td>            <!--TMPL_IF Name="status1"-->Pending
                             <!--TMPL_ELSE -->
                                 <!-- TMPL_IF Name="status2"-->Arrived
                                 <!--TMPL_ELSE -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl
index c9eaf518df..16248f56b7 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl
@@ -1,6 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- MARC Details for Record No. <!-- TMPL_VAR name="biblionumber" -->
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
+</head>
+<body>
 <!--TMPL_INCLUDE NAME="masthead.inc" -->
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tmpl
index 19fa9a0ed2..23a86fd9bf 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tmpl
@@ -1,5 +1,7 @@
 <!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- Account for <!-- TMPL_LOOP name="BORROWER_INFO" --><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --><!-- /TMPL_LOOP -->
-<!-- TMPL_INCLUDE name="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+</head>
+<body>
 <!-- TMPL_INCLUDE name="masthead.inc" -->
 <!-- TMPL_INCLUDE name="navigation.inc" -->
 
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-addbybiblionumber.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-addbybiblionumber.tmpl
index 62c38c55d6..58578cef30 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-addbybiblionumber.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-addbybiblionumber.tmpl
@@ -1,8 +1,8 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- Add to My Virtual Shelf
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-
+</head>
+<body>
 <!-- TMPL_IF NAME="multiple"-->
     <h1>Add these <!-- TMPL_VAR NAME="total"--> biblios to a shelf</h1>
         <!-- TMPL_LOOP NAME="biblios"-->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl
index 84657e9ad7..df5dd8d2d7 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl
@@ -2,8 +2,8 @@
 <!-- TMPL_VAR NAME="LibraryNameTitle" -->
     Catalog -- Advanced Search
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!--TMPL_INCLUDE NAME="masthead-basic.inc" -->
+</head>
+<body><!--TMPL_INCLUDE NAME="masthead-basic.inc" -->
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 
 
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tmpl
index 0659ab02bb..67d4a0e45e 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tmpl
@@ -1,5 +1,7 @@
 <!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- Log in to Your Account
-<!-- TMPL_INCLUDE name="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+</head>
+<body>
 <!-- TMPL_INCLUDE name="masthead.inc" -->
 <!-- TMPL_INCLUDE name="navigation.inc" -->
 
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authorities-home.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authorities-home.tmpl
index 0afb0ca3b3..6a84e83a02 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authorities-home.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authorities-home.tmpl
@@ -1,6 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> -- Library Catalog
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
+</head>
+<body>
 <!--TMPL_INCLUDE NAME="masthead.inc" -->
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiesdetail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiesdetail.tmpl
index ba2768f6dc..ef30081c14 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiesdetail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiesdetail.tmpl
@@ -3,7 +3,8 @@
 <!-- TMPL_IF Name="displayhierarchy"-->
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/hierarchy.css">
 <!--/TMPL_IF-->
-<body<!-- TMPL_IF NAME="OpacNav" --> id="withnav"<!-- /TMPL_IF -->>
+</head>
+<body>
 <!--TMPL_INCLUDE NAME="masthead.inc" -->
 
 <div id="main">
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tmpl
index 1ce47258ef..a177624f4a 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tmpl
@@ -1,6 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> -- Library Catalog
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
+</head>
+<body>
 <!--TMPL_INCLUDE NAME="masthead.inc" -->
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl
index e802403ca7..4e90b42ddd 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl
@@ -6,6 +6,8 @@
     <!-- TMPL_ELSE -->
     <!-- TMPL_INCLUDE NAME="doc-head-close-basket.inc" -->
 <!-- /TMPL_IF -->
+</head>
+<body>
 
 <div> <!-- main -->
 
@@ -67,11 +69,9 @@
         <!-- TMPL_IF name="MARCAUTHORS" -->
         <tr>
             <th scope="row">Authors</th>
-            <td>
-                <!-- TMPL_LOOP NAME="MARCAUTHORS" -->
+            <td><!-- TMPL_LOOP NAME="MARCAUTHORS" -->
                     <!-- TMPL_VAR NAME="value" -->
-            <!-- /TMPL_LOOP -->
-            </td>
+            <!-- /TMPL_LOOP --></td>
         </tr>
         <!-- /TMPL_IF -->
         
@@ -98,11 +98,9 @@
         <!-- TMPL_IF name="MARCSUBJCTS" -->
         <tr>
             <th scope="row">Subjects</th>
-            <td>
-                <!-- TMPL_LOOP NAME="MARCSUBJCTS" -->
+            <td><!-- TMPL_LOOP NAME="MARCSUBJCTS" -->
                     <p><!-- TMPL_VAR NAME="label" --></p>
-            <!-- /TMPL_LOOP -->
-            </td>
+            <!-- /TMPL_LOOP --></td>
         </tr>
         <!-- /TMPL_IF -->
     
@@ -118,8 +116,7 @@
             <td>
             <!-- TMPL_LOOP NAME="MARCNOTES" -->
                 <p>- <!-- TMPL_VAR NAME="marcnote" --></p>
-            <!-- /TMPL_LOOP -->
-            </td>
+            <!-- /TMPL_LOOP --></td>
         </tr>
         <!-- /TMPL_IF -->
     
@@ -160,16 +157,14 @@
         </tr><!-- /TMPL_IF -->
         <tr>
             <th scope="row">Location</th>
-            <td>
-                <!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
+            <td><!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
                 <p>
                     <!-- TMPL_VAR NAME="branchname" --> <!-- TMPL_VAR NAME="location" -->
                     <!-- TMPL_IF name="itemcallnumber" -->
                         (<!-- TMPL_VAR NAME="itemcallnumber" -->)
                     <!-- /TMPL_IF -->
                 </p>
-                <!-- /TMPL_LOOP -->
-            </td>
+                <!-- /TMPL_LOOP --></td>
         </tr>
     </table>
     <!-- /TMPL_LOOP -->
@@ -182,8 +177,7 @@
             <!-- TMPL_ELSE -->
                 <tr>
             <!-- /TMPL_IF -->
-            <td>
-                <form>
+            <td><form>
                     <!-- TMPL_UNLESS NAME="print_basket" -->
                         <label for="bib<!-- TMPL_VAR NAME="biblionumber" -->">
                         </label>
@@ -194,11 +188,9 @@
                             id="bib<!-- TMPL_VAR NAME="biblionumber" -->"
                             onclick="selRecord(value,checked);">
                     <!-- /TMPL_UNLESS -->
-                </form>
-            </td>
+                </form></td>
             <td><!-- TMPL_VAR name="itemtype" --></td>
-            <td>
-                <p>
+            <td><p>
                     <a href="#" onclick="openBiblio('<!-- TMPL_VAR name="dest" -->',<!-- TMPL_VAR name="biblionumber" -->)">
                         <!-- TMPL_VAR NAME="title" -->
                     </a>
@@ -210,8 +202,7 @@
                         <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="notes" -->
                         <p><!-- TMPL_VAR name="notes" --></p>
-                        <!-- /TMPL_IF -->
-            </td>
+                        <!-- /TMPL_IF --></td>
             <td><!-- TMPL_VAR NAME="classification" --></td>
             </tr>
         <!-- /TMPL_LOOP -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-browser.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-browser.tmpl
index 5dbdf0fe54..2bcf494ee6 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-browser.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-browser.tmpl
@@ -1,6 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- ISBD
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
+</head>
+<body>
 <!--TMPL_INCLUDE NAME="masthead.inc" -->
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
index 31b2abd3ce..45c67a66f5 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
@@ -1,6 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- Details for: <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" --><!-- TMPL_VAR NAME="title" --><!-- /TMPL_LOOP -->
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
+</head>
+<body>
 <!--TMPL_INCLUDE NAME="masthead.inc" -->
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 
@@ -187,8 +188,7 @@
         <tr>
             <td><!-- TMPL_VAR NAME="description" --></td>
             <td><!-- TMPL_VAR NAME="branchname" --> <!-- TMPL_VAR name="location" --> <!-- TMPL_IF NAME="itemcallnumber" --> <!-- TMPL_VAR NAME="itemcallnumber" --><!-- /TMPL_IF --></td>
-            <td>
-                <!-- TMPL_IF name="bi_notforloan" -->
+            <td><!-- TMPL_IF name="bi_notforloan" -->
                     Not for loan
                 <!-- TMPL_ELSE -->
                     <!-- TMPL_IF name="datedue" -->
@@ -208,14 +208,11 @@
                             <!-- /TMPL_IF -->
                         <!-- /TMPL_IF -->
                     <!-- /TMPL_IF -->
-                <!-- /TMPL_IF -->
-            </td>
+                <!-- /TMPL_IF --></td>
             <td><!-- TMPL_VAR NAME="datedue" --></td>
             <td><!-- TMPL_VAR NAME="volumeddesc" --></td>
             <!-- TMPL_IF NAME="type" -->
-            <td>
-                <a href="/cgi-bin/koha/maint/catmaintain.pl?type=fixitemtype&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->&amp;item=<!-- TMPL_VAR NAME="itemtype" -->">Fix Itemtype</a>
-            </td>
+            <td><a href="/cgi-bin/koha/maint/catmaintain.pl?type=fixitemtype&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->&amp;item=<!-- TMPL_VAR NAME="itemtype" -->">Fix Itemtype</a></td>
             <!-- /TMPL_IF -->
         </tr>
         <!-- /TMPL_LOOP -->
@@ -240,14 +237,11 @@
             <th>Note</th>
             <!--TMPL_LOOP Name="latestserials"-->
             <tr>
-                <td>
-                    <!--TMPL_VAR Name="serialseq"-->
+                <td>    <!--TMPL_VAR Name="serialseq"-->
                 </td>
-                <td>
-                    <!--TMPL_VAR Name="planneddate"-->
+                <td>    <!--TMPL_VAR Name="planneddate"-->
                 </td>
-                <td>
-                    <!--TMPL_IF Name="status1"-->Waited
+                <td>    <!--TMPL_IF Name="status1"-->Waited
                     <!--TMPL_ELSE -->
                     <!-- TMPL_IF Name="status2"-->Arrived
                     <!--TMPL_ELSE -->
@@ -262,8 +256,7 @@
                     <!--/TMPL_IF-->
                     <!--/TMPL_IF-->
                 </td>
-                <td>
-                    <!--TMPL_VAR Name="notes"-->
+                <td>    <!--TMPL_VAR Name="notes"-->
                 </td>
             </tr>
             <!--/TMPL_LOOP -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detailprint.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detailprint.tmpl
index 0c6285c7d2..c0cf192097 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detailprint.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detailprint.tmpl
@@ -1,6 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- Details for: <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" --><!-- TMPL_VAR NAME="title" --><!-- /TMPL_LOOP -->
 <!-- TMPL_INCLUDE NAME="doc-head-close-basket-print.inc" -->
-
+</head>
+<body>
 <div id="window">
 <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
 <h2><!-- TMPL_VAR NAME="title" --> <!-- TMPL_IF NAME="subtitle" -->: <!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_IF -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-dictionary.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-dictionary.tmpl
index 89e3166505..e45e1c229e 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-dictionary.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-dictionary.tmpl
@@ -1,6 +1,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Dictionary Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<div id="window">
+</head>
+<body><div id="window">
 	<h1>Dictionary Search</h1>
 	
 <form name="f" method="post" action="opac-dictionary.pl">
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tmpl
index a47cd10ccb..0877244075 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tmpl
@@ -1,6 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- Serials
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
+</head>
+<body>
 <!--TMPL_INCLUDE NAME="masthead.inc" -->
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 
@@ -33,17 +34,13 @@
             </tr>
             <!-- TMPL_LOOP Name="serials" -->
             <tr>
-                <td>
-                    <!-- TMPL_VAR Name="publisheddate" -->
+                <td>    <!-- TMPL_VAR Name="publisheddate" -->
                 </td>
-                <td>
-                    <!-- TMPL_VAR Name="planneddate" -->
+                <td>    <!-- TMPL_VAR Name="planneddate" -->
                 </td>
-                <td>
-                    <!-- TMPL_VAR Name="serialseq" -->
+                <td>    <!-- TMPL_VAR Name="serialseq" -->
                 </td>
-                <td>
-                    <!-- TMPL_IF Name="status1" -->Waited<!-- /TMPL_IF -->
+                <td>    <!-- TMPL_IF Name="status1" -->Waited<!-- /TMPL_IF -->
                     <!-- TMPL_IF Name="status2" -->Arrived<!-- /TMPL_IF -->
                     <!-- TMPL_IF Name="status3" -->Late<!-- /TMPL_IF -->
                     <!-- TMPL_IF Name="status4" -->Missing<!-- /TMPL_IF -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tmpl
index 5b23195d08..58ba21dbfd 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tmpl
@@ -1,22 +1,23 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <!-- TMPL_VAR NAME="LibraryNameTitle" --> -- Library Catalog
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
+</head>
+<body>
 <!--TMPL_INCLUDE NAME="masthead.inc" -->
-<!--TMPL_INCLUDE NAME="navigation.inc" -->
 
-<!-- TMPL_IF name="koha_news_count" -->
+<div id="doc3" class="yui-t1">
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-ge">
+    <div class="yui-u first">
+	<!-- YOUR DATA GOES HERE -->
+	<!-- TMPL_IF name="koha_news_count" -->
 <div id="news">
     <table>
     <!-- TMPL_LOOP name="koha_news" -->
-    <tr>
-        <th>
-            <!-- TMPL_VAR name="title" -->
-        </th>
-        <tr><td>
-                <p><!-- TMPL_VAR name="new" --></p>
-                <p><i>(published on <!-- TMPL_VAR name="newdate" -->)</i></p>
-            </td></tr>
+    <tr><th><!-- TMPL_VAR name="title" --></th></tr>
+    <tr><td><p><!-- TMPL_VAR name="new" --></p>
+                <p><i>(published on <!-- TMPL_VAR name="newdate" -->)</i></p></td></tr>
     <!-- /TMPL_LOOP -->
     </table>
 </div>
@@ -25,7 +26,6 @@
 <!-- TMPL_IF NAME="languages" -->
 <div id="opac-main-changelanguage">
     <h1>Change language</h1>
-    <ul>
     <form action="/cgi-bin/koha/changelanguage.pl" method="post">
         <label for="selectlang">Set language to</label>
         <select id="selectlang" name="language" onchange="javascript:submit();">
@@ -37,7 +37,6 @@
         </select>
         <input type="submit" value="Change" />
     </form>
-    </ul>
 </div>
 <!-- /TMPL_IF -->
 
@@ -45,26 +44,15 @@
     <div class="searchresults">
         <table>
         <tr>
-            <th>
-                Title
-            </th>
-            <th>
-                Author
-            </th>
-            <th>
-                copyright
-            </th>
-            <th>
-                publication year
-            </th>
-            <th>
-                Date
-            </th>
+            <th>Title</th>
+            <th>Author</th>
+            <th>copyright</th>
+            <th>publication year</th>
+            <th>Date</th>
         </tr>
         <!-- TMPL_LOOP NAME="recentacquiloop" -->
         <tr>
-            <td>
-                <p>
+            <td><p>
                     <!-- TMPL_IF name="BiblioDefaultViewmarc" -->
                     <a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
                     <!-- TMPL_IF NAME="title"-->
@@ -92,26 +80,50 @@
                     </a>
                     <!-- /TMPL_IF -->
                     <!-- /TMPL_IF -->
-                </p>
-            </td>
-            <td>
-                <a href="/cgi-bin/koha/opac-search.pl?q=au:<!-- TMPL_VAR NAME="author" -->">
+                </p></td>
+            <td><a href="/cgi-bin/koha/opac-search.pl?q=au:<!-- TMPL_VAR NAME="author" -->">
                     <!-- TMPL_VAR NAME="author" -->
-                </a>
-            </td>
-            <td>
-                <!-- TMPL_VAR NAME="copyrightdate" -->
-            </td>
-            <td>
-                <!-- TMPL_VAR NAME="publicationyear" -->
-            </td>
-            <td>
-                <!-- TMPL_VAR NAME="timestamp" -->
-            </td>
+                </a></td>
+            <td><!-- TMPL_VAR NAME="copyrightdate" --></td>
+            <td><!-- TMPL_VAR NAME="publicationyear" --></td>
+            <td><!-- TMPL_VAR NAME="timestamp" --></td>
         </tr>
         <!-- /TMPL_LOOP -->
         </table>
      </div>
 <!-- /TMPL_IF -->
 
+	    </div>
+    <div class="yui-u">
+	<!-- YOUR DATA GOES HERE -->
+	Right column.
+	
+	<!-- TMPL_IF NAME="opacuserlogin" -->
+<div id="login">
+    <!-- TMPL_IF NAME="loggedinusername" -->
+        <a href="/cgi-bin/koha/opac-user.pl"><b>User Info</b></a>
+        <p>Logged in as: <b> <!-- TMPL_VAR NAME="loggedinusername" --> </b></p>
+        <p><a href="/cgi-bin/koha/opac-logout.pl?logout=Log Out">Log Out</a></p>
+    <!-- TMPL_ELSE -->
+        <form action="/cgi-bin/koha/opac-user.pl" method="post" name="auth" id="auth">
+            <p>Login:</p>
+            <input type="text" id="userid" size="10" name="userid" />
+            <p>Pass:</p>
+            <input type="password" id="password" size="10" name="password" />
+            <p>
+                <input type="submit" value="Log In" class="submit" />
+            </p>
+       </form>
+    <!-- /TMPL_IF -->
+</div>
+<!-- /TMPL_IF -->
+	    </div>
+</div>
+</div>
+</div>
+<div class="yui-b">
+<!--TMPL_INCLUDE NAME="navigation.inc" -->
+</div>
+</div>
+
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-passwd.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-passwd.tmpl
index c05b73e419..114f05f922 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-passwd.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-passwd.tmpl
@@ -1,6 +1,7 @@
 <!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- Account for <!-- TMPL_LOOP name="BORROWER_INFO" --><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --><!-- /TMPL_LOOP -->
-<!-- TMPL_INCLUDE name="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE name="masthead.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+</head>
+<body><!-- TMPL_INCLUDE name="masthead.inc" -->
 <!-- TMPL_INCLUDE name="navigation.inc" -->
 
 <!--CONTENT-->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl
index 544ba3bc13..7899e10b3d 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl
@@ -1,5 +1,7 @@
 <!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- Account for <!-- TMPL_LOOP name="BORROWER_INFO" --><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --><!-- /TMPL_LOOP -->
-<!-- TMPL_INCLUDE name="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+</head>
+<body>
 <!-- TMPL_INCLUDE name="masthead.inc" -->
 <!-- TMPL_INCLUDE name="navigation.inc" -->
 
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-recacquisitions.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-recacquisitions.tmpl
index aa6fcca2cc..aeae4349b7 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-recacquisitions.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-recacquisitions.tmpl
@@ -1,5 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- Recent Acquisitions
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+</head>
+<body>
 <!--TMPL_INCLUDE NAME="masthead_adv.inc" -->
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
index ae1745e329..fee894b254 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
@@ -1,6 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- Reserving <!-- TMPL_VAR NAME="title" --> for <!-- TMPL_LOOP NAME="USER_INFO" --><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --><!-- /TMPL_LOOP -->
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
+</head>
+<body>
 <!--TMPL_INCLUDE NAME="masthead.inc" -->
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
index 7da0443a2c..c4eaa9fea4 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
@@ -1,6 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<!-- TMPL_VAR NAME="LibraryNameTitle" -->
-
+<!-- TMPL_VAR NAME="LibraryNameTitle" --> &rsaquo; 
 <!-- TMPL_IF NAME="searchdesc" -->
     Results of Search for '<!-- TMPL_VAR NAME="searchdesc" -->'
 <!-- TMPL_ELSE -->
@@ -8,48 +7,54 @@
 <!-- /TMPL_IF -->
 
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
+</head>
+<body>
 <!--TMPL_INCLUDE NAME="masthead.inc" -->
-<!--TMPL_INCLUDE NAME="navigation.inc" -->
-
-<!-- TMPL_IF NAME="koha_spsuggest" -->
-<div style="font-size: 12px;">Did you mean:
-    <ul style="list-style: none;">
-        <!-- TMPL_LOOP NAME="SPELL_SUGGEST" -->
-        <li>
-            <a href="/cgi-bin/koha/opac-search.pl?q=<!-- TMPL_VAR NAME="spsuggestion" -->"><!-- TMPL_VAR NAME="spsuggestion" --></a>
-        </li>
-        <!-- /TMPL_LOOP -->
-    </ul>
-</div>
-<!-- /TMPL_IF -->
 
+<div id="doc3" class="yui-t1">
+   <div id="bd">
+   
 <!-- TMPL_IF NAME="total" -->
-<h3><!-- TMPL_VAR NAME="total" --> results found for '<!-- TMPL_VAR NAME="searchdesc" -->'. <a href="/cgi-bin/koha/opac-search.pl">[ Perform a new search ]</a></h3>
+<div id="breadcrumbs" class="yui-g">
+<p><strong>&ldquo;<!-- TMPL_VAR NAME="searchdesc" -->&rdquo;</strong> returned <!-- TMPL_VAR NAME="total" --> results.</p>
+</div>
 <!-- TMPL_ELSE -->
+<div id="breadcrumbs" class="yui-g">
 <!-- TMPL_IF NAME="searchdesc" -->
-<h3> No Result found !</h3>
+<h3>No Result found !</h3>
 <p>
     No results match your search for <span style="font-weight: bold;">&ldquo;<!-- TMPL_VAR NAME="searchdesc" -->&rdquo;</span> in <!-- TMPL_VAR NAME="LibraryName" --> Catalog.
 </p>
-<a href="/cgi-bin/koha/opac-search.pl" title="New search">Perform a new search</a>
 <!-- TMPL_ELSE -->
 <h3> No result found !</h3>
 <p>
     You did not specify any search criteria.
 </p>
-<a href="/cgi-bin/koha/opac-search.pl" title="New search">Perform a new search</a>
+</div>
 <!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
 
-<!-- TMPL_IF NAME="query_error" -->
-<br /><br />
-Error :
-<span  class="problem">
-    <!-- TMPL_VAR NAME="query_error" -->
-</span>
+<div id="yui-main">
+
+	<div class="yui-b">
+  <!-- TMPL_IF NAME="koha_spsuggest" -->
+	Did you mean:
+    <ul style="list-style: none;">
+        <!-- TMPL_LOOP NAME="SPELL_SUGGEST" -->
+        <li>
+            <a href="/cgi-bin/koha/opac-search.pl?q=<!-- TMPL_VAR NAME="spsuggestion" -->"><!-- TMPL_VAR NAME="spsuggestion" --></a>
+        </li>
+        <!-- /TMPL_LOOP -->
+    </ul>
 <!-- /TMPL_IF -->
 
+<!-- TMPL_IF NAME="query_error" -->
+<div class="error">
+	<h4>Error:</h4>
+    <!-- TMPL_VAR NAME="query_error" -->
+</div>
+<!-- /TMPL_IF -->	
+	
 <!-- Search Results Table -->
 <!-- TMPL_IF NAME="total" -->
 <!-- TMPL_IF NAME="scan" -->
@@ -105,18 +110,18 @@ Error :
     </form>
 <!-- TMPL_ELSE -->
 
+    <div class="searchresults">
 <form action="/cgi-bin/koha/opac-search.pl" method="post" name="myform" id="mainform">
     
     <!-- TMPL_IF NAME="searchdesc" -->
     <input type="hidden" name="q" value="<!-- TMPL_VAR NAME="searchdesc" escape="html" -->" />
     <!-- /TMPL_IF -->
     
-    <div class="searchresults">
         
         <!-- RE-SORT START -->
-        <p>
+        <p style="float: right;">
             Re-sort results
-            <select id="sort_by" name="sort_by" onChange="javascript:document.myform.submit();">
+            <select id="sort_by" name="sort_by" onchange="javascript:document.myform.submit();">
                 <option value="">Field-weighted, Relevance Ranked</option>
         <!--TMPL_IF Name="9523a"-->
           <option value="1=9523 &gt;i" selected>Popularity (Most to Least)</option>
@@ -186,53 +191,16 @@ Error :
             </select>
         </p>
         <!-- RESORT END -->
-</form>
-        <!-- ######### -->
-        <!-- FACETS START -->
-        <!-- TMPL_IF NAME="opacfacets" -->
-            <!-- TMPL_IF NAME="facets_loop" -->
-                <div id="facets" >
-                    <dl>
-                    <dt onclick="var Elt=document.getElementById('facets_list');if (Elt.style.display!='block'){Elt.style.display='block';} else {Elt.style.display='none';}">Refine Your Search</dt>
-                    <dd id="facets_list" style="display:none">
-                        <!-- TMPL_LOOP NAME="facets_loop" -->
-                        <li id="<!-- TMPL_VAR NAME="type_id" -->"><!-- TMPL_VAR NAME="type_label" -->
-                            <ul>
-                                <!-- TMPL_LOOP NAME="facets" -->
-                                <li>
-                                    <a href="/cgi-bin/koha/opac-search.pl?q=<!-- TMPL_VAR NAME="searchdesc" --> and <!-- TMPL_VAR NAME="type_link_value" -->:<!-- TMPL_VAR NAME="facet_link_value" -->" title="<!-- TMPL_VAR NAME="facet_title_value" -->">
-                                        <!-- TMPL_VAR NAME="facet_label_value" -->
-                                    </a> (<!-- TMPL_VAR NAME="facet_count" -->)
-                                </li>
-                                <!-- /TMPL_LOOP -->
-                                <!-- TMPL_IF NAME="expandable" -->
-                                <li class="showmore">
-                                    <a href="/cgi-bin/koha/opac-search.pl?q=<!-- TMPL_VAR NAME="searchdesc" -->&amp;expand=<!-- TMPL_VAR NAME="expand" -->#<!-- TMPL_VAR NAME="type_id" -->">
-                                        Show More
-                                    </a>
-                                </li>
-                                <!-- /TMPL_IF -->
-                            </ul>
-                        </li>
-                        <!-- /TMPL_LOOP -->
-                    </ul>
-                    </dd>
-                </div>
-            <!-- /TMPL_IF -->
-        <!-- /TMPL_IF -->
-        <!-- FACETS END -->
-        
-        <!-- ######### -->
         
-        <!-- TABLE RESULTS START -->
         <!-- TMPL_IF name="opacbookbag" -->
-            <form action="opac-searchresults.pl" method="get" name="bookbag_form">
-            <input type="submit" class="button" value="Add checked items to book bag" onclick="addMultiple(); return false;" /> 
+            <input type="button" class="button" value="Add checked items to book bag" onclick="addMultiple(); return false;" /> 
             <input type="reset" value="Clear All" class="button" />
         <!-- /TMPL_IF -->
+		
+        <!-- TABLE RESULTS START -->
         <table>
             <tr>
-                <th><input type="checkbox" name="select_all" onClick="SelectAll()" /></th>
+                <th><input type="checkbox" name="select_all" onclick="SelectAll()" /></th>
                 <th>Title</th>
                 <th>Item count</th>
                 <th>Location</th>
@@ -343,8 +311,8 @@ Error :
                 </tr>
                 <!-- /TMPL_LOOP -->
             </table>
-        </div>
     </form>
+        </div>
     <!-- /TMPL_IF -->
     
     <!-- TMPL_IF NAME="PAGE_NUMBERS" -->
@@ -387,7 +355,49 @@ Error :
     
     
     <!-- /TMPL_IF -->
+	
+	<!-- TMPL_IF name="suggestion" -->
+<div class="suggestion">Not finding what you're looking for?<br />  Make a <a href="/cgi-bin/koha/opac-suggestions.pl?op=add">purchase suggestion</a></div>
+<!-- /TMPL_IF -->
     
 </div>
 </div>
+<div class="yui-b">
+ <!-- ######### -->
+        <!-- FACETS START -->
+        <!-- TMPL_IF NAME="opacfacets" -->
+            <!-- TMPL_IF NAME="facets_loop" -->
+                <div id="facets" >
+                    <h4>Refine Your Search</h4>
+                    <ul>
+                        <!-- TMPL_LOOP NAME="facets_loop" -->
+                        <li id="<!-- TMPL_VAR NAME="type_id" -->"><!-- TMPL_VAR NAME="type_label" -->
+                            <ul>
+                                <!-- TMPL_LOOP NAME="facets" -->
+                                <li>
+                                    <a href="/cgi-bin/koha/opac-search.pl?q=<!-- TMPL_VAR NAME="searchdesc" --> and <!-- TMPL_VAR NAME="type_link_value" -->:<!-- TMPL_VAR NAME="facet_link_value" -->" title="<!-- TMPL_VAR NAME="facet_title_value" -->">
+                                        <!-- TMPL_VAR NAME="facet_label_value" -->
+                                    </a> (<!-- TMPL_VAR NAME="facet_count" -->)
+                                </li>
+                                <!-- /TMPL_LOOP -->
+                                <!-- TMPL_IF NAME="expandable" -->
+                                <li class="showmore">
+                                    <a href="/cgi-bin/koha/opac-search.pl?q=<!-- TMPL_VAR NAME="searchdesc" -->&amp;expand=<!-- TMPL_VAR NAME="expand" -->#<!-- TMPL_VAR NAME="type_id" -->">
+                                        Show More
+                                    </a>
+                                </li>
+                                <!-- /TMPL_IF -->
+                            </ul>
+                        </li>
+                        <!-- /TMPL_LOOP -->
+                    </ul>
+                </div>
+            <!-- /TMPL_IF -->
+        <!-- /TMPL_IF -->
+        <!-- FACETS END -->
+        
+        <!-- ######### -->
+</div>
+</div>
+
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tmpl
index e25e7a4ba9..7b781f5883 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tmpl
@@ -1,7 +1,7 @@
 <!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Library Home for  <!-- TMPL_LOOP name="BORROWER_INFO" --><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --><!-- /TMPL_LOOP -->
-<!-- TMPL_INCLUDE name="doc-head-close.inc" -->
-
-<div> <!-- main -->
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+</head>
+<body><div> <!-- main -->
 
 <h3> Review of: <!--TMPL_VAR NAME="title" --></h3>
 
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasketform.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasketform.tmpl
index 3e14527223..1e89580b73 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasketform.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasketform.tmpl
@@ -1,6 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- Sending Your Book Bag
 <!-- TMPL_INCLUDE NAME="doc-head-close-basket.inc" -->
-
+</head>
+<body>
 <div id="window">
 <h3>Sending your book bag</h3>
 
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tmpl
index 179dbbda87..ccbe6559c1 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tmpl
@@ -1,5 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- Serials
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+</head>
+<body>
 <!--TMPL_INCLUDE NAME="masthead.inc" -->
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
index 33fc70655f..883f7538ba 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
@@ -1,4 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- <!-- TMPL_IF Name="viewshelf" -->Contents of <!-- TMPL_VAR Name="shelfname" --><!-- TMPL_ELSE -->My Virtual Shelves<!-- /TMPL_IF --><!-- TMPL_INCLUDE name="doc-head-close.inc" -->
+</head>
 <!-- TMPL_IF NAME="OpacNav" --> <body id="withnav">
 <!--TMPL_ELSE-->
 <body>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews.tmpl
index c68c3adaab..4dfc4a9b88 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews.tmpl
@@ -1,7 +1,7 @@
 <!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Library Home for  <!-- TMPL_LOOP name="BORROWER_INFO" --><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --><!-- /TMPL_LOOP -->
-<!-- TMPL_INCLUDE name="doc-head-close.inc" -->
-
-<!-- TMPL_INCLUDE name="masthead.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+</head>
+<body><!-- TMPL_INCLUDE name="masthead.inc" -->
 <!-- TMPL_INCLUDE name="navigation.inc" -->
 
 <table>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl
index 277e8835ef..f54f3ee058 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl
@@ -2,6 +2,8 @@
 <!-- TMPL_IF name="op_add" -->Enter a new purchase suggestion<!-- /TMPL_IF -->
 <!-- TMPL_IF name="op_else" -->Purchase Suggestions<!-- /TMPL_IF -->
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+</head>
+<body>
 <!--TMPL_INCLUDE NAME="masthead.inc" -->
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tmpl
index 97a9bdc37b..8281ea93d2 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tmpl
@@ -1,6 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- ISBD
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
+</head>
+<body>
 <!--TMPL_INCLUDE NAME="masthead.inc" -->
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tmpl
index f7adf4c776..866f15e325 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tmpl
@@ -1,6 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> -- Library Catalog
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
+</head>
+<body>
 <!--TMPL_INCLUDE NAME="masthead.inc" -->
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl
index ac6549f3c7..79a4c77976 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl
@@ -3,7 +3,9 @@
 <!-- TMPL_LOOP name="BORROWER_INFO" -->
     <!-- TMPL_VAR name="firstname" --><!-- TMPL_VAR name="surname" -->
 <!-- /TMPL_LOOP -->
-<!-- TMPL_INCLUDE name="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+</head>
+<body>
 <!-- TMPL_INCLUDE name="masthead.inc" -->
 <!-- TMPL_INCLUDE name="navigation.inc" -->
 
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tmpl
index 3df4a565a6..cfba6fd72a 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tmpl
@@ -1,5 +1,7 @@
 <!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- Personal Details for <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" -->
-<!-- TMPL_INCLUDE name="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+</head>
+<body>
 <!-- TMPL_INCLUDE name="masthead.inc" -->
 <!-- TMPL_INCLUDE name="navigation.inc" -->
 
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl
index a3fd45e8b5..a00908aee8 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl
@@ -1,5 +1,7 @@
 <!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- Updating Details for <!-- TMPL_LOOP name="BORROWER_INFO" --><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --><!-- /TMPL_LOOP -->
-<!-- TMPL_INCLUDE name="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+</head>
+<body>
 <!-- TMPL_INCLUDE name="masthead.inc" -->
 <!-- TMPL_INCLUDE name="navigation.inc" -->
 
diff --git a/opac/opac-search.pl b/opac/opac-search.pl
index 079da35d65..bdccb7f80c 100755
--- a/opac/opac-search.pl
+++ b/opac/opac-search.pl
@@ -283,7 +283,7 @@ if ( $template_name eq "opac-advsearch.tmpl" ) {
         if ( $i == 0 ) {
             push @search_boxes_array,
               {
-                search_boxes_label => "<span class='labels'>Search for:</span>",
+                search_boxes_label => "<span class=\"labels\">Search for:</span>",
                 scan_index         => 1,
               };
 
-- 
2.39.5