From 737730e4a6e029ca97794d7a4769abe778012216 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Wed, 12 Sep 2007 15:11:49 -0500
Subject: [PATCH] Continuing to add resident search form and breakcrumbs.
 Markup cleanup all around.

Signed-off-by: Chris Cormack <crc@liblime.com>
---
 admin/categorie.pl                            |  2 +-
 .../prog/en/css/staff-global.css              |  5 ++
 .../prog/en/includes/admin-menu.inc           | 37 +++++++++++++
 .../prog/en/includes/circ-menu.inc            |  7 ++-
 .../en/includes/currencies-admin-search.inc   | 33 ++++++++++++
 .../prog/en/includes/members-menu.inc         | 14 ++---
 .../prog/en/includes/reports-menu.inc         | 29 ++++++++++
 .../prog/en/includes/z3950-admin-search.inc   | 33 ++++++++++++
 .../prog/en/modules/admin/admin-home.tmpl     | 11 ++--
 .../prog/en/modules/admin/aqbookfund.tmpl     | 37 ++++++-------
 .../prog/en/modules/admin/aqbudget.tmpl       | 40 +++++++++-----
 .../admin/auth_subfields_structure.tmpl       | 12 ++---
 .../en/modules/admin/auth_tag_structure.tmpl  | 16 +++---
 .../en/modules/admin/authorised_values.tmpl   | 13 +++--
 .../prog/en/modules/admin/authtypes.tmpl      | 16 +++---
 .../en/modules/admin/biblio_framework.tmpl    | 15 +++---
 .../prog/en/modules/admin/branches.tmpl       | 32 +++++------
 .../prog/en/modules/admin/categorie.tmpl      | 34 +++++++-----
 .../prog/en/modules/admin/categoryitem.tmpl   | 15 +++---
 .../prog/en/modules/admin/charges.tmpl        | 11 ++--
 .../prog/en/modules/admin/checkmarc.tmpl      | 14 ++---
 .../prog/en/modules/admin/cities.tmpl         | 14 +++--
 .../prog/en/modules/admin/currency.tmpl       | 27 ++++++----
 .../prog/en/modules/admin/finesrules.tmpl     | 15 +++---
 .../prog/en/modules/admin/issuingrules.tmpl   | 13 ++---
 .../prog/en/modules/admin/itemtypes.tmpl      | 54 +++++++++++--------
 .../prog/en/modules/admin/koha2marclinks.tmpl | 12 +++--
 .../admin/marc_subfields_structure.tmpl       | 14 +++--
 .../en/modules/admin/marctagstructure.tmpl    | 18 ++++---
 .../prog/en/modules/admin/printers.tmpl       | 35 +++++++-----
 .../prog/en/modules/admin/roadtype.tmpl       | 31 ++++++-----
 .../en/modules/admin/systempreferences.tmpl   | 19 ++++---
 .../prog/en/modules/admin/thesaurus.tmpl      | 11 ++--
 .../prog/en/modules/admin/z3950servers.tmpl   | 47 ++++++++--------
 .../prog/en/modules/circ/bookcount.tmpl       |  7 +--
 .../prog/en/modules/circ/branchoverdues.tmpl  |  8 +--
 .../prog/en/modules/circ/branchtransfers.tmpl |  7 +--
 .../prog/en/modules/circ/circulation.tmpl     |  5 +-
 .../prog/en/modules/circ/overdue.tmpl         |  7 +--
 .../prog/en/modules/circ/pendingreserves.tmpl |  7 +--
 .../prog/en/modules/circ/returns.tmpl         |  7 +--
 .../en/modules/circ/selectbranchprinter.tmpl  |  7 +--
 .../prog/en/modules/circ/stats.tmpl           |  7 +--
 .../prog/en/modules/circ/transferstodo.tmpl   |  7 +--
 .../en/modules/circ/transferstoreceive.tmpl   |  7 +--
 .../prog/en/modules/circ/waitingreserves.tmpl |  7 +--
 46 files changed, 529 insertions(+), 290 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc

diff --git a/admin/categorie.pl b/admin/categorie.pl
index d2d9dd01b8..886260a226 100755
--- a/admin/categorie.pl
+++ b/admin/categorie.pl
@@ -104,7 +104,7 @@ if ($op eq 'add_form') {
 				issuelimit              => $data->{'issuelimit'},
 				reservefee              => sprintf("%.2f",$data->{'reservefee'}),
 				category_type           => $data->{'category_type'},
-				"type_".$data->{'category_type'} => " SELECTED ",
+				"type_".$data->{'category_type'} => 1,
 				);
 													# END $OP eq ADD_FORM
 ################## ADD_VALIDATE ##################################
diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index efe7b06f96..69972c0afb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -408,4 +408,9 @@ ul.innerBox a {
 ul.innerBox {
 	
 	border: 1px solid #E8E8E8;
+}
+
+div.yui-b h5 {
+	font-size : 100%;
+	margin : .5em 0;
 }
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
new file mode 100644
index 0000000000..112d473380
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
@@ -0,0 +1,37 @@
+<h5>System Preferences</h5>
+<ul>
+	<li><a href="/cgi-bin/koha/admin/systempreferences.pl">System Preferences</a></li>
+</ul>
+
+<h5>Basic parameters</h5>
+<ul>
+	<li><a href="/cgi-bin/koha/admin/branches.pl">Libraries and branches</a></li>
+	<li><a href="/cgi-bin/koha/admin/aqbookfund.pl">Accounts and budgets</a></li>
+	<li><a href="/cgi-bin/koha/admin/currency.pl">Currencies</a></li>
+	<li><a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a></li>
+</ul>
+
+<h5>Patrons and circulation</h5>
+<ul>
+	<li><a href="/cgi-bin/koha/admin/categorie.pl">Patron categories</a></li>
+	<li><a href="/cgi-bin/koha/admin/cities.pl">Cities and towns</a></li>
+	<li><a href="/cgi-bin/koha/admin/roadtype.pl">Road types</a></li>
+	<li><a href="/cgi-bin/koha/admin/issuingrules.pl">Circulation rules</a></li>
+	<li><a href="/cgi-bin/koha/admin/finesrules.pl">Fines rules</a></li>
+</ul>
+
+<h5>Catalogue</h5>
+<ul>
+	<li><a href="/cgi-bin/koha/admin/authorised_values.pl">Authorised values</a></li>
+	<li><a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC Bibliographic framework</a></li>
+	<li><a href="/cgi-bin/koha/admin/koha2marclinks.pl">Koha to MARC mapping</a></li>
+	<li><a href="/cgi-bin/koha/admin/checkmarc.pl">MARC Bibliographic framework test</a></li>
+    <li><a href="/cgi-bin/koha/admin/authtypes.pl">MARC Authorities framework</a></li>
+</ul>
+
+<h5>Additional parameters</h5>
+
+<ul>
+	<li><a href="/cgi-bin/koha/admin/printers.pl">Printers</a></li>
+	<li><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 servers</a></li>
+</ul>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
index 0663030cf8..0b21742da5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
@@ -1,5 +1,10 @@
-<ul id="navigation">
+<ul>
+	<li><a href="/cgi-bin/koha/circ/returns.pl">Check In</a></li>
+	<li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfer</a></li>
 	<li>    <a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a></li>
+</ul>
+<h5>Circulation Reports</h5>
+<ul class="left-nav">
 	<li>    <a href="/cgi-bin/koha/circ/pendingreserves.pl" title="holds to retrieve off the shelf">Holds to pull</a></li>
 	<li>    <a href="/cgi-bin/koha/circ/waitingreserves.pl" title="holds waiting for patron pickup">Holds awaiting pickup</a></li>
 	<li>    <a href="/cgi-bin/koha/circ/transferstodo.pl" title="transfers to do from your library">Transfers to do</a></li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
new file mode 100644
index 0000000000..42c1b1242d
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
@@ -0,0 +1,33 @@
+<!-- Begin Members Resident Search Box -->
+<div id="header_search">
+	<div id="currency_search">
+	<p class="tip">Currencies Search:</p>
+        <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+                <input type="text" name="description" size="40" value="<!-- TMPL_VAR NAME="searchfield" -->" />
+                <input type="submit" name="Search" value="Search" />
+        </form>	
+	</div>
+	<div id="circ_search">
+	<p class="tip">Enter patron card number or partial name:</p>
+	<form action="/cgi-bin/koha/circ/circulation.pl" method="post">
+			<label for="findborrower"> </label>
+    <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
+	<input name="branch" value="CPL" type="hidden" />
+    <input name="printer" value="" type="hidden" />
+	<input value="Submit" type="submit" />
+	</form>
+	</div>	
+	<div id="catalog_search">
+	<p class="tip">Enter search keywords:</p>
+		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
+			 <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
+				<input type="submit" name="op" id="opac-submit" value="Submit"  class="form-submit" />
+		</form>
+	</div>
+			<ul>
+			<li><a href="/cgi-bin/koha/admin/currency.pl#currency_search">Search Currencies</a></li>
+			<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check Out</a></li>
+			<li><a href="/cgi-bin/koha/catalogue/advsearch.pl#catalog_search">Search the Catalog</a></li>
+			</ul>	
+</div>
+<!-- End Members Resident Search Box -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc
index 10d2452556..0f84dff0b7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc
@@ -1,6 +1,8 @@
-<ul id="navigation">
-	<li>    <a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=A">Add adult</a></li>
-	<li>    <a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=C">Add child</a></li>
-	<li>    <a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=P">Add professional</a></li>
-	<li>    <a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=I">Add organisation</a></li>
-</ul>
\ No newline at end of file
+<!-- TMPL_IF NAME="borrowernumber" -->
+<h5>Patron Details</h5>
+<ul>
+	<li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Details</a></li>
+	<li><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Fines</a></li>
+	<li><a href="m/cgi-bin/koha/members/readingrec.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Reading Record</a></li>
+	<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><!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc
new file mode 100644
index 0000000000..21b1ebab34
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc
@@ -0,0 +1,29 @@
+<strong>Statistics wizards</strong>
+	<ul>
+		<li><a href="/cgi-bin/koha/reports/acquisitions_stats.pl">Acquisitions</a></li>
+		<li><a href="/cgi-bin/koha/reports/borrowers_stats.pl">Patrons</a></li>
+
+		<li><a href="/cgi-bin/koha/reports/catalogue_stats.pl">Catalogue</a></li>
+		<li><a href="/cgi-bin/koha/reports/issues_stats.pl">Circulation</a></li>
+	</ul>
+
+
+	<strong>Top Lists</strong>
+	<ul>
+		<li><a href="/cgi-bin/koha/reports/bor_issues_top.pl">Patrons checking out the most</a></li>
+
+		<li><a href="/cgi-bin/koha/reports/cat_issues_top.pl">Items checked out the most</a></li>
+	</ul>
+	Inactive
+	<ul>
+		<li><a href="/cgi-bin/koha/reports/borrowers_out.pl">Patrons who haven't checked out</a></li>
+		<li><a href="/cgi-bin/koha/reports/catalogue_out.pl">Items not checked out</a></li>
+	</ul>
+
+
+	<strong>Other</strong>
+	<ul>
+		<li><a href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Catalogue by itemtype</a></li>
+		<li><a href="/cgi-bin/koha/reports/manager.pl?report_name=issues_by_borrower_category">Checkouts by patron category</a></li>
+		<li><a href="/cgi-bin/koha/reports/issues_avg_stats.pl">Average loan time</a></li>
+	</ul>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
new file mode 100644
index 0000000000..b66e148554
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
@@ -0,0 +1,33 @@
+<!-- Begin Members Resident Search Box -->
+<div id="header_search">
+	<div id="z3950_search">
+	<p class="tip">Z39.50 Server Search:</p>
+	<form action="/cgi-bin/koha/admin/z3950servers.pl" method="post">
+                <input type="text" name="description" size="40" value="<!-- TMPL_VAR NAME="searchfield" -->" />
+                <input type="submit" name="search" value="Search" />
+        </form>
+	</div>
+	<div id="circ_search">
+	<p class="tip">Enter patron card number or partial name:</p>
+	<form action="/cgi-bin/koha/circ/circulation.pl" method="post">
+			<label for="findborrower"> </label>
+    <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
+	<input name="branch" value="CPL" type="hidden" />
+    <input name="printer" value="" type="hidden" />
+	<input value="Submit" type="submit" />
+	</form>
+	</div>	
+	<div id="catalog_search">
+	<p class="tip">Enter search keywords:</p>
+		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
+			 <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
+				<input type="submit" name="op" id="opac-submit" value="Submit"  class="form-submit" />
+		</form>
+	</div>
+			<ul>
+			<li><a href="/cgi-bin/koha/admin/z3950servers.pl#z3950_search">Search z390.50 Servers</a></li>
+			<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check Out</a></li>
+			<li><a href="/cgi-bin/koha/catalogue/advsearch.pl#catalog_search">Search the Catalog</a></li>
+			</ul>	
+</div>
+<!-- End Members Resident Search Box -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl
index 6777515583..1efb17ac64 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl
@@ -1,19 +1,18 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; System Administration</title>
+<title>Koha &rsaquo; Administration</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
+<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Administration</div>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
-	
-<h1>Koha &rsaquo; System Administration</h1>
+	<div class="yui-b"><h1>System Administration</h1>
 
 <table>
 <caption>System Preferences</caption>
@@ -107,6 +106,4 @@
 </div>
 </div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl
index 26b5ddfdfc..33abf51cd9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl
@@ -1,16 +1,18 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; System Administration: Funds and Budgets</title>
+<title>Koha &rsaquo; Administration &rsaquo; Funds and Budgets</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
+
+
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; Funds and Budgets </div>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 <!-- TMPL_IF name="else" -->
 <h1>Funds and budgets administration</h1>
@@ -103,21 +105,22 @@
 <!-- /TMPL_IF --> <!-- else -->
 
 <!-- TMPL_IF name="add_form" -->
-<script>
-	//
+<script type="text/javascript">
+//<![CDATA[
+
 	function isNotNull(f,noalert) {
 		if (f.value.length ==0) {
    return false;
 		}
 		return true;
 	}
-	//
+
 	function toUC(f) {
 		var x=f.value.toUpperCase();
 		f.value=x;
 		return true;
 	}
-	//
+
 	function isNum(v,maybenull) {
 	var n = new Number(v.value);
 	if (isNaN(n)) {
@@ -128,14 +131,14 @@
 	}
 	return true;
 	}
-	//
+
 	function isDate(f) {
 		var t = Date.parse(f.value);
 		if (isNaN(t)) {
 			return false;
 		}
 	}
-	//
+
 	function Check(f) {
 		var ok=1;
 		var _alertString="";
@@ -155,7 +158,8 @@
 			alert(alertString2);
 		}
 	}
-	</script>
+	//]]>
+</script>
 
 <form action="<!-- TMPL_VAR name="action" -->" name="Aform" method="post">
   <input type="hidden" name="op" value="add_validate" />
@@ -184,12 +188,7 @@
     <tr>
       <th>Name</th>
       <td>
-        <input type="text"
-               name="bookfundname"
-               size="40"
-          maxlength="80"
-              value="<!-- TMPL_VAR name="bookfundname" escape="HTML" -->"
-        />
+        <input type="text" name="bookfundname" size="40" maxlength="80" value="<!-- TMPL_VAR name="bookfundname" escape="HTML" -->" />
       </td>
     </tr>
 
@@ -205,6 +204,7 @@
           <option value="<!-- TMPL_VAR NAME="branchcode" -->"><!-- TMPL_VAR NAME="branchname" --></option>
     <!-- /TMPL_IF -->
   <!-- /TMPL_LOOP -->
+  	</select>
       </td>
     </tr>
     
@@ -269,7 +269,8 @@
 
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="admin-menu.inc" -->
+</div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl
index a5a0dee7ad..5f5b00c3f0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl
@@ -1,14 +1,18 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; System Administration &rsaquo; Budgets</title>
+<title>Koha &rsaquo; Administration &rsaquo; Budgets</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- Additions to enable Calendar system -->
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css" />
-<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar.js"></script>
-<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-en.js"></script>
-<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-setup.js"></script>
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar.js">//]]>
+</script>
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-en.js">//]]>
+</script>
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-setup.js">//]]>
+</script>
 <!-- End of additions -->
 <!-- TMPL_IF name="add_form" -->
 <script type="text/javascript">
+//<![CDATA[
 	//
 	function isNotNull(f,noalert) {
 		if (f.value.length ==0) {
@@ -60,21 +64,20 @@
 			alert(alertString2);
 		}
 	}
+//]]>
 </script>
 <!-- /TMPL_IF -->
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 
-
-
-<!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; Budgets</div>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 <ul id="_informations">
 <!-- TMPL_IF NAME="add_validate" -->
@@ -148,6 +151,7 @@
       <input type="text" size="10" id="filter_startdate" name="filter_startdate" value="<!-- TMPL_VAR Name="filter_startdate" -->" />
       <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="filter_startdate_button" />
       <script type="text/javascript">
+//<![CDATA[
         Calendar.setup(
           {
             inputField : "filter_startdate",
@@ -155,7 +159,8 @@
             button : "filter_startdate_button"
           }
         );
-      </script>
+      //]]>
+</script>
     </td>
     <td>
       <select name="filter_enddate_sign">
@@ -180,6 +185,7 @@
       <input type="text" size="8" maxlength="10" id="filter_enddate" name="filter_enddate" value="<!-- TMPL_VAR Name="filter_enddate" -->" />
       <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="filter_enddate_button" />
       <script type="text/javascript">
+//<![CDATA[
         Calendar.setup(
           {
             inputField : "filter_enddate",
@@ -187,7 +193,8 @@
             button : "filter_enddate_button"
           }
         );
-      </script>
+      //]]>
+</script>
     </td>
     <td>
       <select name="filter_amount_sign">
@@ -265,6 +272,7 @@
           <input type="text" size="8" maxlength="10" id="startdate" name="startdate" value="<!-- TMPL_VAR Name="startdate" -->" />
           <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="startdate_button" />
           <script type="text/javascript">
+//<![CDATA[
             Calendar.setup(
               {
                 inputField : "startdate",
@@ -272,7 +280,8 @@
                 button : "startdate_button"
               }
             );
-          </script>
+          //]]>
+</script>
         </td>
       </tr>
       <tr>
@@ -283,6 +292,7 @@
           <input type="text" size="8" maxlength="10" id="enddate" name="enddate" value="<!-- TMPL_VAR Name="enddate" -->" />
           <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="enddate_button" alt="" />
           <script type="text/javascript">
+//<![CDATA[
             Calendar.setup(
               {
                 inputField : "enddate",
@@ -290,7 +300,8 @@
                 button : "enddate_button"
               }
             );
-          </script>
+          //]]>
+</script>
         </td>
       </tr>
       <tr>
@@ -375,7 +386,8 @@
 
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="admin-menu.inc" -->
+</div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl
index d965bc2630..4bb945b1ff 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl
@@ -1,18 +1,17 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; System Administration</title>
+<title>Koha &rsaquo; Administration &rsaquo; Authority MARC subfield structure</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 
-
-<!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; Authority MARC subfield structure</div>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 <!-- TMPL_IF NAME="add_form" -->
 
@@ -146,7 +145,8 @@
 
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="admin-menu.inc" -->
+</div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl
index 9c94113a48..1db340003c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl
@@ -1,7 +1,8 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; System Administration</title>
+<title>Koha &rsaquo; Administration &rsaquo; Authority MARC framework</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script type="text/javascript">
+//<![CDATA[
     /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     function isNotNull(f,noalert) {
         if (f.value.length ==0) {
@@ -50,19 +51,19 @@ return false;
             alert(alertString2);
         }
     }
-    </script>
+    //]]>
+</script>
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 
-
-<!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; Authority MARC framework</div>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 <h1>Authority MARC framework for <!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR NAME="authtypecode" --><!-- TMPL_ELSE -->default framework<!-- /TMPL_IF --></h1>
 
@@ -203,7 +204,8 @@ return false;
 
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="admin-menu.inc" -->
+</div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl
index 930482a513..d6d37b0d52 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; System Administration &rsaquo; <!-- TMPL_IF name="add_form" --><!-- TMPL_VAR name="action" --><!-- /TMPL_IF -->
+<title>Koha &rsaquo; Administration &rsaquo; <!-- TMPL_IF name="add_form" --><!-- TMPL_VAR name="action" --><!-- /TMPL_IF -->
 <!-- TMPL_IF name="delete_confirm" -->Confirm Deletion<!-- /TMPL_IF -->
 <!-- TMPL_IF name="else" -->Authorised values admin<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
@@ -7,13 +7,15 @@
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->	
 
-<!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF name="add_form" --><!-- TMPL_VAR name="action" --><!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirm" -->Confirm Deletion<!-- /TMPL_IF -->
+<!-- TMPL_IF name="else" -->Authorised values admin<!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 <!-- TMPL_IF name="add_form" -->
 	<h1>
@@ -109,7 +111,8 @@ the subfield is not entered through a free field, but though a list of authorise
 
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="admin-menu.inc" -->
+</div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl
index 9d3cb4887e..a22bf3817a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl
@@ -1,7 +1,8 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; System Administration</title>
+<title>Koha &rsaquo; Administration &rsaquo; <!-- TMPL_IF NAME="authtypecode" -->Modify authority type<!-- TMPL_ELSE -->Add authority type<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script type="text/javascript">
+//<![CDATA[
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 function isNotNull(f,noalert) {
 	if (f.value.length ==0) {
@@ -53,21 +54,19 @@ function Check(f) {
 		alert(alertString2);
 	}
 }
+//]]>
 </script>
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 
-
-<!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
-
-
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF NAME="authtypecode" -->Modify authority type<!-- TMPL_ELSE -->Add authority type<!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 <!-- TMPL_IF NAME="add_form" -->
 
@@ -151,7 +150,8 @@ function Check(f) {
 <!-- /TMPL_IF -->
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="admin-menu.inc" -->
+</div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl
index 408a7c3e43..92432d1784 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl
@@ -1,7 +1,8 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; System Administration: <!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="frameworkcode" -->Modify framework text<!-- TMPL_ELSE -->Add framework<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirm" -->Delete Framework for <!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)?<!-- /TMPL_IF --><!-- TMPL_IF NAME="else" -->Biblio Framework<!-- /TMPL_IF --></title>
+<title>Koha &rsaquo; Administration &rsaquo; <!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="frameworkcode" -->Modify framework text<!-- TMPL_ELSE -->Add framework<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirm" -->Delete Framework for <!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)?<!-- /TMPL_IF --><!-- TMPL_IF NAME="else" -->Biblio Framework<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script type="text/javascript">
+//<![CDATA[
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 function isNotNull(f,noalert) {
     if (f.value.length ==0) {
@@ -53,20 +54,19 @@ function Check(f) {
         alert(alertString2);
     }
 }
+//]]>
 </script>
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
-
-
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="frameworkcode" -->Modify framework text<!-- TMPL_ELSE -->Add framework<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirm" -->Delete Framework for <!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)?<!-- /TMPL_IF --><!-- TMPL_IF NAME="else" -->Biblio Framework<!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 <!-- TMPL_IF NAME="add_form" -->
     <h1><!-- TMPL_IF NAME="frameworkcode" -->Modify framework text<!-- TMPL_ELSE -->Add framework<!-- /TMPL_IF --></h1>
@@ -135,7 +135,8 @@ function Check(f) {
 <!-- /TMPL_IF -->
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="admin-menu.inc" -->
+</div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
index 7a5a976dca..fad647b7ad 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
@@ -1,20 +1,19 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; System Administration &rsaquo; <!-- TMPL_IF name="add" --><!-- TMPL_VAR name="head" --><!-- /TMPL_IF -->
-<!-- TMPL_IF name="delete_confirm" -->Confirm deletion of branch '<!-- TMPL_VAR NAME="branchcode" -->'<!-- /TMPL_IF -->
-<!-- TMPL_IF name="else" --><!-- TMPL_VAR name="head" --><!-- /TMPL_IF -->
-<!-- TMPL_IF name="delete_category" -->Confirm deletion of category<!-- /TMPL_IF --></title>
+<title>Koha &rsaquo; Administration &rsaquo; <!-- TMPL_IF NAME="editcategory" --><!-- TMPL_IF NAME="categorycode" -->Edit Branch Category <!-- TMPL_VAR NAME="categorycode" --><!-- TMPL_ELSE -->Add Branch Category<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_category" -->Confirm Deletion of Branch Category <!-- TMPL_VAR name="categorycode" --><!-- /TMPL_IF --><!-- TMPL_IF name="add" -->
+    <!-- TMPL_IF name="heading-branches-add-branch-p" -->Add branch<!-- TMPL_ELSE -->Modify branch <!-- TMPL_VAR name="branchcode" --><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF name="delete_confirm" -->Confirm deletion of branch '<!-- TMPL_VAR NAME="branchcode" -->'<!-- /TMPL_IF --><!-- TMPL_IF name="else" -->Branches<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo;  <!-- TMPL_IF NAME="editcategory" --><!-- TMPL_IF NAME="categorycode" --><a href="/cgi-bin/koha/admin/branches.pl">Branches</a> &rsaquo; Edit Branch Category <!-- TMPL_VAR NAME="categorycode" --><!-- TMPL_ELSE --><a href="/cgi-bin/koha/admin/branches.pl">Branches</a> &rsaquo; Add Branch Category<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_category" --><a href="/cgi-bin/koha/admin/branches.pl">Branches</a> &rsaquo; Confirm Deletion of Branch Category <!-- TMPL_VAR name="categorycode" --><!-- /TMPL_IF --><!-- TMPL_IF name="add" -->
+    <!-- TMPL_IF name="heading-branches-add-branch-p" --><a href="/cgi-bin/koha/admin/branches.pl">Branches</a> &rsaquo; Add branch<!-- TMPL_ELSE --><a href="/cgi-bin/koha/admin/branches.pl">Branches</a> &rsaquo; Modify branch <!-- TMPL_VAR name="branchcode" --><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF name="delete_confirm" --><a href="/cgi-bin/koha/admin/branches.pl">Branches</a> &rsaquo; Confirm deletion of branch '<!-- TMPL_VAR NAME="branchcode" -->'<!-- /TMPL_IF --><!-- TMPL_IF name="else" -->Branches<!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 <!-- TMPL_IF name="add" -->
     <!-- TMPL_IF name="heading-branches-add-branch-p" -->
@@ -65,7 +64,7 @@
 				<option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="branchprinter" --></option>
 				<!-- /TMPL_IF -->
                 <!-- /TMPL_LOOP -->
-            </select>
+            </select></p>
         <p><input type="submit" value="Submit" /></p>
     </form>
 <!-- /TMPL_IF -->
@@ -84,7 +83,7 @@
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF name="else" -->
-    <h1><!-- TMPL_VAR name="head" --></h1>
+    <h1>Branches</h1>
     <!-- TMPL_IF NAME="message" --><div class="problem">
         <!-- TMPL_VAR name="message" --><!-- /TMPL_IF -->
     <!-- TMPL_IF name="MESSAGE1" --><div class="problem">Branch saved</div><!-- /TMPL_IF -->
@@ -104,8 +103,7 @@
             <th>Category</th>
             <th>Branch IP</th>
             <th>Branch Printer</th>
-            <th>&nbsp;</th>
-            <th>&nbsp;</th>
+            <th colspan="2">&nbsp;</th>
         </tr>
         <!-- TMPL_LOOP name="branches" -->
             <tr>
@@ -149,7 +147,6 @@
                 </td>
                 <td>
                     <a href="<!-- TMPL_VAR name="action" -->?branchcode=<!-- TMPL_VAR name="value" escape="HTML" -->&amp;branchname=<!-- TMPL_VAR NAME="branch_name" escape="HTML" -->&amp;op=delete">Delete</a>
-                    </form>
                 </td>
             </tr>
         <!-- /TMPL_LOOP -->
@@ -206,7 +203,7 @@
     <form action="<!-- TMPL_VAR name="action" -->" name="Aform" method="post">
     <input type="hidden" name="op" value="addcategory_validate" />
     <table>
-        <caption><!-- TMPL_VAR name="head" --></caption>
+        <caption><!-- TMPL_IF NAME="categorycode" -->Edit Branch Category <!-- TMPL_VAR NAME="categorycode" --><!-- TMPL_ELSE -->Add Branch Category<!-- /TMPL_IF --></caption>
         <tr>
             <td>Category code</td>
             <td>
@@ -220,17 +217,18 @@
         </tr>
         <tr>
             <td>Name</td>
-            <td><input type="text" name="categoryname" size="40" maxlength="80" value="<!-- TMPL_VAR name="categoryname" escape="HTML" -->" />&nbsp;</td>
+            <td><input type="text" name="categoryname" size="40" maxlength="80" value="<!-- TMPL_VAR name="categoryname" escape="HTML" -->" /></td>
         </tr>
         <tr>
             <td>Description</td>
-            <td><input type="text" name="codedescription" size="40" maxlength="80" value="<!-- TMPL_VAR name="codedescription" escape="HTML" -->" />&nbsp;</td>
+            <td><input type="text" name="codedescription" size="40" maxlength="80" value="<!-- TMPL_VAR name="codedescription" escape="HTML" -->" /></td>
         </tr>
     </table><input type="submit" value="Update" />
     </form>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF name="delete_category" -->
+ <!-- TMPL_UNLESS name="MESSAGE8" -->
     Confirm delete:
     <form action="<!-- TMPL_VAR name="action" -->" method="post">
         <input type="hidden" name="op" value="categorydelete_confirmed" />
@@ -240,11 +238,13 @@
     <form action="<!-- TMPL_VAR name="action" -->" method="post"><input type="hidden" name="op" value="">
         <input type="submit" value="NO" />
     </form>
+<!-- /TMPL_UNLESS -->
 <!-- /TMPL_IF -->
 
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="admin-menu.inc" -->
+</div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl
index 11d24e2920..0c5791b0e1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl
@@ -1,11 +1,12 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; System Administration &rsaquo; <!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="categorycode" -->Modify category '<!-- TMPL_VAR NAME="categorycode" -->'<!-- TMPL_ELSE -->Add category<!-- /TMPL_IF --><!-- /TMPL_IF -->
+<title>Koha &rsaquo; Administration &rsaquo; <!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="categorycode" -->Modify category '<!-- TMPL_VAR NAME="categorycode" -->'<!-- TMPL_ELSE -->Add category<!-- /TMPL_IF --><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="add_validate" -->Data recorded<!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="delete_confirm" -->Confirm Deletion of Category '<!-- TMPL_VAR NAME="categorycode" -->'<!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="delete_confirmed" -->Category Deleted<!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="else" -->Patron Categories<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script type="text/javascript">
+//<![CDATA[
 	//
 	function isNotNull(f,noalert) {
 		if (f.value.length ==0) {
@@ -66,19 +67,23 @@
         // if all is good
 		ff.submit();
 	}
-	</script>
+	//]]>
+</script>
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 
-
-<!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="categorycode" -->Modify category '<!-- TMPL_VAR NAME="categorycode" -->'<!-- TMPL_ELSE -->Add category<!-- /TMPL_IF --><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="add_validate" -->Data recorded<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="delete_confirm" -->Confirm Deletion of Category '<!-- TMPL_VAR NAME="categorycode" -->'<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="delete_confirmed" -->Category Deleted<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="else" -->Patron Categories<!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 <!-- TMPL_IF NAME="add_form" -->
 	
@@ -115,13 +120,13 @@
 			<!-- /TMPL_IF -->
 					</select></td></tr>
 	<tr><th>Reserve fee</th><td>$ <input type="text" name="reservefee" size="6" value="<!-- TMPL_VAR NAME="reservefee" -->" /></td></tr>
-	<tr><th>Category type</th><td><SELECT name="category_type" >
-					<option value="" <!-- TMPL_VAR NAME="type_n" -->>Select a Category type</option>
-     					<option value="A" <!-- TMPL_VAR NAME="type_A" -->>Adult</option>
-					<option value="C" <!-- TMPL_VAR NAME="type_C" -->>Children</option>
-					<option value="I" <!-- TMPL_VAR NAME="type_I" -->>Organisation</option>
-					<option value="P" <!-- TMPL_VAR NAME="type_P" -->>Professional</option>
-					</SELECT></td>
+	<tr><th>Category type</th><td><select name="category_type" >
+						<!-- TMPL_IF NAME="type_n" --><option value="" selected="selected">Select a Category type</option><!-- TMPL_ELSE --><option value="">Select a Category type</option><!-- /TMPL_IF -->
+					<!-- TMPL_IF NAME="type_A" --><option value="A" selected="selected">Adult</option><!-- TMPL_ELSE --><option value="A">Adult</option><!-- /TMPL_IF -->
+					<!-- TMPL_IF NAME="type_C" --><option value="C" selected="selected">Children</option><!-- TMPL_ELSE --><option value="C">Children</option><!-- /TMPL_IF -->
+					<!-- TMPL_IF NAME="type_I" --><option value="I" selected="selected">Organisation</option><!-- TMPL_ELSE --><option value="I">Organisation</option><!-- /TMPL_IF -->
+					<!-- TMPL_IF NAME="type_P" --><option value="P" selected="selected">Professional</option><!-- TMPL_ELSE --><option value="P">Professional</option><!-- /TMPL_IF -->
+					</select></td>
 	</tr>
 </table>
 
@@ -222,7 +227,8 @@
 
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="admin-menu.inc" -->
+</div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categoryitem.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categoryitem.tmpl
index 8c6677aed7..11e5c98fc5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categoryitem.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categoryitem.tmpl
@@ -1,7 +1,8 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; <!-- TMPL_IF NAME="categorycode" -->Modify category<!-- TMPL_ELSE -->Add category<!-- /TMPL_IF --></title>
+<title>Koha &rsaquo; Administration &rsaquo; <!-- TMPL_IF NAME="categorycode" -->Modify category<!-- TMPL_ELSE -->Add category<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script type="text/javascript">
+//<![CDATA[
         //
         function isNotNull(f,noalert) {
                 if (f.value.length ==0) {
@@ -56,12 +57,13 @@
                         alertString2 += _alertString;
                 }
         }
-        </script>
+        //]]>
+</script>
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF NAME="categorycode" -->Modify category<!-- TMPL_ELSE -->Add category<!-- /TMPL_IF --></div>
 
 <!-- TMPL_IF NAME="add_form" -->
         
@@ -70,7 +72,7 @@
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 		
         <!-- TMPL_IF NAME="categorycode" -->
                 <h1>Modify category</h1>
@@ -314,9 +316,10 @@
 
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="admin-menu.inc" -->
+</div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
 
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/charges.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/charges.tmpl
index 1dfa699619..630eccc458 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/charges.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/charges.tmpl
@@ -1,17 +1,17 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; System Administration &rsaquo; Fines</title>
+<title>Koha &rsaquo; Administration &rsaquo; Fines</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; Fines</div>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 <h2>Calculating Fines</h2>
 <p>Each box needs to be filled in with fine,time to start charging,charging cycle</p>
@@ -40,7 +40,8 @@
 
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="admin-menu.inc" -->
+</div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl
index a60c708d8f..e77d001f13 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl
@@ -1,18 +1,19 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; System Administration &rsaquo; MARC Check &rsaquo;
-<!-- TMPL_IF name="total" --><!-- TMPL_VAR name="total" --> errors found<!-- TMPL_ELSE -->Configuration OK!<!-- /TMPL_IF --></title>
+<title>Koha &rsaquo; Administration &rsaquo; MARC Check
+<!-- TMPL_IF name="total" --> &rsaquo; <!-- TMPL_VAR name="total" --> errors found<!-- TMPL_ELSE --> &rsaquo; Configuration OK!<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; MARC Check
+<!-- TMPL_IF name="total" --> &rsaquo; <!-- TMPL_VAR name="total" --> errors found<!-- TMPL_ELSE --> &rsaquo; Configuration OK!<!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 <h1>MARC Checking</h1>
 <table>
@@ -145,7 +146,8 @@
 
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="admin-menu.inc" -->
+</div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl
index 25579c1405..c0d9c7d473 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl
@@ -1,7 +1,8 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; System administration &rsaquo; Cities</title>
+<title>Koha &rsaquo; Administration &rsaquo; Cities</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script type="text/javascript">
+//<![CDATA[
 		/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 		function isNotNull(f,noalert) {
 			if (f.value.length == 0) {
@@ -46,17 +47,19 @@
 			document.Aform.submit();
 			}
 		}
+//]]>
 </script>
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
+
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; Cities</div>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 <!-- TMPL_IF NAME="add_form" -->
 	<!-- TMPL_IF NAME="cityid" -->
@@ -183,8 +186,9 @@
 
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="admin-menu.inc" -->
+</div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl
index 42368b6a74..c987969d16 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; System Administration &rsaquo;
+<title>Koha &rsaquo; Administration &rsaquo;
 <!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="searchfield" -->Modify Currency '<!-- TMPL NAME="searchfield" -->'<!-- TMPL_ELSE -->Add Currency<!-- /TMPL_IF --><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="add_validate" -->Data Recorded<!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="delete_confirm" -->Confirm Deletion of Currency '<!-- TMPL_VAR NAME="searchfield" -->'<!-- /TMPL_IF -->
@@ -8,6 +8,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_IF NAME="add_form" -->
 <script type="text/javascript">
+//<![CDATA[
         //
         function isNotNull(f,noalert) {
                 if (f.value.length ==0) {
@@ -59,19 +60,25 @@
                         alert(alertString2);
                 }
         }
-        </script>
+        //]]>
+</script>
 		<!-- /TMPL_IF -->
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
+<!-- TMPL_INCLUDE NAME="currencies-admin-search.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="searchfield" -->Modify Currency '<!-- TMPL NAME="searchfield" -->'<!-- TMPL_ELSE -->Add Currency<!-- /TMPL_IF --><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="add_validate" -->Data Recorded<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="delete_confirm" -->Confirm Deletion of Currency '<!-- TMPL_VAR NAME="searchfield" -->'<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="delete_confirmed" -->Currency Deleted<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="else" -->Currencies<!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 <!-- TMPL_IF NAME="add_form" -->
         
@@ -162,14 +169,11 @@
 
 <!-- TMPL_IF NAME="else" -->
 
-<h2>Currencies Management</h2>
+<h2>Currencies</h2>
 	<!-- TMPL_IF NAME="searchfield" -->
 		You searched for <!-- TMPL_VAR NAME="searchfield" --></span>
 	<!-- /TMPL_IF -->	
-        <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-                <input type="text" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->" />
-                <input type="submit" name="Search" value="Search" />
-        </form>	
+
 	<table>
 		<tr>
 			<th>Currency</th>
@@ -205,7 +209,8 @@
 
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="admin-menu.inc" -->
+</div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/finesrules.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/finesrules.tmpl
index 7f40201b06..5f63f74488 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/finesrules.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/finesrules.tmpl
@@ -1,24 +1,24 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; System Administration &rsaquo; Issuing Rules</title>
+<title>Koha &rsaquo; Administration &rsaquo; Fines</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; Fines</div>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 	<h1>Defining <!-- TMPL_IF NAME="branch" -->fining rules for <!-- TMPL_VAR NAME="branch" --><!-- TMPL_ELSE -->default fining rules<!-- /TMPL_IF --></h1>
 		
 	<div class="help">
 		<h3>HINT for fines</h3>
 		<p>Each box needs to be filled in with fine,time to start charging,charging cycle</p>
-		<p>eg 1,7,7</span> = 1 [USD,EUR,etc] fine after 7 days, every 7 days</p>
+		<p>eg 1,7,7 = 1 [USD,EUR,etc] fine after 7 days, every 7 days</p>
 		<p>Fines are calculated by the fines2.pl script, located in misc directory.  Ask your administrator to put this script in crontab, after midnight, to have fines calculated every night</p>
 	</div>
 	<div class="help">
@@ -57,7 +57,7 @@
 			</tr>
 			<!-- TMPL_LOOP NAME="row" -->
 				<tr>
-					<th><!-- TMPL_VAR NAME="categorycode" --></th>
+					<th scope="row"><!-- TMPL_VAR NAME="categorycode" --></th>
 					<!-- TMPL_LOOP NAME="cell" -->
 						<!-- TMPL_IF NAME="toggle" -->
    <td class="highlight">
@@ -76,7 +76,8 @@
 
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="admin-menu.inc" -->
+</div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/issuingrules.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/issuingrules.tmpl
index f1f70723e0..10319b07c7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/issuingrules.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/issuingrules.tmpl
@@ -1,23 +1,23 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; System Administration &rsaquo; Issuing Rules</title>
+<title>Koha &rsaquo; Administration &rsaquo; Issuing Rules</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo;  Issuing Rules</div>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 	<h1>Defining <!-- TMPL_IF NAME="branch" -->issuing rules for <!-- TMPL_VAR NAME="branch" --><!-- TMPL_ELSE -->default issuing rules<!-- /TMPL_IF --></h1>
 	<div class="help">
 		<h3>HINT for issues</h3>
 		<p>Each box needs to be filled in with issuelength,maxissues</p>
-		<p>eq 21,5</span> enables 5 issues for 21 days</p>
+		<p>eq 21,5 enables 5 issues for 21 days</p>
 	</div>
 
 	<div class="help">
@@ -73,7 +73,8 @@
 
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="admin-menu.inc" -->
+</div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl
index 3ef1ba9083..65407b3f52 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl
@@ -1,6 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; System Administration &rsaquo;
-<!-- TMPL_IF name="add_form" -->
+<title>Koha &rsaquo; Administration &rsaquo;<!-- TMPL_IF name="add_form" -->
   <!-- TMPL_IF name="itemtype" -->
 Modify item type '<!-- TMPL_VAR name="itemtype" -->'
   <!-- TMPL_ELSE -->
@@ -22,6 +21,7 @@ Item Types Administration
 <!-- /TMPL_IF -->
 </title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" --><script type="text/javascript">
+//<![CDATA[
 
 function isNotNull(f,noalert) {
 	if (f.value.length ==0) {
@@ -76,39 +76,54 @@ function Check(f) {
 		alert(alertString2);
 	}
 }
+//]]>
 </script>
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF name="add_form" -->
+  <!-- TMPL_IF name="itemtype" -->
+Modify item type '<!-- TMPL_VAR name="itemtype" -->'
+  <!-- TMPL_ELSE -->
+Add item type
+  <!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirm" -->
+  <!-- TMPL_IF name="total" -->
+Cannot Delete Item Type '<!-- TMPL_VAR name="itemtype" -->'
+  <!-- TMPL_ELSE -->
+Delete Item Type '<!-- TMPL_VAR name="itemtype" -->'?
+  <!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirmed" -->
+Data Deleted
+<!-- /TMPL_IF -->
+<!-- TMPL_IF name="else" -->
+Item Types Administration
+<!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 <!-- TMPL_IF name="add_form" -->
-
-<form action="<!-- TMPL_VAR name="script_name" -->" name="Aform" method="post">
-  <feldset>
-    <legend>
   <!-- TMPL_IF name="itemtype" -->
       <h3>Modify item type</h3>
   <!-- TMPL_ELSE -->
       <h3>Add item type</h3>
   <!-- /TMPL_IF -->
-    </legend>
-
-    <input type="hidden" name="op" value="add_validate" />
+<form action="<!-- TMPL_VAR name="script_name" -->" name="Aform" method="post">
+  <input type="hidden" name="op" value="add_validate" />
     <input type="hidden" name="checked" value="0" />
 		
     <table>
   <!-- TMPL_IF name="itemtype" -->
       <tr>
         <th>
-          <label for="">Item type</label>
+          <label>Item type</label>
         </th>
         <td>
           <input type="hidden" name="itemtype" value="<!-- TMPL_VAR name="itemtype" -->" />
@@ -154,7 +169,7 @@ function Check(f) {
             </label>
   <!-- /TMPL_LOOP -->
           </p>
-          <hr />
+
           <p>
             <label>
   <!-- TMPL_IF name="remote_image" -->
@@ -165,7 +180,7 @@ function Check(f) {
             remote image
             </label>
             <input type="text" name="remoteImage" size="48" maxlength="200" value="<!-- TMPL_VAR name="remote_image" -->" onmousedown="document.getElementById('remote_image_check').checked = true;" />
-            </label>
+
   <!-- TMPL_IF name="remote_image" -->
             <img src="<!-- TMPL_VAR name="remote_image" -->" alt="" />
   <!-- /TMPL_IF -->
@@ -194,10 +209,7 @@ function Check(f) {
           <label for="renewalsallowed">Renewals</label>
         </th>
         <td>
-          <input type="text" id="renewalsallowed" name="renewalsallowed" size="3" maxlength="3" value="
-  <!-- TMPL_IF name="renewalsallowed" -->
-          <!-- TMPL_VAR NAME="renewalsallowed" -->
-  <!-- /TMPL_IF -->" value="1" />
+	          <input type="text" id="renewalsallowed" name="renewalsallowed" size="3" maxlength="3" value="<!-- TMPL_VAR NAME="renewalsallowed" -->" />
         </td>
       </tr>
       <tr>
@@ -224,7 +236,6 @@ function Check(f) {
       <input type="button" value="Save Changes" onclick="Check(this.form)" />
       <input type="button" value="Cancel" onclick="history.back();" />
     </p>
-  </fieldset>
 </form>
 <!-- /TMPL_IF -->
 
@@ -306,7 +317,8 @@ function Check(f) {
 
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="admin-menu.inc" -->
+</div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl
index e24a593d1b..efbec67412 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; System Administration &rsaquo;
+<title>Koha &rsaquo; Administration &rsaquo;
 <!-- TMPL_IF name="add_form" --><!-- TMPL_VAR name="action" --><!-- /TMPL_IF -->
 <!-- TMPL_IF name="else" -->MARC links <!-- TMPL_VAR name="tagfield" --><!-- /TMPL_IF --></title>
 
@@ -8,13 +8,14 @@
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF name="add_form" --><!-- TMPL_VAR name="action" --><!-- /TMPL_IF -->
+<!-- TMPL_IF name="else" -->MARC links <!-- TMPL_VAR name="tagfield" --><!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 <!-- TMPL_IF name="add_form" -->
 <!-- -->
@@ -150,7 +151,8 @@
 
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="admin-menu.inc" -->
+</div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl
index 5d2d8595cd..4ba8b6a571 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl
@@ -1,9 +1,10 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; System Administration &rsaquo;
+<title>Koha &rsaquo; Administration &rsaquo;
 <!-- TMPL_IF name="add_form" --><!-- TMPL_IF NAME="modify" -->Modify system preference '<!-- TMPL_VAR NAME="searchfield" -->'<!-- TMPL_ELSE -->Add a system preference<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF name="add_validate" -->Data Added<!-- /TMPL_IF -->
 <!-- TMPL_IF name="delete_confirm" -->Confirm Deletion of Parameter '<!-- TMPL_VAR name="searchfield" -->'<!-- /TMPL_IF --><!-- TMPL_IF name="delete_confirmed" -->Parameter Deleted<!-- /TMPL_IF --><!-- TMPL_IF name="else" -->Preferences<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script type="text/javascript">
+//<![CDATA[
 
 function active(numlayer){
     var contentdiv   = document.getElementById("content");
@@ -44,18 +45,20 @@ function displayMoreConstraint(numlayer){
     }
 }
 
+//]]>
 </script>
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF name="add_form" --><!-- TMPL_IF NAME="modify" -->Modify system preference '<!-- TMPL_VAR NAME="searchfield" -->'<!-- TMPL_ELSE -->Add a system preference<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF name="add_validate" -->Data Added<!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirm" -->Confirm Deletion of Parameter '<!-- TMPL_VAR name="searchfield" -->'<!-- /TMPL_IF --><!-- TMPL_IF name="delete_confirmed" -->Parameter Deleted<!-- /TMPL_IF --><!-- TMPL_IF name="else" -->Preferences<!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 <!-- TMPL_IF NAME="add_form" -->
     <h1>
@@ -218,7 +221,8 @@ function displayMoreConstraint(numlayer){
 
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="admin-menu.inc" -->
+</div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl
index b248b8b65b..bfbc10cf63 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl
@@ -1,11 +1,12 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; System Administration &rsaquo;
+<title>Koha &rsaquo; Administration &rsaquo;
 <!-- TMPL_IF name="add_form" --><!-- TMPL_VAR name="action" --><!-- /TMPL_IF -->
 <!-- TMPL_IF name="delete_confirm" -->Confirm Deletion of Tag '<!-- TMPL_VAR name="searchfield" -->'<!-- /TMPL_IF -->
 <!-- TMPL_IF name="delete_confirmed" -->Data Deleted<!-- /TMPL_IF -->
 <!-- TMPL_IF name="else" -->MARC tag Structure<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script type="text/javascript">
+//<![CDATA[
     /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     function isNotNull(f,noalert) {
         if (f.value.length ==0) {
@@ -54,18 +55,22 @@
             alert(alertString2);
         }
     }
-    </script>
+    //]]>
+</script>
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF name="add_form" --><!-- TMPL_VAR name="action" --><!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirm" -->Confirm Deletion of Tag '<!-- TMPL_VAR name="searchfield" -->'<!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirmed" -->Data Deleted<!-- /TMPL_IF -->
+<!-- TMPL_IF name="else" -->MARC tag Structure<!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 <h1>MARC tag structure admin for <!-- TMPL_IF NAME="frameworkcode" --><!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)<!-- TMPL_ELSE -->default MARC framework<!-- /TMPL_IF --></h1>
 
@@ -224,7 +229,8 @@
 
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="admin-menu.inc" -->
+</div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl
index 1f0b3020ec..1f868991af 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl
@@ -1,12 +1,13 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; System Administration &rsaquo;
-<!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="searchfield" -->Modify printer '<!-- TMPL_VAR NAME="searchfield" -->'<!-- TMPL_ELSE -->Add printer<!-- /TMPL_IF --><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="add_validate" -->Printer Added<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="delete_confirm" -->Confirm Deletion of Printer '<!-- TMPL_VAR NAME="searchfield" -->'<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="delete_confirmed" -->Printer Deleted<!-- /TMPL_IF -->
+<title>Koha &rsaquo; Administration &rsaquo;
+<!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="searchfield" --> Printers &rsaquo; Modify printer '<!-- TMPL_VAR NAME="searchfield" -->'<!-- TMPL_ELSE --> Printers &rsaquo; Add printer<!-- /TMPL_IF --><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="add_validate" --> Printers &rsaquo; Printer Added<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="delete_confirm" --> Printers &rsaquo; Confirm Deletion of Printer '<!-- TMPL_VAR NAME="searchfield" -->'<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="delete_confirmed" --> Printers &rsaquo; Printer Deleted<!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="else" -->Printers<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_IF NAME="add_form" --><script type="text/javascript">
+//<![CDATA[
         //
         function isNotNull(f,noalert) {
                 if (f.value.length ==0) {
@@ -58,19 +59,24 @@
                         alert(alertString2);
                 }
         }
-        </script>
+        //]]>
+</script>
 	<!-- /TMPL_IF -->
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="searchfield" --> <a href="/cgi-bin/koha/admin/printers.pl">Printers</a> &rsaquo; Modify printer '<!-- TMPL_VAR NAME="searchfield" -->'<!-- TMPL_ELSE --> <a href="/cgi-bin/koha/admin/printers.pl">Printers</a> &rsaquo; Add printer<!-- /TMPL_IF --><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="add_validate" --> <a href="/cgi-bin/koha/admin/printers.pl">Printers</a> &rsaquo; Printer Added<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="delete_confirm" --> <a href="/cgi-bin/koha/admin/printers.pl">Printers</a> &rsaquo; Confirm Deletion of Printer '<!-- TMPL_VAR NAME="searchfield" -->'<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="delete_confirmed" --> <a href="/cgi-bin/koha/admin/printers.pl">Printers</a> &rsaquo; Printer Deleted<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="else" -->Printers<!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 <!-- TMPL_IF NAME="add_form" -->
         
@@ -87,14 +93,14 @@
 	<table>
 	<!-- TMPL_IF NAME="searchfield" -->
 		<tr>
-			<td>Printer Name</td>
+			<th scope="row">Printer Name</th>
 			<td>
 				<input type="hidden" name="printername" value="<!-- TMPL_VAR NAME="searchfield" -->" /><!-- TMPL_VAR NAME="searchfield" -->
 			</td>
 		</tr>
 	<!-- TMPL_ELSE -->
 		<tr>
-			<td>Printer Name</td>
+			<th scope="row">Printer Name</th>
 			<td>
 				<input type="text" name="printername" size="50" maxlength="50" />
 			</td>
@@ -102,11 +108,11 @@
 	<!-- /TMPL_IF -->
 
         	<tr>
-			<td>Queue</td>
+			<th scope="row">Queue</th>
 			<td><input type="text" name="printqueue" size="50" maxlength="50" value="<!-- TMPL_VAR NAME="printqueue" -->" /> </td>
 		</tr>
         	<tr>
-			<td>Type</td>
+			<th scope="row">Type</th>
 			<td><input type="text" name="printtype" size="50" maxlength="50" value="<!-- TMPL_VAR NAME="printtype" -->" /> </td>
 		</tr>
         </table><p><input type="button" value="OK" onclick="Check(this.form);" /> <input type="button" value="Cancel" onclick="location.href='<!-- TMPL_VAR NAME="script_name" -->';" /></p>
@@ -201,7 +207,8 @@
 
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="admin-menu.inc" -->
+</div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl
index 2f5244fd33..e03f9d9b14 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl
@@ -1,7 +1,8 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; System Administration: Road Types
+<title>Koha &rsaquo; Administration &rsaquo; Road Types</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script type="text/javascript">
+//<![CDATA[
         /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
         function isNotNull(f,noalert) {
                 if (f.value.length == 0) {
@@ -46,17 +47,19 @@
                 document.Aform.submit();
                 }
         }
+//]]>
 </script>
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
+
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; Road Types</div>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 <!-- TMPL_IF NAME="add_form" -->
 	<!-- TMPL_IF NAME="id_city" -->
@@ -98,7 +101,7 @@
 	<table>
 		<tr>
 			<th>Road type id </th>
-			<th>
+			<td>
 				<!-- TMPL_VAR NAME="roadtypeid" -->
 			</td>
 		</tr>
@@ -106,10 +109,9 @@
 			<input type="hidden" name="op" value="delete_confirmed" />
 			<input type="hidden" name="roadtypeid" value="<!-- TMPL_VAR NAME="roadtypeid" -->" />
 		<tr>
-			<td>Rod type</td>
+			<td>Road type</td>
 			<td><!-- TMPL_VAR NAME="road_type" --></td>
 		</tr>
-		</tr>
 		<tr>
 			<td colspan="2" align="center">Confirm deletion</td>
 		</tr>
@@ -133,9 +135,9 @@
 
 	<table>
 		<tr>
-			<th>Road type</bh>
-			<th> </th>
-			<th> </th>
+			<th>Road type</th>
+			<th>&nbsp;</th>
+			<th>&nbsp;</th>
 		</tr>
 		<!-- TMPL_LOOP NAME="loop" -->
 		<!-- TMPL_IF NAME="toggle" -->
@@ -150,17 +152,18 @@
 		<!-- /TMPL_LOOP -->
 
 	</table>
-	<p><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
 		<input type="hidden" name="op" value="add_form" />
-		<input type="submit" class="button" value="Add road type" /><br />
-	</form></p>
+		<p><input type="submit" class="button" value="Add road type" /></p>
+	</form>
 <!-- /TMPL_IF -->
 
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="admin-menu.inc" -->
+</div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
 
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tmpl
index 2525fcef23..5393d3feb5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tmpl
@@ -1,9 +1,10 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; System Administration &rsaquo;
+<title>Koha &rsaquo; Administration &rsaquo;
 <!-- TMPL_IF name="add_form" --><!-- TMPL_IF NAME="modify" -->Modify system preference '<!-- TMPL_VAR NAME="searchfield" -->'<!-- TMPL_ELSE -->Add a system preference<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF name="add_validate" -->Data Added<!-- /TMPL_IF -->
 <!-- TMPL_IF name="delete_confirm" -->Confirm Deletion of Parameter '<!-- TMPL_VAR name="searchfield" -->'<!-- /TMPL_IF --><!-- TMPL_IF name="delete_confirmed" -->Parameter Deleted<!-- /TMPL_IF --><!-- TMPL_IF name="else" -->Preferences<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script type="text/javascript">
+//<![CDATA[
         //
         function isNotNull(f,noalert) {
             if (f.value.length ==0) {
@@ -55,18 +56,20 @@
                 alert(alertString2);
             }
         }
-        </script>
+        //]]>
+</script>
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF name="add_form" --><!-- TMPL_IF NAME="modify" -->Modify system preference '<!-- TMPL_VAR NAME="searchfield" -->'<!-- TMPL_ELSE -->Add a system preference<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF name="add_validate" -->Data Added<!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirm" -->Confirm Deletion of Parameter '<!-- TMPL_VAR name="searchfield" -->'<!-- /TMPL_IF --><!-- TMPL_IF name="delete_confirmed" -->Parameter Deleted<!-- /TMPL_IF --><!-- TMPL_IF name="else" -->Preferences<!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 
 
@@ -177,7 +180,7 @@
     </tr>
     <!-- TMPL_LOOP NAME="loop" -->
     <tr<!-- TMPL_IF NAME="toggle" --> class="highlight"<!-- /TMPL_IF -->>
-        <td><!-- TMPL_VAR NAME="variable" --></td>
+        <td><a href="<!-- TMPL_VAR NAME="edit" -->"><!-- TMPL_VAR NAME="variable" --></a></td>
         <td><!-- TMPL_VAR NAME="value" --></td>
         <td width="20%"><!-- TMPL_VAR NAME="explanation" --></td>
         <td><a href="<!-- TMPL_VAR NAME="edit" -->">Edit</a></td>
@@ -185,7 +188,6 @@
     </tr>
     <!-- /TMPL_LOOP -->
     </table>
-    </form>
     
     <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
         <input type="hidden" name="op" value="add_form" />
@@ -196,7 +198,8 @@
 
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="admin-menu.inc" -->
+</div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/thesaurus.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/thesaurus.tmpl
index d8f5c05ea6..ef2f4038fd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/thesaurus.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/thesaurus.tmpl
@@ -1,17 +1,17 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; System Administration &rsaquo; Thesaurus Management</title>
+<title>Koha &rsaquo; Administration &rsaquo; Thesaurus Management</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; Thesaurus Management</div>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 <!-- TMPL_IF name="detail_form" -->
 <table>
@@ -164,7 +164,8 @@
 
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="admin-menu.inc" -->
+</div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl
index 37c36c9719..fbf2d2b518 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; System Administration &rsaquo; <!-- TMPL_IF NAME="else" -->z39.50 Servers<!-- /TMPL_IF -->
+<title>Koha &rsaquo; Administration &rsaquo; <!-- TMPL_IF NAME="else" -->z39.50 Servers<!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="searchfield" -->Modify z39.50 Server <!-- TMPL_VAR NAME="searchfield" --><!-- TMPL_ELSE -->Add z39.50 Server<!-- /TMPL_IF --><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="delete_confirm" -->Confirm Deletion<!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="add_validate" -->z39.50 Server Added<!-- /TMPL_IF -->
@@ -8,6 +8,7 @@
 
 <!-- TMPL_IF NAME="add_form" -->
 <script type="text/javascript">
+//<![CDATA[
         //
         function isNotNull(f,noalert) {
                 if (f.value.length ==0) {
@@ -74,19 +75,25 @@
                         alert(alertString2);
                 }
         }
-        </script>
+        //]]>
+</script>
         <!-- /TMPL_IF -->
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
+<!-- TMPL_INCLUDE NAME="z3950-admin-search.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF NAME="else" -->z39.50 Servers<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="searchfield" -->Modify z39.50 Server <!-- TMPL_VAR NAME="searchfield" --><!-- TMPL_ELSE -->Add z39.50 Server<!-- /TMPL_IF --><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="delete_confirm" -->Confirm Deletion<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="add_validate" -->z39.50 Server Added<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="delete_confirmed" -->z39.50 Server Deleted<!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 <!-- TMPL_IF NAME="add_form" -->
         
@@ -102,14 +109,14 @@
         <table>
         <!-- TMPL_IF NAME="searchfield" -->
                 <tr>
-                        <th>Z39.50 Server</th>
+                        <th scope="row">Z39.50 Server</th>
                         <td>
                                 <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" /><!-- TMPL_VAR NAME="searchfield" -->
                         </td>
                 </tr>
         <!-- TMPL_ELSE -->
                 <tr>
-                        <th>Z39.50 Server</th>
+                        <th scope="row">Z39.50 Server</th>
                         <td>
                                 <input type="text" name="searchfield" size="65" maxlength="100" onblur="toUC(this)" />
                         </td>
@@ -117,47 +124,47 @@
         <!-- /TMPL_IF -->
 
 		<tr>
-			<th>Hostname</th>
+			<th scope="row">Hostname</th>
 			<td>
 				<input type="text" name="host" size="30" value="<!-- TMPL_VAR NAME="host" -->" />
 			</td>
 		</tr>
 		<tr>
-			<th>Port</th>
+			<th scope="row">Port</th>
 			<td>
 				<input type="text" name="port" size="5" value="<!-- TMPL_VAR NAME="port" -->" onblur="isNum(this)" />
 			</td>
 		</tr>
 		<tr>
-			<th>Database</th>
+			<th scope="row">Database</th>
 			<td>
 				<input type="text" name="db" value="<!-- TMPL_VAR NAME="db" -->" />
 			</td>
 		</tr>
 		<tr>
-			<th>Userid</th>
+			<th scope="row">Userid</th>
 			<td>
 				<input type="text" name="userid" value="<!-- TMPL_VAR NAME="userid" -->" />
 			</td>
 		</tr>
 		<tr>
-			<th>Password</th>
+			<th scope="row">Password</th>
 			<td>
 				<input type="text" name="password" value="<!-- TMPL_VAR NAME="password" -->" />
 			</td>
 		</tr>
 		<tr>
-			<th>Checked (searched by default)</th>
+			<th scope="row">Checked (searched by default)</th>
 			<td>
-				<input type="text" size="1" name="checked" value="<!-- TMPL_VAR NAME="checked" -->" onblur="isNum(this)" />  
+				<input type="text" size="1" name="checked" value="<!-- TMPL_VAR NAME="checked" -->" onblur="isNum(this)" />  </td></tr>
 		<tr>
-			<th>Rank (display order)</th>
+			<th scope="row">Rank (display order)</th>
 			<td>
 				<input type="text" name="rank" size="4" value="<!-- TMPL_VAR NAME="rank" -->" onblur="isNum(this)" />
 			</td>
 		</tr>
 				<tr>
-			<th>Syntax (z3950 can send<br />
+			<th scope="row">Syntax (z3950 can send<br />
 			 records in various format. Choose one)</th>
 			<td>
 				<select name="syntax">
@@ -233,10 +240,7 @@
 
 <!-- TMPL_IF NAME="else" -->
 <h3>Z39.50 Servers Admininistration</h3>
-         <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-                <input type="text" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->" />
-                <input type="submit" name="search" value="Search" />
-        </form>
+
         <!-- TMPL_IF NAME="searchfield" -->
                 You searched for <!-- TMPL_VAR NAME="searchfield" -->
         <!-- /TMPL_IF -->		
@@ -286,7 +290,8 @@
 
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="admin-menu.inc" -->
+</div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
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 5f236d3b9d..c42010bddd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tmpl
@@ -12,7 +12,7 @@
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 
 <h1>
@@ -45,7 +45,8 @@
 
 </div>
 </div>
-</div>
-
+<div class="yui-b">
 <!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
+</div>
+</div>
 <!-- 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 60409d2b1e..9769112016 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl
@@ -12,7 +12,7 @@
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 
 <h1>Circulation: Library Overdues at <!-- TMPL_VAR NAME="LoginBranchname" --></h1>
@@ -178,9 +178,11 @@
             </table>
         </fieldset>
     <!-- /TMPL_IF -->
+
 </div>
 </div>
-</div>
-
+<div class="yui-b">
 <!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
+</div>
+</div>
 <!-- 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 33ab39db88..e76fc7fbe3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tmpl
@@ -12,7 +12,7 @@
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 
 <h1>Circulation &rsaquo; Transfers</h1>
@@ -177,7 +177,8 @@
 
 </div>
 </div>
-</div>
-
+<div class="yui-b">
 <!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
+</div>
+</div>
 <!-- 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 b83c8c250c..85bebe5d65 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -6,7 +6,7 @@
 <!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script type="text/JavaScript" language="JavaScript">
-
+//<![CDATA[
     /**
     *  MoreBorrowerDetails();
     *  This function displays or not borrower information.
@@ -52,7 +52,7 @@
             }
         }
     }
-
+//]]>
 </script>
 
 </head>
@@ -887,6 +887,7 @@ No patron matched <!-- TMPL_VAR name="message" -->
 </div>
 <div class="yui-b">
 <!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
+<!-- TMPL_INCLUDE NAME="members-menu.inc" -->
 </div>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
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 5684be469c..d4f0fe57ba 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl
@@ -12,7 +12,7 @@
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 <h2>Items Overdue as of <!-- TMPL_VAR NAME="todaysdate" --></h2>
 
@@ -42,7 +42,8 @@
 </div>
 </div>
 </div>
-</div>
-
+<div class="yui-b">
 <!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
+</div>
+</div>
 <!-- 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 c5891dcded..18fd11e278 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl
@@ -20,7 +20,7 @@
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 
 <h1>Pending holds as of <!-- TMPL_VAR NAME="todaysdate" --></h1>
@@ -173,7 +173,8 @@ Calendar.setup(
 </div>
 </div>
 </div>
-</div>
-
+<div class="yui-b">
 <!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
+</div>
+</div>
 <!-- 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 dfdb3f27b9..7aa1f40ef8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
@@ -13,7 +13,7 @@
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 
 <h1>Check In</h1>
@@ -283,7 +283,8 @@
 
 </div>
 </div>
-</div>
-
+<div class="yui-b">
 <!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
+</div>
+</div>
 <!-- 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 0939433fa6..ba30b223d1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tmpl
@@ -12,7 +12,7 @@
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 
 <h1>Set Library</h1>
@@ -51,7 +51,8 @@
 
 </div>
 </div>
-</div>
-
+<div class="yui-b">
 <!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
+</div>
+</div>
 <!-- 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 0f95aef6f0..7292df0b2f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/stats.tmpl
@@ -12,7 +12,7 @@
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
     <!-- TMPL_IF NAME="notime" -->
         <h1>Display statistics for:</h1>
@@ -48,7 +48,8 @@
     <!-- /TMPL_IF -->
 </div>
 </div>
-</div>
-
+<div class="yui-b">
 <!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
+</div>
+</div>
 <!-- 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 05e3d5957f..259dd60da4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl
@@ -12,7 +12,7 @@
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 
     <h1>Transfers to do <!-- TMPL_VAR NAME="show_date" --></h1>
@@ -73,7 +73,8 @@
 
 </div>
 </div>
-</div>
-
+<div class="yui-b">
 <!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
+</div>
+</div>
 <!-- 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 1acd180a28..43c35b7d6f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl
@@ -12,7 +12,7 @@
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 
 	<h1>Transfers made TO your library on : <!-- TMPL_VAR NAME="show_date" --></h1>
@@ -80,7 +80,8 @@
 
 </div>
 </div>
-</div>
-
+<div class="yui-b">
 <!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
+</div>
+</div>
 <!-- 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 774e57e3f6..8f614a56e4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl
@@ -12,7 +12,7 @@
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 
 <h1>Circulation: Library Holds</h1>
@@ -94,7 +94,8 @@
 
 </div>
 </div>
-</div>
-
+<div class="yui-b">
 <!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
+</div>
+</div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
-- 
2.39.5