From 62e94fd1b0170b6de209b83c3985e6f7060e450a Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Tue, 28 Aug 2007 15:09:15 -0500
Subject: [PATCH] More changes to enable YUI-Grids CSS layout

Signed-off-by: Chris Cormack <crc@liblime.com>
---
 .../modules/cataloguing/addbiblio-nomarc.tmpl |   6 +-
 .../en/modules/cataloguing/addbiblio.tmpl     |  73 ++-------
 .../prog/en/modules/cataloguing/addbooks.tmpl |   6 +
 .../modules/cataloguing/additem-nomarc.tmpl   |   6 +
 .../prog/en/modules/cataloguing/additem.tmpl  |  26 +--
 .../prog/en/modules/circ/bookcount.tmpl       |  22 ++-
 .../prog/en/modules/circ/branchoverdues.tmpl  |  15 +-
 .../prog/en/modules/circ/branchtransfers.tmpl |  14 +-
 .../prog/en/modules/circ/circulation.tmpl     |  16 +-
 .../prog/en/modules/circ/overdue.tmpl         |  16 +-
 .../prog/en/modules/circ/pendingreserves.tmpl |  29 ++--
 .../prog/en/modules/circ/returns.tmpl         |  16 +-
 .../en/modules/circ/selectbranchprinter.tmpl  |  13 +-
 .../prog/en/modules/circ/stats.tmpl           |  15 +-
 .../prog/en/modules/circ/transferstodo.tmpl   |  16 +-
 .../en/modules/circ/transferstoreceive.tmpl   |  17 +-
 .../prog/en/modules/circ/waitingreserves.tmpl |  16 +-
 .../en/modules/labels/label-bib-search.tmpl   |   5 +-
 .../modules/labels/label-create-layout.tmpl   | 111 +++++--------
 .../modules/labels/label-create-template.tmpl |  27 ++--
 .../en/modules/labels/label-edit-layout.tmpl  | 153 +++++++++++++-----
 .../modules/labels/label-edit-template.tmpl   |  25 ++-
 .../prog/en/modules/labels/label-home.tmpl    |  15 +-
 .../prog/en/modules/labels/label-manager.tmpl |  25 +--
 .../en/modules/labels/label-templates.tmpl    |  16 +-
 .../prog/en/modules/maint/catmaintain.tmpl    |  13 +-
 .../prog/en/modules/members/boraccount.tmpl   |  14 +-
 .../en/modules/members/borrowers_details.tmpl |  14 +-
 .../prog/en/modules/members/deletemem.tmpl    |  14 +-
 .../en/modules/members/guarantor_search.tmpl  |  10 ++
 .../prog/en/modules/members/mancredit.tmpl    |  15 +-
 .../prog/en/modules/members/maninvoice.tmpl   |  15 +-
 .../prog/en/modules/members/member-flags.tmpl |  14 +-
 .../en/modules/members/member-password.tmpl   |  14 +-
 .../members/member-quicksearch-results.tmpl   |  13 +-
 .../modules/members/member-quicksearch.tmpl   |  13 +-
 .../prog/en/modules/members/member.tmpl       |  12 +-
 .../prog/en/modules/members/memberentryA.tmpl |  19 ++-
 .../prog/en/modules/members/memberentryC.tmpl |  16 +-
 .../prog/en/modules/members/memberentryI.tmpl |  16 +-
 .../prog/en/modules/members/memberentryP.tmpl |  15 +-
 .../en/modules/members/moremember-print.tmpl  |  14 +-
 .../modules/members/moremember-receipt.tmpl   |  14 +-
 .../prog/en/modules/members/moremember.tmpl   |  77 +++++----
 .../prog/en/modules/members/pay.tmpl          |  14 +-
 .../prog/en/modules/members/readingrec.tmpl   |  14 +-
 .../prog/en/modules/reserve/request.tmpl      |  16 +-
 .../en/modules/reviews/reviewswaiting.tmpl    |  14 +-
 .../virtualshelves/addbybiblionumber.tmpl     |  16 +-
 .../en/modules/virtualshelves/shelves.tmpl    |  25 +--
 50 files changed, 764 insertions(+), 366 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio-nomarc.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio-nomarc.tmpl
index 54156028ac..91dae9cdc9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio-nomarc.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio-nomarc.tmpl
@@ -2,7 +2,11 @@
 <title>Koha &rsaquo; Cataloging &rsaquo; Add a Non-MARC Record</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close-addbiblio.inc" -->
 
-
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
 
 <!-- TMPL_IF name="ERROR" -->
 Please Specify a Title
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
index 95219fe285..a9096ec3c0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
@@ -7,6 +7,12 @@
     <!-- TMPL_INCLUDE NAME="menu-catalogue.inc" -->
 <!--/TMPL_UNLESS-->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <!--TMPL_IF Name="done"-->
     <script language="javascript" type="text/javascript">
         opener.document.forms['f'].biblionumber.value=<!--TMPL_VAR Name="biblionumber"-->;
@@ -77,34 +83,15 @@
             <!-- TMPL_UNLESS name="hide_marc" -->
                 <span title="<!-- TMPL_VAR NAME="tag_lib" -->"><!-- TMPL_VAR NAME="tag" --></span>
                 <!-- TMPL_IF NAME="fixedfield" -->
-	                <input tabindex="1"
-                               class="indicator flat"
-                               type="text"
-                               style="display:none;"
-                               name="tag_<!-- TMPL_VAR NAME="tag" -->_indicator_<!-- TMPL_VAR NAME='index'-->"
-                               size="2"
-                               maxlength="2"
-                               value="<!-- TMPL_VAR NAME="indicator" -->" />
+	                <input tabindex="1" class="indicator flat" type="text" style="display:none;" name="tag_<!-- TMPL_VAR NAME="tag" -->_indicator_<!-- TMPL_VAR NAME='index'-->" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->" />
                 <!-- TMPL_ELSE -->
-        	        <input tabindex="1"
-                               class="indicator flat"
-                               type="text"
-                               name="tag_<!-- TMPL_VAR NAME="tag" -->_indicator_<!-- TMPL_VAR NAME='index'-->"
-                               size="2"
-                               maxlength="2"
-                               value="<!-- TMPL_VAR NAME="indicator" -->" />
+        	        <input tabindex="1" class="indicator flat" type="text" name="tag_<!-- TMPL_VAR NAME="tag" -->_indicator_<!-- TMPL_VAR NAME='index'-->" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->" />
                 <!-- /TMPL_IF --> -
             <!-- TMPL_ELSE -->
                 <!-- TMPL_IF NAME="fixedfield" -->
-                    <input tabindex="1"
-                           type="hidden"
-                           name="tag_<!-- TMPL_VAR NAME="tag" -->_indicator_<!-- TMPL_VAR NAME='index'-->"
-                           value="<!-- TMPL_VAR NAME="indicator" -->" />
+                    <input tabindex="1" type="hidden" name="tag_<!-- TMPL_VAR NAME="tag" -->_indicator_<!-- TMPL_VAR NAME='index'-->" value="<!-- TMPL_VAR NAME="indicator" -->" />
                 <!-- TMPL_ELSE -->
-                    <input tabindex="1"
-                           type="hidden"
-                           name="tag_<!-- TMPL_VAR NAME="tag" -->_indicator_<!-- TMPL_VAR NAME='index'-->"
-                           value="<!-- TMPL_VAR NAME="indicator" -->" />
+                    <input tabindex="1" type="hidden" name="tag_<!-- TMPL_VAR NAME="tag" -->_indicator_<!-- TMPL_VAR NAME='index'-->" value="<!-- TMPL_VAR NAME="indicator" -->" />
                 <!-- /TMPL_IF -->
             <!-- /TMPL_UNLESS -->
 
@@ -122,24 +109,14 @@
             <div name="line" class="subfield_line" style="<!-- TMPL_VAR NAME='visibility' -->;" id="subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='subfield' -->">
             
                 <!--TMPL_UNLESS NAME="advancedMARCEditor" -->
-                <label for="tag_<!-- TMPL_VAR NAME='tag'-->_subfield_<!--  TMPL_VAR NAME='subfield'-->_<!-- TMPL_VAR NAME='index'-->_<!-- TMPL_VAR NAME='index_subfield'-->"
-                        <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> class="labelsubfield" >
+                <label for="tag_<!-- TMPL_VAR NAME='tag'-->_subfield_<!--  TMPL_VAR NAME='subfield'-->_<!-- TMPL_VAR NAME='index'-->_<!-- TMPL_VAR NAME='index_subfield'-->" <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> class="labelsubfield" >
                 <!-- /TMPL_UNLESS --> 
                 
                 <!-- TMPL_UNLESS name="hide_marc" -->
                     <img class="buttonUp" <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> src="<!-- TMPL_VAR NAME="themelang" -->/images/up.png" onclick="upSubfield('subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='subfield' -->')" alt="" />
-                        <input title="<!-- TMPL_VAR NAME='marc_lib_plain' -->"
-                            style=" <!-- TMPL_IF NAME="fixedfield" -->display:none; <!-- /TMPL_IF -->border:0;" type="text"
-                            name="tag_<!-- TMPL_VAR NAME='tag'-->_code_<!--  TMPL_VAR NAME='subfield'-->_<!-- TMPL_VAR NAME='index'-->_<!-- TMPL_VAR NAME='index_subfield'-->"
-                            value="<!-- TMPL_VAR NAME="subfield" -->"
-                            size="1"
-                            maxlength="1"
-                            class="flat"
-                            tabindex="-1" />
+                        <input title="<!-- TMPL_VAR NAME='marc_lib_plain' -->" style=" <!-- TMPL_IF NAME="fixedfield" -->display:none; <!-- /TMPL_IF -->border:0;" type="text" name="tag_<!-- TMPL_VAR NAME='tag'-->_code_<!--  TMPL_VAR NAME='subfield'-->_<!-- TMPL_VAR NAME='index'-->_<!-- TMPL_VAR NAME='index_subfield'-->" value="<!-- TMPL_VAR NAME="subfield" -->" size="1" maxlength="1" class="flat" tabindex="-1" />
                 <!-- TMPL_ELSE -->
-                    <input type="hidden"
-                           name="tag_<!-- TMPL_VAR NAME='tag'-->_code_<!--  TMPL_VAR NAME='subfield'-->_<!-- TMPL_VAR NAME='index'-->_<!-- TMPL_VAR NAME='index_subfield'-->"
-                           value="<!-- TMPL_VAR NAME="subfield" -->" />
+                    <input type="hidden" name="tag_<!-- TMPL_VAR NAME='tag'-->_code_<!--  TMPL_VAR NAME='subfield'-->_<!-- TMPL_VAR NAME='index'-->_<!-- TMPL_VAR NAME='index_subfield'-->" value="<!-- TMPL_VAR NAME="subfield" -->" />
                 <!-- /TMPL_UNLESS -->
             
                 <!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
@@ -245,17 +222,10 @@ function AreMandatoriesNotOk(){
     var tab = new Array();
     var label = new Array();
     var flag=0;
-    <!-- TMPL_LOOP NAME='BIG_LOOP' --> 
-        <!-- TMPL_LOOP NAME='innerloop' -->
-            <!-- TMPL_LOOP NAME='subfield_loop'-->
-                <!-- TMPL_IF NAME='mandatory'-->
-                    mandatories.push("<!-- TMPL_VAR NAME='id' -->");
+    <!-- TMPL_LOOP NAME='BIG_LOOP' --><!-- TMPL_LOOP NAME='innerloop' --><!-- TMPL_LOOP NAME='subfield_loop'--><!-- TMPL_IF NAME='mandatory'-->mandatories.push("<!-- TMPL_VAR NAME='id' -->");
                    	tab.push("<!-- TMPL_VAR NAME='number' -->");
                    	label.push("<!-- TMPL_VAR NAME='marc_lib' -->");
-                <!-- /TMPL_IF -->
-            <!-- /TMPL_LOOP -->
-        <!-- /TMPL_LOOP -->
-    <!-- /TMPL_LOOP -->
+                <!-- /TMPL_IF --><!-- /TMPL_LOOP --><!-- /TMPL_LOOP --><!-- /TMPL_LOOP -->
     var StrAlert = "Can't save this record because the following field aren't filled :\n\n";
     for(var i=0,len=mandatories.length; i<len ; i++){
         if( ! document.getElementById(mandatories[i]).value){
@@ -278,17 +248,8 @@ function AreMandatoriesNotOk(){
 function AreZ3950MandoriesOk(){
     var mandatories = new Array();
     var mandatories_label = new Array();
-    
-    <!-- TMPL_LOOP NAME='BIG_LOOP' --> 
-        <!-- TMPL_LOOP NAME='innerloop' -->
-            <!-- TMPL_LOOP NAME='subfield_loop'-->
-                <!-- TMPL_IF NAME='z3950_mandatory'-->
-                    mandatories.push("<!-- TMPL_VAR NAME='id' -->");
-                    mandatories_label.push("<!-- TMPL_VAR NAME='z3950_mandatory' -->");
-                <!-- /TMPL_IF -->
-            <!-- /TMPL_LOOP -->
-        <!-- /TMPL_LOOP -->
-    <!-- /TMPL_LOOP -->
+	<!-- TMPL_LOOP NAME='BIG_LOOP' --><!-- TMPL_LOOP NAME='innerloop' --><!-- TMPL_LOOP NAME='subfield_loop'--><!-- TMPL_IF NAME='z3950_mandatory'-->mandatories.push("<!-- TMPL_VAR NAME='id' -->");
+        mandatories_label.push("<!-- TMPL_VAR NAME='z3950_mandatory' -->");<!-- /TMPL_IF --><!-- /TMPL_LOOP --><!-- /TMPL_LOOP --><!-- /TMPL_LOOP -->
     
     var error = 0;
     var strQuery="";
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl
index 45a691c8bf..ed2da0bd73 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl
@@ -4,6 +4,12 @@
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-catalogue.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 	<h1>Koha &rsaquo; Catalogue Maintenance</h1>
 	<!-- TMPL_IF name="noitemsfound" -->
 		No items found
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem-nomarc.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem-nomarc.tmpl
index 6009738523..875f20e73c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem-nomarc.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem-nomarc.tmpl
@@ -3,6 +3,12 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <!-- TMPL_IF NAME="NOBARCODE" -->
 You must give the item a barcode
 <!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl
index 82e7f4b1c9..b5a990e418 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl
@@ -4,22 +4,22 @@
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-catalogue.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 
 <h1>Items for <!-- TMPL_VAR name="title" --> <!-- TMPL_IF NAME="author" --> by <!-- TMPL_VAR name="author" --><!-- /TMPL_IF --> (Record #<!-- TMPL_VAR NAME="biblionumber" -->)</h1>
 
 <div id="action">
-    <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">
-        Edit Bibliographic Record
-    </a>
-    <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">
-        Normal view
-    </a>
-    <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">
-        View MARC in Catalog
-    </a>
-    <a href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">
-        View ISBD in Catalog
-    </a>
+<ul>
+	<li>    <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">Edit Bibliographic Record</a></li>
+	<li>    <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">Normal view</a></li>
+	<li>    <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">View MARC in Catalog</a></li>
+	<li>    <a href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">View ISBD in Catalog</a></li>
+</ul>
 </div>
 
 <div id="cataloguing_additem_itemlist">
@@ -76,7 +76,7 @@
     <input type="button" value="Save Changes" onclick="Check(this.form)" accesskey="w" />
     <!-- /TMPL_IF -->
     </form>
-
+</div>
 <script language="JavaScript" type="text/javascript">
 function active(numlayer)
 {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tmpl
index c36b5d357c..ac423e1a24 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tmpl
@@ -1,23 +1,26 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Circulation Statistics for <!-- TMPL_VAR Name="title" --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <h1>
 <!-- TMPL_VAR Name="title" --> <!-- TMPL_IF NAME="author" -->(<!-- TMPL_VAR Name="author" -->)<!-- /TMPL_IF --></a></h1>
 <h2>Barcode <!-- TMPL_VAR Name="barcode" --></h2>
 <div class="tabitem"><form action="/cgi-bin/koha/catalogue/detail.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR Name="biblionumber" -->" /><input type="hidden" name="type" value="intra" /><input type="submit" class="submit" value="Brief Display" /></form> <form action="/cgi-bin/koha/catalogue/moredetail.pl" method="get"><input type="hidden" name="type" value="<!-- TMPL_VAR NAME="type" -->" /><input type="hidden" name="item" value="<!-- TMPL_VAR NAME="itemnumber" -->" /><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="hidden" name="bi" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->" /> <input type="submit" class="submit" value="Item Details" /></form><!-- TMPL_IF NAME="norequests" --><!-- TMPL_ELSE --> <form action="/cgi-bin/koha/reserve/request.pl" method="get"><input type="hidden" value="<!-- TMPL_VAR name="biblionumber" -->" name="biblionumber"> <input type="submit" value="Place Reserve" class="submit" /></form><!-- /TMPL_IF --></div>
-<div class="data">
 <table>
 		<tr><th>Home Library: </th><td> <!-- TMPL_VAR Name="homebranch" --> </td></tr>
 		<tr><th>Current Library: </th><td> <!-- TMPL_VAR Name="holdingbranch" --></td></tr>
 		<tr><th>Date arrived at current library: </th><td> <!-- TMPL_VAR Name="lastdate" --> </td></tr>
 		<tr><th>Number of issues since since the above date :</th><td> <!-- TMPL_VAR Name="count" --> </td></tr>
 </table>
-</div>
-<div class="table">
-		<table>
+<table>
 			<tr>
 				<th>Library</th>
 				<th>No. of times checked out</th>
@@ -30,9 +33,14 @@
 					<td class="data"><!-- TMPL_VAR Name="seen" --> </td>
 				</tr>
 			<!-- /TMPL_LOOP -->
-		</table></div>
+		</table>
 		</td>
 	</tr>
 </table>
 
-<!-- TMPL_INCLUDE Name="intranet-bottom.inc" -->
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl
index 66449dd3f2..d7116fe602 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl
@@ -1,12 +1,17 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Circulation</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <h1>Circulation: Library Overdues at <!-- TMPL_VAR NAME="LoginBranchname" --></h1>
 
-<div id="mainbloc">
 <!-- selector of location -->
 <!-- TMPL_IF NAME="location" -->
 <legend>location selected</legend>
@@ -169,4 +174,8 @@
         </fieldset>
     <!-- /TMPL_IF -->
 </div>
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tmpl
index fe5f0b6502..d65ce47885 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tmpl
@@ -1,9 +1,14 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Circulation &rsaquo; Transfers</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
 
 <h1>Circulation &rsaquo; Transfers</h1>
 
@@ -165,4 +170,9 @@
     <!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
 
-<!-- TMPL_INCLUDE Name="intranet-bottom.inc" -->
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
index e39ac7b990..2f47230356 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -6,8 +6,15 @@
 <!-- /TMPL_IF --></title>
 
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
+
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <!-- TMPL_IF NAME="borrowernumber" -->
     <h1>Checkouts</h1>
 <!-- TMPL_ELSE -->
@@ -877,4 +884,9 @@ No patron matched <!-- TMPL_VAR name="message" -->
 
 </script>
 
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl
index 5840b8dfa2..87997d1d95 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl
@@ -1,8 +1,15 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Items Overdue as of <!-- TMPL_VAR NAME="todaysdate" --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!--TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-circ.inc"-->
+
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <h2>Items Overdue as of <!-- TMPL_VAR NAME="todaysdate" --></h2>
 
 <div class="searchresults">
@@ -29,4 +36,9 @@
 <!-- /TMPL_LOOP -->
 </table>
 </div>
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl
index fc557b13dd..96cd146b66 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl
@@ -1,6 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Circulation &rsaquo; Holds</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 
 <!-- Additions to enable Calendar system -->
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css" />
@@ -10,9 +11,14 @@
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-setup.js"></script>
 <!-- End of additions -->
 
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <h1>Pending holds as of <!-- TMPL_VAR NAME="todaysdate" --></h1>
 <div id="filters">
 <br />
@@ -21,13 +27,8 @@
 <label for "from">
     Start date:
 </label>
-<input type="text"
-        size="10"
-        id="from"
-        name="from"
-        value="<!-- TMPL_VAR NAME="from" -->" />
-<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" 
-        border="0" id="openCalendarFrom" style="cursor: pointer;" alt="" />
+<input type="text" size="10" id="from" name="from" value="<!-- TMPL_VAR NAME="from" -->" />
+<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif"  border="0" id="openCalendarFrom" style="cursor: pointer;" alt="" />
 <script language="JavaScript" type="text/javascript">
 function validate1(date) {
     var day = date.getDate();
@@ -58,10 +59,7 @@ Calendar.setup(
     End date:
 </label>
 <input size="10" id="to" name="to" value="<!-- TMPL_VAR NAME="to" -->" type="text" />
-<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" alt=""
-        id="openCalendarTo"
-        style="cursor: pointer;"
-        valign="top" border="0" />
+<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" alt="" id="openCalendarTo" style="cursor: pointer;" valign="top" border="0" />
 <script type="text/javascript">
         function validate2(date) {
             var day = date.getDate();
@@ -169,4 +167,9 @@ Calendar.setup(
         <b>No items found.</b>
     <!-- /TMPL_IF -->
 </div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
index 68c0f0c3a1..51a6595028 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
@@ -1,10 +1,15 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Circulation &rsaquo; Returns <!-- TMPL_VAR Name="title" --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <h1>Circulation &rsaquo; Returns</h1>
 
 <!-- case of a mistake in transfert loop -->
@@ -275,4 +280,9 @@
 	document.mainform.barcode.focus();
 </script>
 
-<!-- TMPL_INCLUDE Name="intranet-bottom.inc" -->
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tmpl
index 3ee5c66a3d..747bfebff1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tmpl
@@ -1,9 +1,14 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Circulation &rsaquo; Set Library</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
 
 <h1>Circulation &rsaquo; Set Library</h1>
 
@@ -39,5 +44,9 @@
 </form>
 
 
-<!-- TMPL_INCLUDE Name="intranet-bottom.inc" -->
+</div>
+</div>
+</div>
 
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/stats.tmpl
index 5b4763317d..240be69d71 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/stats.tmpl
@@ -1,9 +1,15 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Statistics</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!--TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-circ.inc"-->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
     <!-- TMPL_IF NAME="notime" -->
         <h1>Display statistics for:</h1>
         <ul>
@@ -36,4 +42,9 @@
     	<!-- /TMPL_IF -->
 	
     <!-- /TMPL_IF -->
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl
index 40a689c91c..908f46e688 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl
@@ -5,11 +5,15 @@
 (<!-- TMPL_VAR NAME="cardnumber" -->)
 <!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
 
-<div id="mainbloc">
     <h1>Transfers to do <!-- TMPL_VAR NAME="show_date" --></h1>
     <!-- TMPL_IF name="branchesloop" -->
     <div id="resultlist">
@@ -59,12 +63,16 @@
                 </tr>
             <!-- /TMPL_LOOP -->
             </table>
-            <br /><br />
             <!-- /TMPL_IF -->
         <!-- /TMPL_LOOP -->
     </div>
     <!-- TMPL_ELSE -->
         <p>No transfers to do</p>
     <!-- /TMPL_IF -->
+
+</div>
 </div>
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl
index cdb9a9d569..c2b7f2d5a7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl
@@ -1,10 +1,15 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Circulation</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
 
-<div id="mainbloc">
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 	<h1>Transfers made TO your library on : <!-- TMPL_VAR NAME="show_date" --></h1>
 	<!-- TMPL_IF name="branchesloop" -->
             <p>Your library is the destination for the following transfer(s)</p>
@@ -61,12 +66,16 @@
                     </tr>
                 <!-- /TMPL_LOOP -->	
                 </table>
-                <br /><br />
                 <!-- /TMPL_IF -->
             <!-- /TMPL_LOOP -->
             </div>
         <!-- TMPL_ELSE -->
             <p>No transfers to recieve</p>
         <!-- /TMPL_IF -->
+
+</div>
 </div>
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl
index c832949758..e8d3a5ddc7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl
@@ -1,12 +1,17 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Circulation</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <h1>Circulation: Library Holds</h1>
 
-<div id="mainbloc">
         <h2>Holds for your library on : <!-- TMPL_VAR NAME="show_date" --></h2>
         <!-- TMPL_IF NAME="messagetransfert" -->
                 <div>
@@ -81,5 +86,10 @@
                 <!-- /TMPL_IF -->
         </div>
         <!-- /TMPL_UNLESS -->
+
+</div>
 </div>
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-bib-search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-bib-search.tmpl
index 82feff00ff..118030d78b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-bib-search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-bib-search.tmpl
@@ -29,5 +29,8 @@
 	</div>
 </form>
 </div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+</div>
+</div>
 
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl
index df5f979f18..9b8f89a2b4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl
@@ -1,36 +1,27 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><title>Koha &rsaquo;  Labels</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-labels.inc" -->
 
-<div id="main">
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <!-- TMPL_INCLUDE NAME="label-status.inc" -->
 <form name="input" action="/cgi-bin/koha/labels/label-manager.pl" method="get">
 
+<h3>Layout Name</h3>
+<input type="textbox" name="layoutname"  size="20" value="<!-- TMPL_VAR NAME="layoutname" -->" />
 
+<h3>Choose Order Of Fields to Print</h3>
 
-<h3>
-        Layout Name
-
-</h3>
-<input type="textbox" name="layoutname"  SIZE="20"
-        value="<!-- TMPL_VAR NAME="layoutname" -->">
-
-
-<p>
-<p>
-<p>
-
-
-
-<h3>
-        Choose Order Of Fields to Print
-</h3>
 <table summary="fields to print">
 <tr>
         <td>
         <select name="tx_title">
-        <option value="0" SELECTED></option>
+        <option value="0" selected="selected"></option>
         <option value="1">1</option>
         <option value="2">2</option>
         <option value="3">3</option>
@@ -46,7 +37,7 @@
         </td>
 <td>
         <select name="tx_subtitle">
-          <option value="0" SELECTED></option>
+          <option value="0" selected="selected"></option>
         <option value="1">1</option>
         <option value="2">2</option>
         <option value="3">3</option>
@@ -63,7 +54,7 @@
  
         <td>
         <select name="tx_author">
-         <option value="0" SELECTED></option>
+         <option value="0" selected="selected"></option>
         <option value="1">1</option>
         <option value="2">2</option>
         <option value="3">3</option>
@@ -81,7 +72,7 @@
 <tr>
         <td>
         <select name="tx_isbn">
-         <option value="0" SELECTED></option>
+         <option value="0" selected="selected"></option>
         <option value="1">1</option>
         <option value="2">2</option>
         <option value="3">3</option>
@@ -98,7 +89,7 @@
 
         <td>
         <select name="tx_issn">
-          <option value="0" SELECTED></option>
+          <option value="0" selected="selected"></option>
         <option value="1">1</option>
         <option value="2">2</option>
         <option value="3">3</option>
@@ -113,10 +104,9 @@
         <label>ISSN</label>
         </td>
 
-
         <td>
         <select name="tx_itemtype">
-         <option value="0" SELECTED></option>
+         <option value="0" selected="selected"></option>
         <option value="1">1</option>
         <option value="2">2</option>
         <option value="3">3</option>
@@ -136,7 +126,7 @@
 <tr>
         <td>
         <select name="tx_dewey">
-         <option value="0" SELECTED></option>
+         <option value="0" selected="selected"></option>
         <option value="1">1</option>
         <option value="2">2</option>
         <option value="3">3</option>
@@ -153,7 +143,7 @@
 
         <td>
         <select name="tx_barcode">
-         <option value="0" SELECTED></option>
+         <option value="0" selected="selected"></option>
         <option value="1">1</option>
         <option value="2">2</option>
         <option value="3">3</option>
@@ -168,10 +158,9 @@
         <label>Barcode</label>
         </td>
 
-
         <td>
         <select name="tx_classif">
-         <option value="0" SELECTED></option>
+         <option value="0" selected="selected"></option>
         <option value="1">1</option>
         <option value="2">2</option>
         <option value="3">3</option>
@@ -189,7 +178,7 @@
 <tr>
         <td>
         <select name="tx_subclass">
-         <option value="0" SELECTED></option>
+         <option value="0" selected="selected"></option>
         <option value="1">1</option>
         <option value="2">2</option>
         <option value="3">3</option>
@@ -203,11 +192,9 @@
        </select>
         <label>Sub-Class</label>
         </td>
-
-
         <td>
         <select name="tx_itemcallnumber">
-          <option value="0" SELECTED></option>
+          <option value="0" selected="selected"></option>
         <option value="1">1</option>
         <option value="2">2</option>
         <option value="3">3</option>
@@ -221,61 +208,41 @@
       </select>
         <label>Call Number</label>
         </td>
-
-
   </tr>
-
-
-
-
-
-
-
-
 </table>
-<p>
-
-
 
 <h3>Choose Barcode Type</h3>
 <select name="barcodetype">
     <!-- TMPL_LOOP NAME="barcode_types" -->
-        <option value="<!-- TMPL_VAR NAME="code" -->"
-            <!-- TMPL_IF NAME="active" --> selected  <!-- /TMPL_IF -->
-        ><!-- TMPL_VAR NAME="desc" --></option>
+	<!-- TMPL_IF NAME="active" --><option value="<!-- TMPL_VAR NAME="code" -->" selected="selected"><!-- TMPL_VAR NAME="desc" --></option>
+	<!-- TMPL_ELSE -->
+        <option value="<!-- TMPL_VAR NAME="code" -->"><!-- TMPL_VAR NAME="desc" --></option>
+		<!-- /TMPL_IF -->
     <!-- /TMPL_LOOP -->
 </select>
 
-
-
 <h3>Choose Layout Type</h3>
 <select name="printingtype">
     <!-- TMPL_LOOP NAME="printingtypes" -->
-        <option value="<!-- TMPL_VAR NAME="code" -->"
-            <!-- TMPL_IF NAME="active" --> selected  <!-- /TMPL_IF -->
-        ><!-- TMPL_VAR NAME="desc" --></option>
+	<!-- TMPL_IF NAME="active" -->
+        <option value="<!-- TMPL_VAR NAME="code" -->" selected="selected"><!-- TMPL_VAR NAME="desc" --></option>
+	<!-- TMPL_ELSE -->
+        <option value="<!-- TMPL_VAR NAME="code" -->"><!-- TMPL_VAR NAME="desc" --></option>
+	<!-- /TMPL_IF -->
     <!-- /TMPL_LOOP -->
 </select>
 
+<h3>Start printing from Label number:<input type="textbox" name="startlabel"  size="2" value="1" /></h3>
 
 
-
-<h3>
-        Start printing from Label number:<input type="textbox" name="startlabel"  SIZE="2" value="1">
-
-
-</h3>
-
-<p>
-<p>
-<h3>Draw Guide Boxes<input type="checkbox" name="guidebox" value=1></h3>
-<p>
-<p>
-<p>
-        <input type="submit" value="Submit">
-		<input type="hidden" name=op value="add_layout"> 
-</p>
+<h3>Draw Guide Boxes<input type="checkbox" name="guidebox" value="1" /></h3>
+        <input type="submit" value="Submit" />
+		<input type="hidden" name="op" value="add_layout" />
 </form>
+
+</div>
+</div>
 </div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
 
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl
index 46e46eef49..9065e66477 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl
@@ -1,15 +1,17 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><title>Koha &rsaquo;  Labels</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-labels.inc" -->
 
-<div id="main">
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
 
 <form name="input" action="/cgi-bin/koha/labels/label-create-template.pl" method="get">
 
-<h3>
-        Create Label Template
-</h3>
+<h3>Create Label Template</h3>
 
 
 
@@ -42,26 +44,21 @@ Template Description: <textarea name="tmpl_desc" cols="40" rows="3" name="tmpl_d
 </table>
 
 
-<br />
 Units: <select name="units">
     <!-- TMPL_LOOP NAME="units" -->
         <option value="<!-- TMPL_VAR NAME="unit" -->"><!-- TMPL_VAR NAME="desc" --></option>
     <!-- /TMPL_LOOP -->
 </select>
-
-<br />
-<br />
 Font Size: <input type="textbox" name="fontsize"  size="1" value="" />
-<br />
-<br />
 Active: <input type="checkbox" name="active" />
-
         <input type="hidden" name="op" value="create" />
-<br />
-<br />
         <input type="submit" value="Save" />
         <input type="reset" value="Reset" />
 </form>
+
+</div>
+</div>
 </div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
 
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tmpl
index aa0fd867d3..36f5040027 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tmpl
@@ -1,39 +1,42 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Labels<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE name="masthead.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Labels
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="label-topmenu.inc" -->
-<!-- TMPL_INCLUDE name="intranet-nav.inc" -->
 
-<div id="main">
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
 
 <form name="input" action="/cgi-bin/koha/labels/label-manager.pl" method="get">
 
 <h3>Layout Name</h3>
-<input type="textbox" name="layoutname"  SIZE="20" value="<!-- TMPL_VAR NAME="layoutname" -->">
-
-<br />
-<br />
+<input type="textbox" name="layoutname"  size="20" value="<!-- TMPL_VAR NAME="layoutname" -->" />
 
 <h3>Choose Barcode Type (encoding)</h3>
 <select name="barcodetype">
     <!-- TMPL_LOOP NAME="barcode_types" -->
-        <option value="<!-- TMPL_VAR NAME="code" -->"
-            <!-- TMPL_IF NAME="active" --> selected  <!-- /TMPL_IF -->
-        ><!-- TMPL_VAR NAME="desc" --></option>
+	<!-- TMPL_IF NAME="active" -->
+        <option value="<!-- TMPL_VAR NAME="code" -->" selected="selected"><!-- TMPL_VAR NAME="desc" --></option>
+	<!-- TMPL_ELSE -->
+        <option value="<!-- TMPL_VAR NAME="code" -->"><!-- TMPL_VAR NAME="desc" --></option>
+	<!-- /TMPL_IF -->
     <!-- /TMPL_LOOP -->
 </select>
-<br />
+
 
 <h3>Choose Layout Type</h3>
 <select name="printingtype">
     <!-- TMPL_LOOP NAME="printingtypes" -->
-        <option value="<!-- TMPL_VAR NAME="code" -->"
-            <!-- TMPL_IF NAME="active" --> selected  <!-- /TMPL_IF -->>
-        <!-- TMPL_VAR NAME="desc" --></option>
+<!-- TMPL_IF NAME="active" -->
+	<option value="<!-- TMPL_VAR NAME="code" -->" selected="selected"><!-- TMPL_VAR NAME="desc" --></option>
+	<!-- TMPL_ELSE -->
+        <option value="<!-- TMPL_VAR NAME="code" -->"><!-- TMPL_VAR NAME="desc" --></option>
+<!-- /TMPL_IF -->
     <!-- /TMPL_LOOP -->
 </select>
 
-<br />
-<br />
 
 <h3>
     Choose Order Of Text Fields to Print
@@ -43,9 +46,15 @@
         <td>
  <select name="tx_title">
             <!-- TMPL_LOOP Name="tx_title" -->
-                <option value="<!-- TMPL_VAR Name="num" -->"<!-- TMPL_IF Name="selected" --> selected <!-- /TMPL_IF -->>
+			<!-- TMPL_IF Name="selected" -->
+                <option value="<!-- TMPL_VAR Name="num" -->" selected="selected">
+                    <!-- TMPL_VAR Name="num" -->
+                </option>
+			<!-- TMPL_ELSE -->
+                <option value="<!-- TMPL_VAR Name="num" -->">
                     <!-- TMPL_VAR Name="num" -->
                 </option>
+		<!-- /TMPL_IF -->
             <!-- /TMPL_LOOP -->
             </select>
         <label>Title</label>
@@ -53,9 +62,15 @@
             <td>
         <select name="tx_subtitle">
                  <!-- TMPL_LOOP Name="tx_subtitle" -->
-                <option value="<!-- TMPL_VAR Name="num" -->"<!-- TMPL_IF Name="selected" --> selected <!-- /TMPL_IF -->>
+         <!-- TMPL_IF Name="selected" -->
+				<option value="<!-- TMPL_VAR Name="num" -->" selected="selected">
                     <!-- TMPL_VAR Name="num" -->
                 </option>
+			<!-- TMPL_ELSE -->	
+                <option value="<!-- TMPL_VAR Name="num" -->">
+                    <!-- TMPL_VAR Name="num" -->
+                </option>
+			<!-- /TMPL_IF -->	
             <!-- /TMPL_LOOP -->
       </select>
         <label>Subtitle</label>
@@ -64,9 +79,15 @@
         <td>
         <select name="tx_author">
              <!-- TMPL_LOOP Name="tx_author" -->
-                <option value="<!-- TMPL_VAR Name="num" -->"<!-- TMPL_IF Name="selected" --> selected <!-- /TMPL_IF -->>
+		<!-- TMPL_IF Name="selected" -->	 
+                <option value="<!-- TMPL_VAR Name="num" -->" selected="selected">
+                    <!-- TMPL_VAR Name="num" -->
+                </option>
+		<!-- TMPL_ELSE -->		
+                <option value="<!-- TMPL_VAR Name="num" -->">
                     <!-- TMPL_VAR Name="num" -->
                 </option>
+		<!-- /TMPL_IF -->		
             <!-- /TMPL_LOOP -->
             </select>
        <label>Author</label>
@@ -76,9 +97,15 @@
         <td>
         <select name="tx_isbn">
               <!-- TMPL_LOOP Name="tx_isbn" -->
-                <option value="<!-- TMPL_VAR Name="num" -->"<!-- TMPL_IF Name="selected" --> selected <!-- /TMPL_IF -->>
+		<!-- TMPL_IF Name="selected" -->	  
+                <option value="<!-- TMPL_VAR Name="num" -->" selected="selected">
+                    <!-- TMPL_VAR Name="num" -->
+                </option>
+		<!-- TMPL_ELSE -->		
+                <option value="<!-- TMPL_VAR Name="num" -->">
                     <!-- TMPL_VAR Name="num" -->
                 </option>
+		<!-- /TMPL_IF -->		
             <!-- /TMPL_LOOP -->
             </select>
       <label>ISBN</label>
@@ -87,18 +114,30 @@
         <td>
         <select name="tx_issn">
                <!-- TMPL_LOOP Name="tx_issn" -->
-                <option value="<!-- TMPL_VAR Name="num" -->"<!-- TMPL_IF Name="selected" --> selected <!-- /TMPL_IF -->>
+		<!-- TMPL_IF Name="selected" -->	   
+                <option value="<!-- TMPL_VAR Name="num" -->" selected="selected">
                     <!-- TMPL_VAR Name="num" -->
                 </option>
+		<!-- TMPL_ELSE -->		
+                <option value="<!-- TMPL_VAR Name="num" -->">
+                    <!-- TMPL_VAR Name="num" -->
+                </option>
+		<!-- /TMPL_IF -->		
             <!-- /TMPL_LOOP -->
             </select>
      <label>ISSN</label>
         <td>
         <select name="tx_itemtype">
                  <!-- TMPL_LOOP Name="tx_itemtype" -->
-                <option value="<!-- TMPL_VAR Name="num" -->"<!-- TMPL_IF Name="selected" --> selected <!-- /TMPL_IF -->>
+		<!-- TMPL_IF Name="selected" -->		 
+                <option value="<!-- TMPL_VAR Name="num" -->" selected="selected">
+                    <!-- TMPL_VAR Name="num" -->
+                </option>
+			<!-- TMPL_ELSE -->	
+                <option value="<!-- TMPL_VAR Name="num" -->">
                     <!-- TMPL_VAR Name="num" -->
                 </option>
+		<!-- /TMPL_IF -->		
             <!-- /TMPL_LOOP -->
             </select>
    <label>Itemtype</label>
@@ -108,9 +147,15 @@
         <td>
         <select name="tx_dewey">
                 <!-- TMPL_LOOP Name="tx_dewey" -->
-                <option value="<!-- TMPL_VAR Name="num" -->"<!-- TMPL_IF Name="selected" --> selected <!-- /TMPL_IF -->>
+		<!-- TMPL_IF Name="selected" -->		
+                <option value="<!-- TMPL_VAR Name="num" -->" selected="selected">
                     <!-- TMPL_VAR Name="num" -->
                 </option>
+			<!-- TMPL_ELSE -->	
+                <option value="<!-- TMPL_VAR Name="num" -->">
+                    <!-- TMPL_VAR Name="num" -->
+                </option>
+			<!-- /TMPL_IF -->	
             <!-- /TMPL_LOOP -->
        </select>
         <label>Dewey</label>
@@ -118,9 +163,15 @@
         <td>
         <select name="tx_barcode">
                  <!-- TMPL_LOOP Name="tx_barcode" -->
-                <option value="<!-- TMPL_VAR Name="num" -->"<!-- TMPL_IF Name="selected" --> selected <!-- /TMPL_IF -->>
+		<!-- TMPL_IF Name="selected" -->		 
+                <option value="<!-- TMPL_VAR Name="num" -->" selected="selected">
+                    <!-- TMPL_VAR Name="num" -->
+                </option>
+			<!-- TMPL_ELSE -->	 
+                <option value="<!-- TMPL_VAR Name="num" -->">
                     <!-- TMPL_VAR Name="num" -->
                 </option>
+			<!-- /TMPL_IF -->	
             <!-- /TMPL_LOOP -->
       </select>
         <label>Barcode (as text)</label>
@@ -128,9 +179,15 @@
         <td>
         <select name="tx_classif">
                   <!-- TMPL_LOOP Name="tx_classif" -->
-                <option value="<!-- TMPL_VAR Name="num" -->"<!-- TMPL_IF Name="selected" --> selected <!-- /TMPL_IF -->>
+		<!-- TMPL_IF Name="selected" -->		    
+                <option value="<!-- TMPL_VAR Name="num" -->" selected="selected">
                     <!-- TMPL_VAR Name="num" -->
                 </option>
+			<!-- TMPL_ELSE -->	  
+                <option value="<!-- TMPL_VAR Name="num" -->">
+                    <!-- TMPL_VAR Name="num" -->
+                </option>
+		<!-- /TMPL_IF -->		
             <!-- /TMPL_LOOP -->
      </select>
         <label>Classification</label>
@@ -140,9 +197,15 @@
         <td>
         <select name="tx_subclass">
                   <!-- TMPL_LOOP Name="tx_subclass" -->
-                <option value="<!-- TMPL_VAR Name="num" -->"<!-- TMPL_IF Name="selected" --> selected <!-- /TMPL_IF -->>
+		<!-- TMPL_IF Name="selected" -->		  
+                <option value="<!-- TMPL_VAR Name="num" -->" selected="selected">
+                    <!-- TMPL_VAR Name="num" -->
+                </option>
+			<!-- TMPL_ELSE -->	  
+                <option value="<!-- TMPL_VAR Name="num" -->">
                     <!-- TMPL_VAR Name="num" -->
                 </option>
+			<!-- /TMPL_IF -->	
             <!-- /TMPL_LOOP -->
      </select>
         <label>Subclass</label>
@@ -150,33 +213,45 @@
             <td>
         <select name="tx_itemcallnumber">
                  <!-- TMPL_LOOP Name="tx_itemcallnumber" -->
-                <option value="<!-- TMPL_VAR Name="num" -->"<!-- TMPL_IF Name="selected" --> selected <!-- /TMPL_IF -->>
+			<!-- TMPL_IF Name="selected" -->	  
+                <option value="<!-- TMPL_VAR Name="num" -->" selected="selected">
+                    <!-- TMPL_VAR Name="num" -->
+                </option>
+			<!-- TMPL_ELSE -->	 
+                <option value="<!-- TMPL_VAR Name="num" -->">
                     <!-- TMPL_VAR Name="num" -->
                 </option>
+			<!-- /TMPL_IF -->	
             <!-- /TMPL_LOOP -->
       </select>
         <label>Call Number</label>
         </td>
+		<td>&nbsp;</td>
   </tr>
 </table>
 
-<br />
+
 <h3>
-        Start printing from Label number:<input type="textbox" name="startlabel"  SIZE="1"  value=" <!-- TMPL_VAR NAME="startlabel" --> ">
+        Start printing from Label number: <input type="textbox" name="startlabel"  size="1"  value=" <!-- TMPL_VAR NAME="startlabel" --> " />
 </h3>
 
-<br />
-<h3>Draw Guide Boxes<input type="checkbox" name="guidebox" value=1 
-                <!-- TMPL_IF NAME="guidebox"-->
-                     checked
-                <!-- /TMPL_IF -->  ></h3>
+<h3>Draw Guide Boxes 
+<!-- TMPL_IF NAME="guidebox"-->
+<input type="checkbox" name="guidebox" value="1"  checked="checked" />
+<!-- TMPL_ELSE -->
+<input type="checkbox" name="guidebox" value="1" />
+<!-- /TMPL_IF -->
+</h3>
 
 <p>
-        <input type="submit" value="Submit">
-        <input type="hidden" name=op value="save_layout">
-        <input type="hidden" name=layout_id value="<!-- TMPL_VAR NAME="layout_id" -->">
+        <input type="submit" value="Submit" />
+        <input type="hidden" name="op" value="save_layout" />
+        <input type="hidden" name="layout_id" value="<!-- TMPL_VAR NAME="layout_id" -->" />
 </p>
 </form>
 </div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+</div>
+</div>
 
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tmpl
index f4f886d6d5..2616d79dbd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tmpl
@@ -1,16 +1,17 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><title>Koha &rsaquo;  Labels</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-labels.inc" -->
 
-<div id="main">
-<form name="input" action="/cgi-bin/koha/labels/label-save-template.pl" method="get">
-
-<h3>
-        Edit Label Template
-</h3>
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
 
+<form name="input" action="/cgi-bin/koha/labels/label-save-template.pl" method="get">
 
+<h3>Edit Label Template</h3>
 
 <h3>Template Settings</h3>
 <table>
@@ -54,12 +55,7 @@ Units: <select name="units">
     <!-- /TMPL_LOOP -->
 </select>
 
-<br />
-<br />
 Font Size: <input type="textbox" name="fontsize"  size="1" value="<!-- TMPL_VAR NAME="fontsize" -->" />
-<br />
-<br />
-
 
 Active: 
 <!-- TMPL_IF NAME="active" -->
@@ -75,5 +71,8 @@ Active:
 </p>
 </form>
 </div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+</div>
+</div>
 
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl
index ddbdd0f81a..1a32f9c501 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl
@@ -1,9 +1,14 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><title>Koha &rsaquo;  Labels</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-labels.inc" -->
 
-<div id="main">
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <!-- TMPL_INCLUDE NAME="label-status.inc" -->
 
 <!-- TMPL_IF NAME="layout_loop" -->
@@ -52,6 +57,10 @@
 </form>
 <!-- /TMPL_IF -->
 <p><a href="/cgi-bin/koha/labels/label-create-layout.pl">Create New Layout</a></p>
+
+</div>
+</div>
 </div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
 
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl
index e0f80d3fda..e81accc750 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl
@@ -1,9 +1,14 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><title>Koha &rsaquo;  Labels</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-labels.inc" -->
 
-<div id="main">
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <!-- TMPL_INCLUDE NAME="label-status.inc" -->
 
 <!-- TMPL_UNLESS NAME="batch_id" -->
@@ -93,19 +98,21 @@
 
 <!-- /TMPL_UNLESS -->
 
-
+<script type="text/javascript">
+function Plugin(batch_id) {
+	window.open("label-item-search.pl?batch_id="+batch_id+"",'FindABibIndex','width=600,height=460,toolbar=no,scrollbars=yes');
+}
+</script>
 
+</div>
+</div>
 </div>
 
-
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
 
 
 
-<script type="text/javascript">
-function Plugin(batch_id) {
-	window.open("label-item-search.pl?batch_id="+batch_id+"",'FindABibIndex','width=600,height=460,toolbar=no,scrollbars=yes');
-}
-</script>
+
 
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-templates.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-templates.tmpl
index 042687e942..079cf7bdcb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-templates.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-templates.tmpl
@@ -1,9 +1,14 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><title>Koha &rsaquo;  Labels</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-labels.inc" -->
 
-<div id="main">
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <!-- TMPL_INCLUDE NAME="label-status.inc" -->
 
 <!-- TMPL_IF NAME="resultsloop" -->
@@ -50,8 +55,11 @@
 </form>
 <!-- /TMPL_IF -->
 
-<br/>
 <a href="/cgi-bin/koha/labels/label-create-template.pl?op=blank">Create New Label Template</a>
+
+</div>
+</div>
 </div>
 
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/maint/catmaintain.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/maint/catmaintain.tmpl
index e19876d118..fcf5c2c921 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/maint/catmaintain.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/maint/catmaintain.tmpl
@@ -1,6 +1,13 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Catalog Maintenance</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
+
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
 
 <!-- TMPL_IF NAME="allsub-p" -->
 <table>
@@ -104,5 +111,9 @@ is now <!-- TMPL_VAR NAME="sub" ESCAPE="HTML" -->
 
 <!-- /TMPL_IF -->
 
+</div>
+</div>
+</div>
 
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl
index e78c8024c1..b2a2a513b4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl
@@ -1,10 +1,15 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Account for  <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-members.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <!-- The manual invoice and credit buttons -->
 <div id="action">
     <div class="edit">
@@ -46,4 +51,9 @@
   </tfoot>
 </table>
 
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/borrowers_details.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/borrowers_details.tmpl
index a6ca03072d..d4c2f3ecfb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/borrowers_details.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/borrowers_details.tmpl
@@ -1,7 +1,14 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Patron Details</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<div id="mainbloc">
+<!-- TMPL_INCLUDE NAME="header.inc" -->
+
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 	<h1>PATRON DETAILS</h1>
 	
 	<form name="form" method="post" action="/cgi-bin/members/borrowers_details.pl">
@@ -58,4 +65,9 @@
 	</form>
 
 
+</div>
+</div>
+</div>
 
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tmpl
index 9545c62b01..ca8f198b7b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tmpl
@@ -1,8 +1,15 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Can't Delete Patron</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-members.inc" -->
+
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 	<h3>Cannot Delete Patron</h3>
 		<!-- TMPL_IF name="ItemsOnIssues" -->
 			Patron has <!-- TMPL_VAR name="ItemsOnIssues" --> item(s) checked out.
@@ -14,4 +21,9 @@
 			Patron's record has guaranteed accounts attached.
 		<!-- /TMPL_IF -->
 
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/guarantor_search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/guarantor_search.tmpl
index 0c25e0ad4f..9f773677e3 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/guarantor_search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/guarantor_search.tmpl
@@ -1,6 +1,12 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Guarantor Search</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
+
+<div id="doc" class="yui-t7">
+   <div id="bd">
+	<div class="yui-g">
+
 <h1>Search for guarantor</h1>
 	<form action="/cgi-bin/koha/members/guarantor_search.pl" method="post">
 		<input type="text" name="member" value="<!-- TMPL_VAR NAME="member" -->" /> Ordered by
@@ -41,4 +47,8 @@
 <!--/TMPL_IF-->
 
 
+</div>
+</div>
+</div>
 
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tmpl
index 3681f1549c..d7de3571e4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tmpl
@@ -1,10 +1,15 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Borrowers &rsaquo; Create Manual Credit</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-members.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <h2>Manual Credit</h2>
 <form action="/cgi-bin/koha/members/mancredit.pl" method="post">
 <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR Name="borrowernumber" -->" />
@@ -26,5 +31,9 @@
 <form action="/cgi-bin/koha/members/boraccount.pl" method="get"><input type="hidden" value="<!-- TMPL_VAR Name="borrowernumber" -->" name="borrowernumber" /><input type="submit" value="Cancel" /></form>
 
 
+</div>
+</div>
+</div>
 
-<!-- TMPL_INCLUDE Name="intranet-bottom.inc" -->
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tmpl
index c353a459a0..443baf9a91 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tmpl
@@ -1,10 +1,15 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Borrowers &rsaquo; Create Manual Invoice</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-members.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <!-- TMPL_IF NAME="ERROR" -->
 <!-- TMPL_IF NAME="ITEMNUMBER" -->
   ERROR an invalid itemnumber was entered, please hit back and try again
@@ -33,5 +38,9 @@
 
 <!-- /TMPL_IF -->
 
+</div>
+</div>
+</div>
 
-<!-- TMPL_INCLUDE Name="intranet-bottom.inc" -->
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tmpl
index ddee4180a0..aea882c19b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tmpl
@@ -1,10 +1,15 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Set Privileges for <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-members.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <form method="post" action="/cgi-bin/koha/members/member-flags.pl">
     <input type="hidden" name="member" value="<!-- TMPL_VAR NAME="member" -->" />
     <input type="hidden" name="newflags" value="1" />
@@ -29,4 +34,9 @@
 <input type="submit" value="Set Flags" />
 
 </form>
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tmpl
index 9f01757df4..6af1c9eca0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tmpl
@@ -1,10 +1,15 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title><!-- TMPL_IF NAME="newpassword" -->Password Updated <!-- TMPL_ELSE -->Update Password for <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --><!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-members.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <!-- TMPL_IF NAME="newpassword" -->
 <h1>Password Updated</h1>
 
@@ -29,4 +34,9 @@
 <p><input type="submit" value="Confirm Password" /></p>
 </form><!-- /TMPL_IF -->
 
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-quicksearch-results.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-quicksearch-results.tmpl
index 54a55594b0..7c980d9170 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-quicksearch-results.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-quicksearch-results.tmpl
@@ -1,8 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Patron Quick Search</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<script type="text/javascript">
+<!-- TMPL_INCLUDE NAME="header.inc" --><script type="text/javascript">
   // Set the value of the form field to the passed value and optionally shift
     // focus and close the popup.
     function FillForm(val,formname,formfield) {
@@ -17,6 +16,12 @@
     }
 </script>
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <div class="searchresults">
 <table>
   <tr>
@@ -42,5 +47,9 @@
   </div>
   <!-- TMPL_ELSE -->No results found<!-- /TMPL_IF -->
 
+</div>
+</div>
+</div>
 
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-quicksearch.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-quicksearch.tmpl
index 406e4d5780..e096ff75d7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-quicksearch.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-quicksearch.tmpl
@@ -2,9 +2,20 @@
 <title>Koha &rsaquo; Patron Quick Search</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
-    <form action="/cgi-bin/koha/members/member.pl" method="post" id="mainform" class="mainform">
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
+<!-- TMPL_INCLUDE NAME="header.inc" -->    <form action="/cgi-bin/koha/members/member.pl" method="post" id="mainform" class="mainform">
     <label for="member">Patron Search:</label><input id="member" type="text" size="25" name="member" /><input type="hidden" name="quicksearch" value="1" />
     <input type="submit" value="Search" />
     </form>
 
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
index 2e09debbbe..33fae1f965 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
@@ -1,10 +1,16 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Patrons &rsaquo; Search Results</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 
 <!-- TMPL_INCLUDE NAME="menu-members.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">patrons</a><!-- TMPL_IF NAME="searching" --> &rsaquo; <a>Search Results</a><!-- /TMPL_IF -->
 
 <form name="f" action="/cgi-bin/koha/members/member.pl" method="post">
@@ -89,6 +95,10 @@ No results found
 //set the focus to the input text.    
 document.f.member.focus();
 </script>
+
 </div>
 </div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryA.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryA.tmpl
index 17dd292041..09eca91499 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryA.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryA.tmpl
@@ -1,11 +1,17 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Adult Patron Management</title>
-<script type="text/javascript" src="<!-- TMPL_VAR NAME='themelang' -->/js/members.js"></script>
+<script type="text/javascript" src="<!-- TMPL_VAR NAME="themelang" -->/js/members.js"></script>
 <!-- TMPL_INCLUDE NAME="calendar.inc" -->
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-members.inc" -->
+
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 	<!-- TMPL_IF NAME="opadd" -->
 	<h1>
 		Add adult patron (step <!-- TMPL_VAR NAME="step" -->) <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" -->
@@ -619,4 +625,9 @@
 		</form>
 	<!-- /TMPL_IF -->
 
-<!--	 TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryC.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryC.tmpl
index 5ea86714aa..40e75519a0 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryC.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryC.tmpl
@@ -3,10 +3,15 @@
 <script type="text/javascript" src="<!-- TMPL_VAR NAME='themelang' -->/js/members.js"></script>
 <!-- TMPL_INCLUDE NAME="calendar.inc" -->
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-members.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 	<!-- TMPL_IF NAME="add" -->
 	<h1>
 		Add child patron (step <!-- TMPL_VAR NAME="step" -->) <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" -->
@@ -667,4 +672,9 @@
 		</div>
 	</form>
 <!-- /TMPL_IF -->
-<!--	 TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryI.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryI.tmpl
index 8a06f36079..4d3d3995d1 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryI.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryI.tmpl
@@ -3,10 +3,15 @@
 <script type="text/javascript" src="<!-- TMPL_VAR NAME='themelang' -->/js/members.js"></script>
 <!-- TMPL_INCLUDE NAME="calendar.inc" -->
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-members.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
     <!-- TMPL_IF NAME="opadd" -->
         <h1>
                 Add organisation patron (step <!-- TMPL_VAR NAME="step" -->) <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" -->
@@ -475,4 +480,9 @@
                 </div>
         </form>
 <!-- /TMPL_IF -->
-<!--	 TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryP.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryP.tmpl
index 2623a2b5b2..72520ef413 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryP.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryP.tmpl
@@ -3,10 +3,15 @@
 <script type="text/javascript" src="<!-- TMPL_VAR NAME='themelang' -->/js/members.js"></script>
 <!-- TMPL_INCLUDE NAME="calendar.inc" -->
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-members.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
     <!-- TMPL_IF NAME="opadd" -->
     <h1>Add professional patron (step <!-- TMPL_VAR NAME="step" -->) <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" --></h1>
     <!-- TMPL_ELSE -->
@@ -666,5 +671,9 @@
         </div>
     </form>
 <!-- /TMPL_IF -->
-<!--     TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+</div>
+</div>
+</div>
 
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tmpl
index 19d2980bd6..7f987ced3f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tmpl
@@ -1,6 +1,13 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Summary for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
+
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
 
 <h3><a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR NAME="cardnumber" -->">Account Summary: <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)</a></h3>
 
@@ -57,4 +64,9 @@
 
 <!-- endmenu -->
 
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl
index 896ffa9bd4..3b2bccf403 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl
@@ -1,6 +1,13 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Print Receipt for <!-- TMPL_VAR NAME="cardnumber" --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
+
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
 
 <h3>Library</h3>
 <!-- TMPL_IF NAME="branchname" --><!-- TMPL_VAR NAME="branchname" --><br /><!-- /TMPL_IF -->
@@ -41,4 +48,9 @@ Issued To <a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR
 
 <!-- endmenu -->
 
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
index 382fc5a1ab..cac25799bf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
@@ -1,9 +1,15 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Patron Details</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-members.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <!-- TMPL_IF NAME="unknowuser" -->
     This patron doesn't exist.<a href="javascript:back();">Go Back</a>
 <!-- TMPL_ELSE -->
@@ -14,61 +20,45 @@
 <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
 </form>
 <div id="action">
-    <div class="edit">
-        <!-- TMPL_IF name="adultborrower" -->
-        <a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;guarantorid=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;category_type=C">
-            Add child
-            </a> 
+    
+	<div class="edit">
+        <ul><!-- TMPL_IF name="adultborrower" -->
+        <li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;guarantorid=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;category_type=C">Add child</a> </li>
         <!-- /TMPL_IF -->
         <!-- TMPL_IF NAME="category_type" -->
             <!--TMPL_IF NAME="guarantor"-->
-                <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;guarantorid=<!-- TMPL_VAR NAME="guarantorborrowernumber" -->&amp;category_type=<!-- TMPL_VAR NAME="category_type"-->">
+                <li><a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;guarantorid=<!-- TMPL_VAR NAME="guarantorborrowernumber" -->&amp;category_type=<!-- TMPL_VAR NAME="category_type"-->">
             <!--TMPL_ELSE-->
-            <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;category_type=<!-- TMPL_VAR NAME="category_type"-->">
-            <!--/TMPL_IF-->
-        Edit
-            </a>
+            <li><a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;category_type=<!-- TMPL_VAR NAME="category_type"-->">
+            <!--/TMPL_IF-->Edit</a></li>
         <!-- TMPL_ELSE --> <!-- try with categorycode if no category_type -->
             <!-- TMPL_IF NAME="categorycode" -->
-            <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;categorycode=<!-- TMPL_VAR NAME="categorycode"-->">
-                Edit
-            </a>
+            <li><a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;categorycode=<!-- TMPL_VAR NAME="categorycode"-->">Edit</a></li>
             <!-- TMPL_ELSE --> <!-- if no categorycode, set category_type to A by default -->
-                <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;category_type=A">
-                    Edit
-                </a>
+                <li><a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;category_type=A">Edit</a></li>
             <!-- /TMPL_IF -->
         <!-- /TMPL_IF -->
         
-        <a href="/cgi-bin/koha/members/member-password.pl?member=<!-- TMPL_VAR NAME="borrowernumber" -->">
-            Set password
-        </a>
-        <a href="/cgi-bin/koha/members/member-flags.pl?member=<!-- TMPL_VAR NAME="borrowernumber" -->">
-            Privileges
-        </a> 
-        <a href="javascript:confirm_deletion();">
-            Delete
-        </a> 
+        <li><a href="/cgi-bin/koha/members/member-password.pl?member=<!-- TMPL_VAR NAME="borrowernumber" -->">Set password</a></li>
+       <li> <a href="/cgi-bin/koha/members/member-flags.pl?member=<!-- TMPL_VAR NAME="borrowernumber" -->">Privileges</a></li> 
+        <li><a href="javascript:confirm_deletion();">Delete</a> </li></ul>
     </div>
+	
     <div class="view">
-        <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">
-            Account
-        </a> 
-        <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">
-            Pay fines
-        </a> 
-        <a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">
-            Reading record
-        </a>
-        <a href="javascript:confirm_reregistration();" onclick="document.form.value='y'" class="gest_borro_op">
-        Renew
-        </a>
+<ul>
+	<li>        <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Account</a> </li>
+	<li>        <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Pay fines</a> </li>
+	<li>        <a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Reading record</a></li>
+	<li>        <a href="javascript:confirm_reregistration();" onclick="document.form.value='y'" class="gest_borro_op">Renew</a></li>
+</ul>
     </div>
-    <div class="others">
         <!-- TMPL_IF NAME="CAN_user_parameters"-->
-        <a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&amp;module=MEMBERS&amp;action=MODIFY&amp;object=<!-- TMPL_VAR NAME="borrowernumber"-->">Modification log</a>
-        <!-- /TMPL_IF -->
+    <div class="others">
+<ul>
+	<li>        <a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&amp;module=MEMBERS&amp;action=MODIFY&amp;object=<!-- TMPL_VAR NAME="borrowernumber"-->">Modification log</a></li>
+</ul>
     </div>
+        <!-- /TMPL_IF -->
 </div>
 <!-- TMPL_IF NAME="flagged" -->
     <ul>
@@ -361,4 +351,9 @@ function confirm_reregistration() {
 }
 </script>
 <!-- /TMPL_IF --> <!-- unknowuser -->
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tmpl
index 3b32daa65e..b0516271ac 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tmpl
@@ -1,9 +1,15 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Pay Fines for  <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-members.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <h1>Pay Fines for <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --></h1>
 <form action="/cgi-bin/koha/members/pay.pl" method="post">
 	<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR name="borrowernumber" -->" />
@@ -56,4 +62,10 @@
 </table>
 <input type="submit" name="submit"  value="Make Payment" class="submit" /></form>
 <form action="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->" method="get"><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /> <input type="submit" value="Return to Patron Record" /></form>
+
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl
index ebb3a68938..dee785090a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl
@@ -1,10 +1,15 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Reading Record for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-members.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <!-- TMPL_IF NAME="showfulllink" -->
 <ul>
 	<li>Showing All Items</li>
@@ -73,4 +78,9 @@
 </table>
 <form action="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->" method="get"><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /> <input type="submit" value="Return to Patron Record" /></form>
 
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
index c60b8ea7ca..50945fd246 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
@@ -1,7 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Circulation</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
 
 <script language="JavaScript">
@@ -51,6 +51,13 @@ if (alreadyreserved > "0"){
 	}
 }
 </script>
+
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <!-- TMPL_IF NAME="messagetransfert" -->
 		<div>
 				<h2>Hold found for (<!-- TMPL_VAR NAME="nextreservtitle" -->), please transfer</h2>
@@ -324,4 +331,9 @@ if (alreadyreserved > "0"){
 </form>
 <!-- /TMPL_IF -->
 
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tmpl
index a2a87f93e9..aac755906d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tmpl
@@ -1,10 +1,15 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Reviews waiting for Approval</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!--TMPL_INCLUDE NAME="menu-reviews.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <h1>Reviews</h1>
 
 <!-- TMPL_IF NAME="reviews" -->
@@ -46,4 +51,9 @@
 <b>No reviews awaiting approval or deletion</b>
 <!-- /TMPL_IF -->
 
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tmpl
index d0b0a4ffd2..0c5d20aa09 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tmpl
@@ -1,6 +1,14 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Add to Virtual Shelf</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
+
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 
 <h1>Add 
     <i><!-- TMPL_VAR NAME="title" --></i>
@@ -40,5 +48,9 @@
     <input type="submit" value="Add to virtual shelf" class="submit" /> 
 </form>
 
-</body>
-</html>
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
index fda880b7ba..2a2248eabd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
@@ -1,17 +1,21 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Virtual Shelves</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-virtualshelves.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <!-- TMPL_IF NAME="viewshelf" -->
 <div id="action">
-    <a class="button" href="/cgi-bin/koha/virtualshelves/shelves.pl">Back to virtual Shelves</a>
+<ul>    <li><a href="/cgi-bin/koha/virtualshelves/shelves.pl">Back to virtual Shelves</a></li>
     <!-- TMPL_IF name="manageshelf" -->
-    <a class="button" href="/cgi-bin/koha/virtualshelves/shelves.pl?op=modif&amp;shelf=<!-- TMPL_VAR NAME="shelfnumber" -->">
-        Edit this shelf</a>
-    <!-- /TMPL_IF -->
+    <li><a  href="/cgi-bin/koha/virtualshelves/shelves.pl?op=modif&amp;shelf=<!-- TMPL_VAR NAME="shelfnumber" -->">Edit this shelf</a></li>
+    <!-- /TMPL_IF --></ul>
 </div>
 
 <h3>Contents of <!-- TMPL_VAR NAME="shelfname" --></h3>
@@ -219,7 +223,12 @@
     <!-- /TMPL_IF -->
 
 
-<br clear="both" />
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
 
 <script type="text/javascript">
 	function confirmDelete(s){
@@ -259,5 +268,3 @@
 	}
 	
 </script>
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-- 
2.20.1