diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl
index 8c93f112c7..90b6510092 100755
--- a/cataloguing/addbiblio.pl
+++ b/cataloguing/addbiblio.pl
@@ -317,12 +317,12 @@ sub create_input {
     elsif ( $tagslib->{$tag}->{$subfield}->{authtypecode} ) {
         $subfield_data{marc_value} =
 		"<input type=\"text\"
-                        id=".$subfield_data{id}."
-                        name=".$subfield_data{id}."
+                        id=\"".$subfield_data{id}."\"
+                        name=\"".$subfield_data{id}."\"
 			value=\"$value\"
 			class=\"input_marceditor\"
                         tabindex=\"1\"                     
-			DISABLE READONLY \/>
+			disabled=\"disabled\" readonly=\"readonly\" \/>
 			<span class=\"buttonDot\"
 				onclick=\"Dopop('/cgi-bin/koha/authorities/auth_finder.pl?authtypecode=".$tagslib->{$tag}->{$subfield}->{authtypecode}."&index=$subfield_data{id}','$subfield_data{id}')\">...</span>
 		";
@@ -345,14 +345,13 @@ sub create_input {
         $subfield_data{marc_value} =
 		"<input tabindex=\"1\"
                         type=\"text\"
-                        id=".$subfield_data{id}."
-			name=".$subfield_data{id}."
+                        id=\"".$subfield_data{id}."\"
+			name=\"".$subfield_data{id}."\"
 			value=\"$value\"
                         class=\"input_marceditor\"
-			onfocus=\"javascript:Focus$function_name($index_tag)\"
-			onblur=\"javascript:Blur$function_name($index_tag); \" \/>
-		<span class=\"buttonDot\"
-			onclick=\"Clic$function_name('$subfield_data{id}')\">...</a>
+			onfocus=\"Focus$function_name($index_tag)\"
+			onblur=\"Blur$function_name($index_tag); \" \/>
+		<span class=\"buttonDot\" onclick=\"Clic$function_name('$subfield_data{id}')\">...</a>
 		$javascript";
         # it's an hidden field
     }
@@ -360,16 +359,16 @@ sub create_input {
         $subfield_data{marc_value} =
             "<input tabindex=\"1\"
                     type=\"hidden\"
-                    id=".$subfield_data{id}."
-                    name=".$subfield_data{id}."
+                    id=\"".$subfield_data{id}."\"
+                    name=\"".$subfield_data{id}."\"
                     value=\"$value\" \/>
             ";
     }
     elsif ( $tagslib->{$tag}->{$subfield}->{'hidden'} ) {
         $subfield_data{marc_value} =
             "<input type=\"text\"
-                    id=".$subfield_data{id}."
-                    name=".$subfield_data{id}."
+                    id=\"".$subfield_data{id}."\"
+                    name=\"".$subfield_data{id}."\"
                     class=\"input_marceditor\"
                     tabindex=\"1\"
                     value=\"$value\"
@@ -391,8 +390,8 @@ sub create_input {
             $subfield_data{marc_value} =
                 "<textarea cols=\"70\"
                            rows=\"4\"
-                           id=".$subfield_data{id}."
-                           name=".$subfield_data{id}."
+                           id=\"".$subfield_data{id}."\"
+                           name=\"".$subfield_data{id}."\"
                            class=\"input_marceditor\"
                            tabindex=\"1\"
                            >$value</textarea>
@@ -401,8 +400,8 @@ sub create_input {
         else {
             $subfield_data{marc_value} =
                 "<input type=\"text\"
-                        id=".$subfield_data{id}."
-                        name=".$subfield_data{id}."
+                        id=\"".$subfield_data{id}."\"
+                        name=\"".$subfield_data{id}."\"
                         value=\"$value\"
                         tabindex=\"1\"
                         class=\"input_marceditor\"
@@ -681,7 +680,7 @@ my $framework = CGI::scrolling_list(
     -name     => 'Frameworks',
     -id       => 'Frameworks',
     -default  => $curfwk,
-    -OnChange => 'Changefwk(this);',
+    -onchange => 'Changefwk(this);',
     -values   => \@select_fwk,
     -labels   => \%select_fwk,
     -size     => 1,
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
index 0a13d80d48..d7b0001f0f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
@@ -1,32 +1,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<link rel="shortcut icon" href="<!-- TMPL_VAR NAME='themelang' -->/includes/favicon.ico" type="image/x-icon" />
-<link rel="stylesheet" type="text/css" media="print" href="<!-- TMPL_VAR name="themelang" -->/css/intranet-print.css" />
-<style type="text/css" media="screen"> 
-	<!-- TMPL_IF NAME="popup" -->
-    @import url(<!-- TMPL_VAR NAME='themelang' -->/css/intranet2popup.css);
-	<!-- /TMPL_IF -->
-
-	<!-- TMPL_IF NAME="login" -->
-	@import url(<!-- TMPL_VAR NAME='themelang' -->/css/login.css);
-	<!-- /TMPL_IF -->
-
-	<!-- TMPL_IF NAME="wizard" -->
-    @import url(<!-- TMPL_VAR NAME='themelang' -->/css/wizard.css);
-	<!-- TMPL_ELSE -->
-
-		<!-- TMPL_IF NAME="intranetstylesheet" -->
-	@import url(<!-- TMPL_VAR NAME="intranetstylesheet" -->);
-		<!-- TMPL_ELSE -->
-	@import url(<!-- TMPL_VAR NAME='themelang' -->/css/intranet2.css);
-    	<!--/TMPL_IF-->    
-	<!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="intranetcolorstylesheet" -->
-	@import url(<!-- TMPL_VAR NAME="intranetcolorstylesheet" -->);
-	<!-- /TMPL_IF -->
-
-</style>
+<link rel="shortcut icon" href="<!-- TMPL_VAR NAME="themelang" -->/includes/favicon.ico" type="image/x-icon" />
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/reset-fonts-grids.css" />
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/staff.css" />
+<!-- TMPL_IF NAME="popup" --><link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/intranet2popup.css" /><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="login" --><link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/login.css" /><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="wizard" --><link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/wizard.css" />
+<!-- /TMPL_IF -->
 </head>
 <body>
-<script language="JavaScript" type="text/javascript">
-    function _(s) { return s } // dummy function for gettext
-</script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-acqui.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-acqui.inc
index 0a536942a4..8198b1ff80 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-acqui.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-acqui.inc
@@ -1,9 +1,9 @@
 <div id="submenu">
-    <a href="/cgi-bin/koha/acqui/supplier.pl?op=enter">Add supplier</a>
-    <a href="/cgi-bin/koha/acqui/lateorders.pl">Late orders</a>
-    <a href="/cgi-bin/koha/acqui/histsearch.pl">History search</a>
-    <a href="/cgi-bin/koha/suggestion/acceptorreject.pl?op=aorr_confirm">Manage suggestions</a>
-    <a href="/cgi-bin/koha/admin/aqbookfund.pl">Parameters</a>
-</div>
-
-<div id="main">
+<ul>
+	<li>    <a href="/cgi-bin/koha/acqui/supplier.pl?op=enter">Add supplier</a></li>
+	<li>    <a href="/cgi-bin/koha/acqui/lateorders.pl">Late orders</a></li>
+	<li>    <a href="/cgi-bin/koha/acqui/histsearch.pl">History search</a></li>
+	<li>    <a href="/cgi-bin/koha/suggestion/acceptorreject.pl?op=aorr_confirm">Manage suggestions</a></li>
+	<li>    <a href="/cgi-bin/koha/admin/aqbookfund.pl">Parameters</a></li>
+</ul>
+</div>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-admin.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-admin.inc
index 1b8ba3859d..6082998a2f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-admin.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-admin.inc
@@ -1,16 +1,18 @@
 <div id="submenu">
     <p>
-        <a href="/cgi-bin/koha/admin/branches.pl">Libraries</a>
-        <a href="/cgi-bin/koha/admin/aqbookfund.pl">Funds</a>
-        <a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a>
-        <a href="/cgi-bin/koha/admin/categorie.pl">Patron categories</a>
-        <a href="/cgi-bin/koha/admin/issuingrules.pl">Issuing rules</a>
+<ul>
+	<li>        <a href="/cgi-bin/koha/admin/branches.pl">Libraries</a></li>
+	<li>        <a href="/cgi-bin/koha/admin/aqbookfund.pl">Funds</a></li>
+	<li>        <a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a></li>
+	<li>        <a href="/cgi-bin/koha/admin/categorie.pl">Patron categories</a></li>
+	<li>        <a href="/cgi-bin/koha/admin/issuingrules.pl">Issuing rules</a></li>
+</ul>
     </p>
     <p>
-        <a href="/cgi-bin/koha/admin/biblio_framework.pl">Biblio Framework</a>
-        <a href="/cgi-bin/koha/admin/authtypes.pl">Thesaurus Framework</a>
-        <a href="/cgi-bin/koha/admin/authorised_values.pl">Authorised values</a>
+<ul>
+	<li>        <a href="/cgi-bin/koha/admin/biblio_framework.pl">Biblio Framework</a></li>
+	<li>        <a href="/cgi-bin/koha/admin/authtypes.pl">Thesaurus Framework</a></li>
+	<li>        <a href="/cgi-bin/koha/admin/authorised_values.pl">Authorised values</a></li>
+</ul>
     </p>
 </div>
-
-<div id="main">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-authorities.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-authorities.inc
index eedee7c68f..93f9ad8aa2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-authorities.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-authorities.inc
@@ -12,6 +12,4 @@ function searchauthority() {
 	Y = document.forms[0].value.value;
 	window.location="/cgi-bin/koha/authorities/authorities-home.pl?op=do_search&type=intranet&authtypecode="+X+"&value="+Y+"&marclist=&and_or=and&excluding=&operator=contains";
 }
-</script>
-
-<div id="main">
+</script>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-catalogue.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-catalogue.inc
index ce1d962613..0f8fef5b97 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-catalogue.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-catalogue.inc
@@ -1,5 +1,5 @@
 <div id="submenu">
-    <a href="/cgi-bin/koha/reviews/reviewswaiting.pl">Manage reviews</a>
-</div>
-
-<div id="main">
+<ul>
+	<li>    <a href="/cgi-bin/koha/reviews/reviewswaiting.pl">Manage reviews</a></li>
+</ul>
+</div>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc
index cd69f95218..889182ef88 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc
@@ -1,12 +1,12 @@
 <div id="submenu">
-    <a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a>
-    <a href="/cgi-bin/koha/circ/pendingreserves.pl" title="holds to retrieve off the shelf">Holds to pull</a>
-    <a href="/cgi-bin/koha/circ/waitingreserves.pl" title="holds waiting for patron pickup">Holds awaiting pickup</a>
-    <a href="/cgi-bin/koha/circ/transferstodo.pl" title="transfers to do from your library">Transfers to do</a>
-    <a href="/cgi-bin/koha/circ/transferstoreceive.pl" title="transfers to receive at your library">Transfers to receive</a>
-    <a href="/cgi-bin/koha/circ/overdue.pl">Overdues</a>
-    <a href="/cgi-bin/koha/circ/branchoverdues.pl">Fines</a>
-    <a href="/cgi-bin/koha/circ/stats.pl?time=yesterday">Daily reconciliation</a>
-</div>
-
-<div id="main">
+<ul>
+	<li>    <a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a></li>
+	<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>
+	<li>    <a href="/cgi-bin/koha/circ/transferstoreceive.pl" title="transfers to receive at your library">Transfers to receive</a></li>
+	<li>    <a href="/cgi-bin/koha/circ/overdue.pl">Overdues</a></li>
+	<li>    <a href="/cgi-bin/koha/circ/branchoverdues.pl">Fines</a></li>
+	<li>    <a href="/cgi-bin/koha/circ/stats.pl?time=yesterday">Daily reconciliation</a></li>
+</ul>
+</div>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-labels.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-labels.inc
index d54babbb21..2a2d1007f6 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-labels.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-labels.inc
@@ -1,8 +1,7 @@
 <div id="submenu">
-<a href="/cgi-bin/koha/labels/label-home.pl">Label Layouts</a> | 
-<a href="/cgi-bin/koha/labels/label-templates.pl">Label Templates</a> | 
-<a href="/cgi-bin/koha/labels/label-manager.pl">Create or Print Label Batches</a> | 
-</div>
-
-
-
+<ul>
+	<li><a href="/cgi-bin/koha/labels/label-home.pl">Label Layouts</a></li>
+	<li><a href="/cgi-bin/koha/labels/label-templates.pl">Label Templates</a></li>
+	<li><a href="/cgi-bin/koha/labels/label-manager.pl">Create or Print Label Batches</a></li>
+</ul>
+</div>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-members.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-members.inc
index cffe6b3aee..7bfd88b3d5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-members.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-members.inc
@@ -1,8 +1,8 @@
 <div id="submenu">
-    <a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=A">Add adult</a>
-    <a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=C">Add child</a>
-    <a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=P">Add professional</a>
-    <a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=I">Add organisation</a>
-</div>
-
-<div id="main">
+<ul>
+	<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>
+</div>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-reports.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-reports.inc
index 58cc3f93ba..87ed7f8d5c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-reports.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-reports.inc
@@ -1,5 +1,5 @@
 <div id="submenu">
-        <a href="/cgi-bin/koha/reports/reports-home.pl">home</a>
-</div>
-
-<div id="main">
+<ul>
+	<li>        <a href="/cgi-bin/koha/reports/reports-home.pl">home</a></li>
+</ul>
+</div>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-reviews.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-reviews.inc
index 457e067c56..5e3921118b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-reviews.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-reviews.inc
@@ -1,5 +1,5 @@
 <div id="submenu">
-        <a href="/cgi-bin/koha/reviews/reviewswaiting.pl">Reviews Home</a>
-</div>
-
-<div id="main">
+<ul>
+	<li>        <a href="/cgi-bin/koha/reviews/reviewswaiting.pl">Reviews Home</a></li>
+</ul>
+</div>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-serials.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-serials.inc
index b03503c13e..5c807a61f4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-serials.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-serials.inc
@@ -1,8 +1,8 @@
 <div id="submenu">
-        <a href="/cgi-bin/koha/serials/serials-home.pl">Serials Home</a>
-        <a href="/cgi-bin/koha/serials/claims.pl">Claims</a>
-        <a href="/cgi-bin/koha/serials/subscription-add.pl">Add Subscription</a>
-        <a href="/cgi-bin/koha/serials/checkexpiration.pl">Check Expiration</a>
-</div>
-
-<div id="main">
+<ul>
+	<li>        <a href="/cgi-bin/koha/serials/serials-home.pl">Serials Home</a></li>
+	<li>        <a href="/cgi-bin/koha/serials/claims.pl">Claims</a></li>
+	<li>        <a href="/cgi-bin/koha/serials/subscription-add.pl">Add Subscription</a></li>
+	<li>        <a href="/cgi-bin/koha/serials/checkexpiration.pl">Check Expiration</a></li>
+</ul>
+</div>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-tools.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-tools.inc
index 5dc00a89ed..3a84e037a6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-tools.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-tools.inc
@@ -1,17 +1,17 @@
 <div id="submenu">
-    <a href="/cgi-bin/koha/tools/tools-home.pl">Tools Home</a>
-    <a href="/cgi-bin/koha/tools/holidays.pl">Holidays</a>
-    <a href="/cgi-bin/koha/tools/koha-news.pl">News</a>
-    <a href="/cgi-bin/koha/tools/inventory.pl">Inventory/stocktaking</a>
-    <a href="/cgi-bin/koha/tools/cleanborrowers.pl">Clean borrowers</a>
-    <a href="/cgi-bin/koha/tools/itemslost.pl">Items lost</a>
-    <a href="/cgi-bin/koha/tools/export.pl">Export</a>
-    <a href="/cgi-bin/koha/tools/import.pl">Import</a>
-    <a href="/cgi-bin/koha/tools/letter.pl">Letters</a>
-    <a href="/cgi-bin/koha/tools/breeding.pl">Reservoir</a>
-    <a href="/cgi-bin/koha/labels/labels-home.pl">Labels</a>
-    <a href="/cgi-bin/koha/tools/overduerules.pl">overdue rules</a>
-    <a href="/cgi-bin/koha/tools/viewlog.pl">Log viewer</a>
+<ul>
+	<li><a href="/cgi-bin/koha/tools/tools-home.pl">Tools Home</a></li>
+	<li><a href="/cgi-bin/koha/tools/holidays.pl">Holidays</a></li>
+	<li><a href="/cgi-bin/koha/tools/koha-news.pl">News</a></li>
+	<li><a href="/cgi-bin/koha/tools/inventory.pl">Inventory/stocktaking</a></li>
+	<li><a href="/cgi-bin/koha/tools/cleanborrowers.pl">Clean borrowers</a></li>
+	<li><a href="/cgi-bin/koha/tools/itemslost.pl">Items lost</a></li>
+	<li><a href="/cgi-bin/koha/tools/export.pl">Export</a></li>
+	<li><a href="/cgi-bin/koha/tools/import.pl">Import</a></li>
+	<li><a href="/cgi-bin/koha/tools/letter.pl">Letters</a></li>
+	<li><a href="/cgi-bin/koha/tools/breeding.pl">Reservoir</a></li>
+	<li><a href="/cgi-bin/koha/labels/labels-home.pl">Labels</a></li>
+	<li><a href="/cgi-bin/koha/tools/overduerules.pl">Overdue Rules</a></li>
+	<li><a href="/cgi-bin/koha/tools/viewlog.pl">Log viewer</a></li>
+</ul>
 </div>
-
-<div id="main">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-virtualshelves.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-virtualshelves.inc
index a2cfd1eae2..9e65a38c7d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-virtualshelves.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-virtualshelves.inc
@@ -1,5 +1,5 @@
 <div id="submenu">
-        <a href="/cgi-bin/koha/virtualshelves/shelves.pl">Virtual Shelves</a>
-</div>
-
-<div id="main">
+<ul>
+	<li>        <a href="/cgi-bin/koha/virtualshelves/shelves.pl">Virtual Shelves</a></li>
+</ul>
+</div>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc
index 4cdf4f1b94..f8f1165a37 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc
@@ -1,10 +1,4 @@
-<div id="kohalogo">
-    <img src="/intranet-tmpl/prog/img/koha-logo-white.png" height="60px" />
-    <h3><a href="/cgi-bin/koha/mainpage.pl">Koha Staff Client</a></h3>
-</div>
-<div id="onlinehelp">
-    <a href="#" onclick="window.open('/cgi-bin/koha/help.pl','Koha_Help','width=600,height=600,toolbar=false,scrollbars=yes');">[?]</a>
-</div>
+
 <div id="mainmenu">
 
     <!-- TMPL_IF NAME="CAN_user_circulate" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tmpl
index d53c0b6e0e..c20426ef66 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tmpl
@@ -1,10 +1,14 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>About Koha</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<div id="main">
-<div id="mainbloc">
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+	
 	<h1>About Koha</h1>
 	
 <table>
@@ -95,7 +99,10 @@
 	<li><strong>Spanish: </strong>Andres Tarallo</li>
 	<li><strong>Italian: </strong>Giuseppe Angilella</li>
 </ul>
+
 </div>
+</div>
+	</div>
 
-
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl
index 6078e1fea0..dbc5b3ccb3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl
@@ -1,15 +1,22 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Acquisitions</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
 
+
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <h1>Acquisitions</h1>
 <div id="acqui_acqui_home_order">
     <fieldset>
         <legend>Start, recieve, or modify any order</legend>
     <!-- TMPL_IF name="nobudget" -->
-        <span class="problem">You must define a budget in parameters</span>
+        <span class="problem">You must <a href="/cgi-bin/koha/admin/aqbookfund.pl">define a budget</a> in parameters</span>
         <form name="findsupplier" action="/cgi-bin/koha/acqui/booksellers.pl" method="post">
             <p><label for="supplier">Supplier </label><input type="text" size="25" name="supplier" id="supplier" />
             <input type="submit" value="Search" />
@@ -119,4 +126,9 @@
     document.findsupplier.supplier.focus();
 </script>
 
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
index da8e33d57d..e0dcddf5aa 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
@@ -1,10 +1,16 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; <!-- TMPL_UNLESS name="basketno" -->New <!-- /TMPL_UNLESS -->Shopping Basket (<!-- TMPL_VAR NAME="basketno" -->) for <!-- TMPL_VAR NAME="name" --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
 
+
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
     <h1><!-- TMPL_UNLESS name="basketno" -->New <!-- /TMPL_UNLESS -->Shopping Basket <!-- TMPL_VAR NAME="basketno" --> for <a href="supplier.pl?supplierid=<!-- TMPL_VAR NAME="booksellerid" -->"><!-- TMPL_VAR NAME="name" --></a></h1>
     <div id="acqui_basket_summary">
         <h2>Basket Details</h2>
@@ -14,12 +20,11 @@
         <p><label>For </label> Supplier Id <!-- TMPL_VAR NAME="booksellerid" -->&nbsp;</p>
         <p><label>Invoice number </label><!-- TMPL_VAR NAME="booksellerinvoicenumber" -->&nbsp;</p>
         <!-- TMPL_IF name="closedate" --><p><label>Closed On: </label> <!-- TMPL_VAR name="closedate" --></p><!-- /TMPL_IF -->
-        </table>
         <!-- TMPL_UNLESS name="closedate" -->
         <p><a href="javascript:confirm_close()" class="button">Close this basket</a></p>
-        <script>
+        <script type="text/javascript">
             function confirm_close() {
-                var is_confirmed = confirm(_('Are you sure you want to close this basket?'));
+                var is_confirmed = confirm('Are you sure you want to close this basket?');
                 if (is_confirmed) {
                     window.location = "/cgi-bin/koha/acqui/booksellers.pl?op=close&basketno=<!-- TMPL_VAR NAME="basketno" -->&supplier=<!-- TMPL_VAR name="booksellerid" -->";
                 }
@@ -98,7 +103,7 @@
                 </td>
                 <th>SubTotal</th>
                 <th><!-- TMPL_VAR NAME="sub_total_est" --></th>
-                <th><!-- TMPL_VAR NAME="sub_total" --></td>
+                <th><!-- TMPL_VAR NAME="sub_total" --></th>
                 <th><!-- TMPL_VAR name="qty_total" --></th>
                     <!-- TMPL_IF name="active" -->
                         <!-- TMPL_IF name="closedate" -->
@@ -124,12 +129,12 @@
         </table>
     <!-- TMPL_ELSE -->
         <table>
-            <tr><td>Basket empty</p>
+            <tr><td>Basket empty</td></tr>
         </table>
     <!-- /TMPL_IF -->
+    </div>
     
     <!-- TMPL_UNLESS name="closedate" -->
-    </div>
     <div id="acqui_basket_add">
         <h2>Add To Order</h2>
         <form action="/cgi-bin/koha/acqui/neworderbiblio.pl" method="post">
@@ -144,4 +149,9 @@
     </div>
     <!-- /TMPL_UNLESS -->
 
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl
index f04b081c55..ecc88b054a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl
@@ -1,9 +1,15 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Search for supplier <!-- TMPL_VAR name="bookselname" --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+	
 <h1>You searched on <b>supplier <!-- TMPL_VAR name="supplier" -->,</b> <!-- TMPL_VAR name="count" --> results found</h1>
 <div id="acqui_order_supplierlist">
 	<table>
@@ -72,4 +78,9 @@
 <div id="action">
     <a href="supplier.pl?op=enter">Add supplier</a>
 </div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl
index f568f7a991..8247d8b732 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl
@@ -2,10 +2,15 @@
 <title>Koha &rsaquo; Acquisitions order search</title>
 <!-- TMPL_INCLUDE NAME="doc-head-calendar.inc" -->
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+	
 <!-- Additions to enable Calendar system -->
 <link rel="stylesheet" type="text/css" href="/intranet-tmpl/prog/en/lib/calendar/calendar-system.css" />
 <!-- End of additions -->
@@ -121,4 +126,9 @@
 		</form>
 	</div>
 
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tmpl
index ded7ab9da4..37100c99c4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tmpl
@@ -1,9 +1,15 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Acquisitions</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+	
 <h1 ><!-- TMPL_IF name="Supplier" --><!-- TMPL_VAR name="Supplier" --> : <!--/TMPL_IF -->Late issues</h1>
 <div id="acqui_lateorders">
     <table>
@@ -99,5 +105,9 @@
         </tr>
     </table>
 </div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+</div>
+</div>
+</div>
 
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl
index dda9bcbf54..2e38cb2f86 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl
@@ -1,10 +1,15 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Shopping basket for: <!-- TMPL_VAR name="bookselname" --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+	
 <h1>Shopping Basket For: <!-- TMPL_VAR name="bookselname" --></h1>
 
 
@@ -56,4 +61,9 @@
 </div>
 <!-- /TMPL_IF -->
 
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
index d1a01b58ac..bda6f5b8c6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
@@ -1,10 +1,15 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Shopping Basket For: <!-- TMPL_VAR name="bookselname" --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+	
 <script language="javascript" type="text/javascript">
 <!--
 function update(f){
@@ -279,4 +284,9 @@ if (quantity ==0) {
         <input type="button" value="OK" onclick="check(this.form)" />
     </p>
 </form>
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tmpl
index c46e41dc33..24ee3c946d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tmpl
@@ -1,10 +1,15 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Add order from suggestion: <!-- TMPL_VAR name="bookselname" --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+	
 <h1>Suggestions</h1>
 <div id="acqui_suggestion_select">
     <form action="/cgi-bin/koha/acqui/newordersuggestion.pl" method="get">
@@ -65,4 +70,9 @@
     </table>
     </form>
 </div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl
index 6f0dc51c15..2fbb60e97b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl
@@ -1,10 +1,14 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Receipt summary for : <!-- TMPL_VAR NAME="name" --> <!-- TMPL_IF NAME="invoice" -->invoice, <!-- TMPL_VAR NAME="invoice" --><!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
 
 <h1>Receipt order for : <!-- TMPL_VAR NAME="name" --> <!-- TMPL_IF NAME="invoice" -->Parcel <!-- TMPL_VAR NAME="invoice" --><!-- /TMPL_IF --> (order #<!-- TMPL_VAR NAME="ordernumber" -->)</h1>
 
@@ -106,5 +110,9 @@
 </div>
 <!-- /TMPL_IF -->
 
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
+</div>
+</div>
+</div>
 
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl
index ca7cdab190..bbd3d457fe 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl
@@ -1,10 +1,15 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Recieve <!-- TMPL_VAR name="bookselname" --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+	
     <h1>
         <!-- TMPL_IF name="date" -->
             Receipt Summary for <i><!-- TMPL_VAR NAME="name" --></i> <!--TMPL_IF Name="invoice"-->Parcel <i><!-- TMPL_VAR NAME="invoice" --></i><!--/TMPL_IF --> on <i><!-- TMPL_VAR NAME="date" --></i>
@@ -108,5 +113,9 @@
         <!-- /TMPL_LOOP -->
      </table>
 </div>
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
- 
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" --> 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl
index 31cb2b6255..b91d001649 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl
@@ -1,8 +1,14 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><title>Koha &rsaquo; Recieve <!-- TMPL_VAR name="bookselname" --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+	
 <h1>Receive parcel from supplier <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->"><!-- TMPL_VAR NAME="name" --></a></h1>
 
 <!-- TMPL_IF NAME="count" --><p> <!-- TMPL_VAR NAME="count" --> parcels found</p><!--/TMPL_IF-->
@@ -103,6 +109,7 @@
 </table>
 </form>
 <!--/TMPL_IF-->
+</div>
     <div id="parcels_new_parcel">
     <fieldset>
     <legend>Receive a new Parcel </legend>
@@ -126,4 +133,9 @@
         </form>
     </fieldset>
     </div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl
index cc83cbfbb3..1c5f297c74 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl
@@ -1,10 +1,15 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Supplier <!-- TMPL_VAR name="bookselname" --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+	
 <!--TMPL_IF Name="enter"-->
     <form action="updatesupplier.pl" method="post">
     
@@ -74,7 +79,7 @@
             </p>
         </fieldset>
         <fieldset>
-            <legend>Ordering informations</legend>
+            <legend>Ordering information</legend>
             <p>
                 <label>Supplier is</label>
                     <!-- TMPL_IF name="active" -->
@@ -115,6 +120,7 @@
                     <input type="radio" name="gst" value="0" checked="checked" />No
 				<!-- /TMPL_IF -->
             </p><!-- TMPL_ELSE --><input type="hidden" name="gst" value="0" /><!-- /TMPL_IF -->
+			
             <!-- TMPL_IF NAME="GST" --><p>
                 <label>Ordering prices</label>
 				<!-- TMPL_IF name="listincgst" -->
@@ -125,6 +131,7 @@
                     <input type="radio" name="list_gst" value="0" checked="checked" />don't include GST
 				<!-- /TMPL_IF -->
             </p><!-- TMPL_ELSE --><input type="hidden" name="list_gst" value="0" /><!-- /TMPL_IF -->
+			
             <!-- TMPL_IF NAME="GST" --><p>
                 <label>Invoice prices</label>
 				<!-- TMPL_IF name= "invoiceincgst" -->
@@ -133,7 +140,7 @@
 					<!-- TMPL_ELSE -->
                     <input type="radio" name="invoice_gst" value="1">include GST
                     <input type="radio" name="invoice_gst" value="0" checked="checked" />don't include GST
-
+				<!-- /TMPL_IF -->
             </p><!-- TMPL_ELSE --><input type="hidden" name="invoice_gst" value="0" /><!-- /TMPL_IF -->
             <p>
                 <label>Discount</label>
@@ -149,15 +156,11 @@
 <!--TMPL_ELSE-->
     <h1>Information for : <!-- TMPL_VAR NAME="name" --></h1>
     <div id="action">
-        <a href="supplier.pl?supplierid=<!--TMPL_VAR Name="id"-->&amp;op=enter">
-                Edit Supplier
-            </a>
-            <a href="booksellers.pl?supplier=<!--TMPL_VAR Name="id"-->">
-                Manage Orders
-            </a>
-            <a href="parcels.pl?supplierid=<!--TMPL_VAR Name="id"-->"> 
-                Receive Parcel
-            </a>
+<ul>
+	<li>        <a href="supplier.pl?supplierid=<!--TMPL_VAR Name="id"-->&amp;op=enter">Edit Supplier</a></li>
+	<li>        <a href="booksellers.pl?supplier=<!--TMPL_VAR Name="id"-->">Manage Orders</a></li>
+	<li>        <a href="parcels.pl?supplierid=<!--TMPL_VAR Name="id"-->">Receive Parcel</a></li>
+</ul>
         </div>
         <fieldset>
             <legend>Company details</legend>
@@ -259,7 +262,7 @@
                 <!-- TMPL_VAR NAME="notes" -->&nbsp;
             </p>
         </fieldset>
-</div>
+
 <!--/TMPL_IF-->
 <script>
 function confirm_deletion() {
@@ -268,4 +271,9 @@ function confirm_deletion() {
     }
 }
 </script>
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl
index 9daf5a78d0..9a45869989 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,10 +1,16 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; System Administration</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+	
 <h1>Koha &rsaquo; System Administration</h1>
 
 <table>
@@ -96,4 +102,9 @@
 </tr>
 </table>
 
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl
index 926ca36cfa..6ea926229d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl
@@ -1,9 +1,15 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; System Administration: Funds and Budgets</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <!-- TMPL_IF name="else" -->
 <h1>Funds and budgets administration</h1>
   <!-- TMPL_IF NAME="bookfund" -->
@@ -259,4 +265,9 @@
 </form>
 <!-- /TMPL_IF --> <!-- delete_confirmed -->
 
+</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/aqbudget.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl
index 8962a7fb20..661d978008 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl
@@ -1,6 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; System Administration &rsaquo; Budgets</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 
 <!-- Additions to enable Calendar system -->
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css" />
@@ -9,9 +10,14 @@
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-setup.js"></script>
 <!-- End of additions -->
 
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <ul id="_informations">
 <!-- TMPL_IF NAME="add_validate" -->
   <li>Budget Data Recorded, return to <a href="<!-- TMPL_VAR name="script_name" -->">budget list</a></li>
@@ -361,4 +367,9 @@
 </form>
 <!-- /TMPL_IF -->
 
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl
index cd82848306..1a8f031af8 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,10 +1,17 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; System Administration</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
+
 
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <!-- TMPL_IF NAME="add_form" -->
 
 	<h><!-- TMPL_IF NAME="use-heading-flags-p" -->
@@ -135,4 +142,9 @@
 
 
 
+</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/auth_tag_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl
index a78c95f0fd..05877eb5fb 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,11 +1,17 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; System Administration</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 
 
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <h1>Authority MARC framework for <!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR NAME="authtypecode" --><!-- TMPL_ELSE -->default framework<!-- /TMPL_IF --></h1>
 <script language="javascript" type="text/javascript">
     /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -196,4 +202,9 @@ return false;
 </div>
 <!-- /TMPL_IF -->
 
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl
index 7aec6c4276..fddd889589 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
@@ -3,10 +3,16 @@
 <!-- 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" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->	
 
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <!-- TMPL_IF name="add_form" -->
 	<h1>
 	   <!-- TMPL_IF name="action_modify" -->Modify authorised value<!-- /TMPL_IF -->
@@ -99,4 +105,9 @@ the subfield is not entered through a free field, but though a list of authorise
 
 <!-- /TMPL_IF -->
 
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl
index fd7b6aaa3c..be61b7ba85 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl
@@ -1,9 +1,9 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; System Administration</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 
 
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
 
 <script language="javascript" type="text/javascript">
@@ -60,6 +60,12 @@ function Check(f) {
 }
 </script>
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <!-- TMPL_IF NAME="add_form" -->
 
 	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
@@ -140,4 +146,9 @@ function Check(f) {
 </form>
 
 <!-- /TMPL_IF -->
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl
index 32cbf9faba..cea6fd003a 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,8 +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>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
 
 <script language="javascript" type="text/javascript">
@@ -59,6 +59,12 @@ function Check(f) {
 }
 </script>
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <!-- TMPL_IF NAME="add_form" -->
     <h1><!-- TMPL_IF NAME="frameworkcode" -->Modify framework text<!-- TMPL_ELSE -->Add framework<!-- /TMPL_IF --></h1>
     <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
@@ -124,4 +130,9 @@ function Check(f) {
 </form>
 
 <!-- /TMPL_IF -->
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
index 670b462c2d..8f46bdab6f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
@@ -4,10 +4,16 @@
 <!-- TMPL_IF name="else" --><!-- TMPL_VAR name="head" --><!-- /TMPL_IF -->
 <!-- TMPL_IF name="delete_category" -->Confirm deletion of category<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <!-- TMPL_IF name="add" -->
     <!-- TMPL_IF name="heading-branches-add-branch-p" -->
         <h1>Add branch</h1>
@@ -234,4 +240,9 @@
     </form>
 <!-- /TMPL_IF -->
 
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl
index 8bcef2f15e..2d2b2090b6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl
@@ -5,11 +5,17 @@
 <!-- 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" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 
 
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <!-- TMPL_IF NAME="add_form" -->
 	<script language="JavaScript" type="text/javascript">
 	//
@@ -211,4 +217,9 @@
 	</form>
 <!-- /TMPL_IF -->
 
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categoryitem.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categoryitem.tmpl
index 45fe055a8b..19cb7345b2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categoryitem.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categoryitem.tmpl
@@ -1,8 +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>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
 
 <!-- TMPL_IF NAME="add_form" -->
@@ -63,6 +63,12 @@
         }
         </script>
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+		
         <!-- TMPL_IF NAME="categorycode" -->
                 <h1>Modify category</h1>
         <!-- TMPL_ELSE -->
@@ -303,6 +309,11 @@
 <!-- /TMPL_IF -->
 
 
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
 
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/charges.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/charges.tmpl
index 2d045b8a2e..5709250934 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/charges.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/charges.tmpl
@@ -1,10 +1,16 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; System Administration &rsaquo; Fines</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <h2>Calculating Fines</h2>
 <p>Each box needs to be filled in with fine,time to start charging,charging cycle</p>
 <p>eg 1,7,7 = $1 fine, after 7 days, every 7 days</p>
@@ -30,4 +36,9 @@
 <input type="submit" value="Submit Changes" />
 </form>
 
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl
index d04c7570b1..29619555a9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl
@@ -2,10 +2,16 @@
 <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>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <h1>MARC Checking</h1>
 <table>
     <tr>
@@ -135,4 +141,9 @@
 
 
 
+</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/cities.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl
index 1e8f401749..af82d200d5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl
@@ -1,9 +1,15 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; System administration &rsaquo; Cities</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <!-- TMPL_IF NAME="add_form" -->
 	<!-- TMPL_IF NAME="cityid" -->
 		<h1>Modify a city</h1>
@@ -127,6 +133,11 @@
 	</form></p>
 <!-- /TMPL_IF -->
 
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
 <script language="javascript" type="text/javascript">
 		/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
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 277994510d..226ff6dbec 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl
@@ -6,10 +6,16 @@
 <!-- TMPL_IF NAME="delete_confirmed" -->Currency Deleted<!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="else" -->Currencies<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <!-- TMPL_IF NAME="add_form" -->
         <script>
         //
@@ -63,10 +69,10 @@
                         alert(alertString2);
                 }
         }
-        </SCRIPT>
+        </script>
 
-        <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
-        <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" />
 
 	<table>
 	<caption><!-- TMPL_IF NAME="searchfield" -->
@@ -110,7 +116,7 @@
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="delete_confirm" -->
-<div class="table details">	<table><caption>Confirm Deletion of Currency <!-- TMPL_VAR NAME="searchfield" --></caption>
+<table><caption>Confirm Deletion of Currency <!-- TMPL_VAR NAME="searchfield" --></caption>
 
 		<tr>
 			<th>Currency</th>
@@ -159,7 +165,7 @@
                 <input type="text" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->" />
                 <input type="submit" name="Search" value="Search" />
         </form>	
-	<div class="table"><table>
+	<table>
 		<tr>
 			<th>Currency</th>
 			<th>Rate</th>
@@ -192,4 +198,9 @@
 <!-- /TMPL_IF -->
 
 
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/finesrules.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/finesrules.tmpl
index 041916f734..fa0b28c316 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/finesrules.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/finesrules.tmpl
@@ -1,10 +1,16 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; System Administration &rsaquo; Issuing Rules</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 	<h1>Defining <!-- TMPL_IF NAME="branch" -->fining rules for <!-- TMPL_VAR NAME="branch" --><!-- TMPL_ELSE -->default fining rules<!-- /TMPL_IF --></h1>
 		
 	<div class="help">
@@ -24,7 +30,7 @@
 			<li>library * and patron category *, same itemtype </li>
 			<li>library * and patron category *, itemtype *</li>
 		</ul>
-	
+	</div>
 		<form method="post" action="/cgi-bin/koha/admin/finesrules.pl">
 		<label for="branch">Select a library :</label>
 			<select id="branch" name="branch">
@@ -66,4 +72,9 @@
 			<input type="submit" value="Save Changes" />
 		</form>
 
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/issuingrules.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/issuingrules.tmpl
index 76bc297462..a6a6003145 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/issuingrules.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/issuingrules.tmpl
@@ -1,10 +1,16 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; System Administration &rsaquo; Issuing Rules</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 	<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>
@@ -63,4 +69,9 @@
 			<input type="submit" value="Save Changes" />
 		</form>
 
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl
index b91268f044..6c1874ccb5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl
@@ -22,10 +22,16 @@ Item Types Administration
 <!-- /TMPL_IF -->
 </title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <!-- TMPL_IF name="add_form" -->
 
 <form action="<!-- TMPL_VAR name="script_name" -->" name="Aform" method="post">
@@ -296,4 +302,9 @@ function Check(f) {
 	}
 }
 </script>
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl
index 20a0865c55..a590ea56df 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl
@@ -4,10 +4,16 @@
 <!-- TMPL_IF name="else" -->MARC links <!-- TMPL_VAR name="tagfield" --><!-- /TMPL_IF --></title>
 
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <!-- TMPL_IF name="add_form" -->
 <!-- -->
 <h1><!-- TMPL_VAR name="action" --></h1>
@@ -140,4 +146,9 @@
 </table>
 <!-- /TMPL_IF -->
 
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl
index c53ed78166..7a0b92a7ea 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
@@ -3,10 +3,16 @@
 <!-- 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" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <!-- TMPL_IF NAME="add_form" -->
     <h1>
         <!-- TMPL_IF NAME="use-heading-flags-p" -->
@@ -207,4 +213,9 @@ function displayMoreConstraint(numlayer){
 
 </script>
 
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl
index 2b6117d969..6c70bacc1c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl
@@ -5,10 +5,16 @@
 <!-- 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" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <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>
 <script language="javascript" type="text/javascript">
     /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -213,4 +219,9 @@
 <!-- /TMPL_IF -->
 
 
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl
index 5447d27433..2f7cce8614 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl
@@ -6,10 +6,16 @@
 <!-- TMPL_IF NAME="delete_confirmed" -->Printer Deleted<!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="else" -->Printers<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <!-- TMPL_IF NAME="add_form" -->
         <script language="JavaScript" type="text/javascript">
         //
@@ -189,4 +195,9 @@
 <!-- /TMPL_IF -->
 
 
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl
index da88a2c2a3..3c8c1cf451 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl
@@ -1,9 +1,15 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; System Administration: Road Types
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <!-- TMPL_IF NAME="add_form" -->
 	<!-- TMPL_IF NAME="id_city" -->
 		<h1>Modify road type</h1>
@@ -102,6 +108,11 @@
 	</form></p>
 <!-- /TMPL_IF -->
 
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
 
 <script language="javascript" type="text/javascript">
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 c4afb452ad..c9687c2043 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tmpl
@@ -3,10 +3,16 @@
 <!-- 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" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <script language="JavaScript" type="text/javascript">
         //
         function isNotNull(f,noalert) {
@@ -185,4 +191,9 @@
     
     <!-- /TMPL_IF -->
 
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/thesaurus.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/thesaurus.tmpl
index c3720f0b70..bbc53a4832 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/thesaurus.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/thesaurus.tmpl
@@ -1,10 +1,16 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; System Administration &rsaquo; Thesaurus Management</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <!-- TMPL_IF name="detail_form" -->
 <table>
     <caption>Thesaurus management</caption>
@@ -154,4 +160,9 @@
 <!-- /TMPL_IF -->
 
 
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl
index bc1d332129..90a1dbbb7e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl
@@ -5,10 +5,16 @@
 <!-- TMPL_IF NAME="add_validate" -->z39.50 Server Added<!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="delete_confirmed" -->z39.50 Server Deleted<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <!-- TMPL_IF NAME="add_form" -->
         <script language="JavaScript" type="text/javascript">
         //
@@ -272,4 +278,9 @@
 
 <!-- /TMPL_IF -->
 
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tmpl
index 73f2288614..27da4c3b0a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tmpl
@@ -7,6 +7,11 @@
     <!-- TMPL_IF NAME="loginprompt" -->Log in to Koha<!-- /TMPL_IF -->
 </title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+<div id="doc" class="yui-t7">
+   <div id="bd">
+	<div class="yui-g">
+
 <div id="login">
 <h1><a href="http://koha.org">Koha</a></h1>
 <!-- TMPL_IF NAME="nopermission" -->
@@ -52,6 +57,10 @@
 <!-- </ul> -->
 <!-- /TMPL_IF -->
 
+</div>
+</div>
+</div>
+
 <script type="text/javascript">
 // <![CDATA[
     document.getElementById('userid').focus(); // auto focus on login input when document is loaded.
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tmpl
index 0b7722d57f..a0d93d55c2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tmpl
@@ -1,24 +1,29 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Cataloguing Authority Report</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<div id="mainbloc">
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<h1 class="authority">Authority search</h1>
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
+<h1>Authority search</h1>
 
 <form name="f" action="/cgi-bin/koha/authorities/auth_finder.pl" method="post">
 	<input type="hidden" name="op" value="do_search" />
 	<input type="hidden" name="type" value="intranet" />
 	<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->" />
-	<div id="bloc25">
-		<h2 class="authority">Search on</h2>
+	<h2>Search on</h2>
 		<p>
-			<label class="label100">Authority type</label>
+			<label>Authority type</label>
 			<!-- TMPL_VAR NAME="authtypecode" -->
 			<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
 			<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->" />
 		</p>
 		<p>
-          <label class="label100">Main entry ($a only)</label>
+          <label>Main entry ($a only)</label>
           <input type="hidden" name="marclist" value="mainmainentry" />
           <input type="hidden" name="and_or" value="and" />
           <input type="hidden" name="excluding" value="" />
@@ -61,8 +66,11 @@
 	  </select>
 			<input type="submit" value="Start search" class="button" />
 		</p>
-	</div>
 </form>
-</div>
-<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
 
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl
index 2079d6bdde..d67d020f91 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl
@@ -1,10 +1,15 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Authorities</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-authorities.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <fieldset id="authorities_authorities_home_search">
   <legend>Authority search</legend>
 
@@ -125,4 +130,9 @@
   </form>
 </fieldset>
 
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl
index ba98ae0bf9..2cb4978834 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl
@@ -1,11 +1,15 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <Title>Koha -- Authority details</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-authorities.inc" -->
 
-<div id="authorities_authorities_add_or_modify">
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <!-- TMPL_IF name="authid" -->
   <h1>Modify authority #<!-- TMPL_VAR NAME="authid" --> (<!-- TMPL_VAR name="authtypetext" -->)</h1>
 <!-- TMPL_ELSE -->
@@ -53,7 +57,7 @@
             <!-- /TMPL_IF -->
         </p>
     <!-- /TMPL_IF -->
-    <div>
+
     <!-- TMPL_LOOP NAME="subfield_loop" -->
         <p class="subfield">
         <!-- TMPL_IF NAME="visibility" -->
@@ -88,11 +92,11 @@
                     <input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->" />
                     <input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->" />
                 </p>
-        </div>
+</div>
     <!-- /TMPL_LOOP -->
-    </div>
+
 <!-- /TMPL_LOOP -->
-</div>	
+
 		<div name="hidden" id="hidden" class="tab">
 		<!-- TMPL_LOOP NAME="hidden_loop" -->
 				<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->" />
@@ -280,5 +284,9 @@ function unHideSubfield(index,labelindex) {
 }
 
 </script>
+</div>
+</div>
+</div>
 
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
\ No newline at end of file
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/blinddetail-biblio-search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/blinddetail-biblio-search.tmpl
index a61cdf567c..396a387887 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/blinddetail-biblio-search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/blinddetail-biblio-search.tmpl
@@ -2,6 +2,10 @@
 <Title>Koha -- Authority details</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
+<div id="doc" class="yui-t7">
+   <div id="bd">
+	<div class="yui-g">
+
 <script type="text/javascript">
     window.onload = go();
     
@@ -40,4 +44,8 @@
     }
 </script>
 
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tmpl
index 1483bef840..c46a1c505d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tmpl
@@ -1,10 +1,15 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Authority Details</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-authorities.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <!-- TMPL_IF Name="displayhierarchy"-->
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/hierarchy.css" />
 <script language="JavaScript" type="text/javascript">
@@ -59,7 +64,7 @@ function showChildren(mynumber) {
 </div>
 <!-- /TMPL_IF -->
 
-<h1 class="authority">Authority #<!-- TMPL_VAR NAME="authid" --> (<!-- TMPL_VAR name="authtypetext" -->)</h1>
+<h1>Authority #<!-- TMPL_VAR NAME="authid" --> (<!-- TMPL_VAR name="authtypetext" -->)</h1>
 
 <div id="action">
 <a href="authorities.pl?authid=<!-- TMPL_VAR NAME="authid" -->">Edit</a>
@@ -113,4 +118,9 @@ function Dopop(link) {
 }
 </script>
 
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl
index 197b37086b..5b067608f9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl
@@ -1,23 +1,28 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Cataloguing Authority Selection</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<div id="mainbloc">
-    <h1 class="authority">Authority search results</h1>
-    <div id="bloc25">
-        <form name="f" method="post" action="auth_finder.pl">
+<!-- TMPL_INCLUDE NAME="header.inc" -->
+
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
+    <h1>Authority search results</h1>
+    <form name="f" method="post" action="auth_finder.pl">
             <input type="hidden" name="op" value="do_search" />
             <input type="hidden" name="type" value="intranet" />
             <input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->" />
             <input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->" />
-            <div id="bloc25">
-                <h2 class="authority">Search on</h2>
+            <h2>Search on</h2>
                 <p>
-                    <label class="label100">Authority type</label>
+                    <label>Authority type</label>
                     <!-- TMPL_VAR NAME="authtypecode" -->
                     <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
                 </p>
                 <p>
-                    <label class="label100">Main entry ($a only)</label>
+                    <label>Main entry ($a only)</label>
                     <input type="hidden" name="marclist" value="mainmainentry" />
                     <input type="hidden" name="and_or" value="and" />
                     <input type="hidden" name="excluding" value="" />
@@ -29,7 +34,7 @@
                     <input type="text" name="value" value="<!-- TMPL_VAR name="mainmainstring" -->" />
                 </p>
                 <p>
-                    <label class="label100">Main entry</label>
+                    <label>Main entry</label>
                     <input type="hidden" name="marclist" value="mainentry" />
                     <input type="hidden" name="and_or" value="and" />
                     <input type="hidden" name="excluding" value="" />
@@ -41,7 +46,7 @@
                     <input type="text" name="value" value="<!-- TMPL_VAR name="mainstring" -->" />
                 </p>
                 <p>
-                    <label class="label100">Anywhere</label>
+                    <label>Anywhere</label>
                     <input type="hidden" name="marclist" value="" />
                     <input type="hidden" name="and_or" value="and" />
                     <input type="hidden" name="excluding" value="" />
@@ -55,11 +60,8 @@
                 <p>
                 <input type="submit" value="Start search" class="button" />
                 </p>
-            </div>
         </form>
-    </div>
-    <div id="bloc25">
-        <div id="resultnumber">
+    <div id="resultnumber">
             <p>
                 <!-- TMPL_IF name="displayprev" -->
                     <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&amp;<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&amp;op=do_search&amp;type=intranet&amp;index=<!-- TMPL_VAR name="index" -->&amp;tagid=<!-- TMPL_VAR name="tagid" -->">
@@ -90,9 +92,9 @@
         <div id="resultlist">
             <table>
                 <tr>
-                    <th class="authority">Summary</th>
-                    <th class="authority">Used</th>
-                    <th class="authority">Get It!</th>
+                    <th>Summary</th>
+                    <th>Used</th>
+                    <th>Get It!</th>
                 </tr>
                 <tr>
                     <td>&nbsp;</td>
@@ -134,9 +136,7 @@
                         &gt;&gt;</a>
                 <!-- /TMPL_IF -->
             </p>
-        </div>	
-    </div>
-</div>
+        </div>
 
 <script language="JavaScript" type="text/javascript">
 
@@ -145,4 +145,9 @@ function jumpfull(page)
     window.open(page,'','fullscreen,scrollbars');
 }
 </script>
-<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl
index ee015aaa7f..a51db2a6ef 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl
@@ -1,11 +1,16 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Authorities &rsaquo; Search Result List</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-authorities.inc" -->
 
-<h1 class="authority">Authority search results</h1>
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
+<h1>Authority search results</h1>
 
 <div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
 
@@ -61,4 +66,9 @@ function confirm_deletion(id) {
 }
 </script>
 
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio-nomarc.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio-nomarc.tmpl
index fc41c623da..54156028ac 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio-nomarc.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio-nomarc.tmpl
@@ -31,4 +31,9 @@ Please Specify a Title
 <input type="submit" value="Add Record" />
 
 </form>
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
index 0982002293..95219fe285 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
@@ -1,9 +1,9 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Cataloging &rsaquo; <!-- TMPL_IF NAME="biblionumber" -->Edit MARC Record Number <!-- TMPL_VAR name="biblionumber" --><!-- TMPL_ELSE -->Add MARC Record<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 
 <!--TMPL_UNLESS Name="popup"-->
-    <!-- TMPL_INCLUDE NAME="menus.inc" -->
     <!-- TMPL_INCLUDE NAME="menu-catalogue.inc" -->
 <!--/TMPL_UNLESS-->
 
@@ -42,9 +42,9 @@
 	<div id="tabs">
         <!-- TMPL_LOOP name="BIG_LOOP" -->
             <!-- TMPL_IF name="number" -->
-                <a href="JavaScript:active(<!-- TMPL_VAR name="number"-->)" class="tab_inactive" id="link<!-- TMPL_VAR name="number"-->"><!-- TMPL_VAR name="number"--></a>
+                <a href="javascript:active(<!-- TMPL_VAR name="number"-->)" class="tab_inactive" id="link<!-- TMPL_VAR name="number"-->"><!-- TMPL_VAR name="number"--></a>
             <!-- TMPL_ELSE -->
-                <a href="JavaScript:active(<!-- TMPL_VAR name="number"-->)" class="tab_active" id="link<!-- TMPL_VAR name="number"-->"><!-- TMPL_VAR name="number"--></a>
+                <a href="javascript:active(<!-- TMPL_VAR name="number"-->)" class="tab_active" id="link<!-- TMPL_VAR name="number"-->"><!-- TMPL_VAR name="number"--></a>
             <!-- /TMPL_IF -->
         <!--  /TMPL_LOOP -->
 	</div>
@@ -78,23 +78,21 @@
                 <span title="<!-- TMPL_VAR NAME="tag_lib" -->"><!-- TMPL_VAR NAME="tag" --></span>
                 <!-- TMPL_IF NAME="fixedfield" -->
 	                <input tabindex="1"
-                               class="indicator"
+                               class="indicator flat"
                                type="text"
                                style="display:none;"
                                name="tag_<!-- TMPL_VAR NAME="tag" -->_indicator_<!-- TMPL_VAR NAME='index'-->"
                                size="2"
                                maxlength="2"
-                               value="<!-- TMPL_VAR NAME="indicator" -->"
-                               class="flat" />
+                               value="<!-- TMPL_VAR NAME="indicator" -->" />
                 <!-- TMPL_ELSE -->
         	        <input tabindex="1"
-                               class="indicator"
+                               class="indicator flat"
                                type="text"
                                name="tag_<!-- TMPL_VAR NAME="tag" -->_indicator_<!-- TMPL_VAR NAME='index'-->"
                                size="2"
                                maxlength="2"
-                               value="<!-- TMPL_VAR NAME="indicator" -->"
-                               class="flat" />
+                               value="<!-- TMPL_VAR NAME="indicator" -->" />
                 <!-- /TMPL_IF --> -
             <!-- TMPL_ELSE -->
                 <!-- TMPL_IF NAME="fixedfield" -->
@@ -129,7 +127,7 @@
                 <!-- /TMPL_UNLESS --> 
                 
                 <!-- TMPL_UNLESS name="hide_marc" -->
-                    <img class="buttonUp" <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> src="<!-- TMPL_VAR NAME="themelang" -->/images/up.png" onclick="upSubfield('subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='subfield' -->')" />
+                    <img class="buttonUp" <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> src="<!-- TMPL_VAR NAME="themelang" -->/images/up.png" onclick="upSubfield('subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='subfield' -->')" alt="" />
                         <input title="<!-- TMPL_VAR NAME='marc_lib_plain' -->"
                             style=" <!-- TMPL_IF NAME="fixedfield" -->display:none; <!-- /TMPL_IF -->border:0;" type="text"
                             name="tag_<!-- TMPL_VAR NAME='tag'-->_code_<!--  TMPL_VAR NAME='subfield'-->_<!-- TMPL_VAR NAME='index'-->_<!-- TMPL_VAR NAME='index_subfield'-->"
@@ -596,5 +594,9 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ?
 }
 
 </script>
+</div>
+</div>
+</div>
 
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl
index fac1b0f1dd..45a691c8bf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl
@@ -1,8 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Cataloguing</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-catalogue.inc" -->
 
 	<h1>Koha &rsaquo; Catalogue Maintenance</h1>
@@ -164,4 +163,9 @@
     document.search.q.focus();
 </script>
 
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem-nomarc.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem-nomarc.tmpl
index 53c837f99c..6009738523 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem-nomarc.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem-nomarc.tmpl
@@ -1,6 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Cataloging &rsaquo; Add Items</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 
 <!-- TMPL_IF NAME="NOBARCODE" -->
 You must give the item a barcode
@@ -111,4 +112,9 @@ Group:</caption>
 </table>
 <input type="submit" name="newgroup" value="Add New Item to New Group" />
 </form>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl
index 066198330c..82e7f4b1c9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl
@@ -1,8 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Cataloging &rsaquo; Items for Bibliographic Record <!-- TMPL_VAR name="biblionumber" --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-catalogue.inc" -->
 
 
@@ -128,4 +127,9 @@ function confirm_deletion(biblionumber,itemnumber) {
     }
 }
 </script>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/400.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/400.tmpl
index 146882f1ed..ed9ae8d58c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/400.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/400.tmpl
@@ -1,10 +1,13 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Error</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
-
-<div id="main">
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
     <h1>An Error has Occurred!</h1>
     <h2>Error 400</h2>
     <ul>
@@ -13,6 +16,9 @@
     <li>Use top menu bar to navigate to another part of Koha.</li>
     </ul>
 </div>
+</div>
+</div>
 
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/401.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/401.tmpl
index 5169d79e66..929cc8c5b3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/401.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/401.tmpl
@@ -1,10 +1,13 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Error</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
-
-<div id="main">
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
     <h1>An Error has Occurred!</h1>
     <h2>Error 401</h2>
     <ul>
@@ -13,6 +16,9 @@
         <li>Use top menu bar to navigate to another part of Koha.</li>
     </ul>
 </div>
+</div>
+</div>
 
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/402.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/402.tmpl
index d817c8fd63..c0e7587701 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/402.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/402.tmpl
@@ -1,10 +1,14 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Error</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
 
-<div id="main">
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
     <h1>An Error has Occurred!</h1>
     <h2>Error 402</h2>
     <ul>
@@ -13,6 +17,9 @@
         <li>Use top menu bar to navigate to another part of Koha.</li>
     </ul>
 </div>
+</div>
+</div>
 
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/403.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/403.tmpl
index 80fab4cd9e..16f94682c7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/403.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/403.tmpl
@@ -1,10 +1,14 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Error</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
 
-<div id="main">
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
     <h1>An Error has Occurred!</h1>
     <h2>Error 403</h2>
     <ul>
@@ -13,6 +17,9 @@
     <li>Use top menu bar to navigate to another part of Koha.</li>
     </ul>
 </div>
+</div>
+</div>
 
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/404.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/404.tmpl
index 14278d93e1..d95de39f0f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/404.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/404.tmpl
@@ -1,10 +1,14 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Error</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
 
-<div id="main">
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
     <h1>An Error has Occurred!</h1>
     <h2>Error 404</h2>
     <ul>
@@ -13,6 +17,9 @@
         <li>Use top menu bar to navigate to another part of Koha.</li>
     </ul>
 </div>
+</div>
+</div>
 
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/405.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/405.tmpl
index e73cd32087..b89d83a3e3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/405.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/405.tmpl
@@ -1,10 +1,13 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Error</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
-
-<div id="main">
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
     <h1>An Error has Occurred!</h1>
     <h2>Error 405</h2>
     <ul>
@@ -13,6 +16,9 @@
         <li>Use top menu bar to navigate to another part of Koha.</li>
     </ul>
 </div>
+</div>
+</div>
 
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/500.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/500.tmpl
index c99e8cf822..923d1f9157 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/500.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/500.tmpl
@@ -1,9 +1,13 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Error</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<div id="main">
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
     <h1>An Error has Occurred!</h1>
     <h2>Error 500</h2>
     <ul>
@@ -12,5 +16,8 @@
         <li>Use top menu bar to navigate to another part of Koha.</li>
     </ul>
 </div>
+</div>
+</div>
 
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl
index 5150774a86..e112b1b626 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl
@@ -1,25 +1,35 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha staff client</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<div id="main">
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+	
     <h1>Welcome to Koha</h1>
     
         <!-- TMPL_IF name="koha_news_count" -->
-            <p><!-- TMPL_VAR name="koha_news_count" --> recent news</p>
+            <p><!-- TMPL_VAR name="koha_news_count" --> recent news item(s)</p>
             <table>
             <!-- TMPL_LOOP name="koha_news" -->
                 <tr>
                 <th>
                     on <!-- TMPL_VAR name="newdate" -->, <!-- TMPL_VAR name="title" -->
                 </th>
+				</tr>
                 <tr><td>
                     <p><!-- TMPL_VAR name="new" --></p>
                 </td></tr>
             <!-- /TMPL_LOOP -->
             </table>
         <!-- /TMPL_IF -->
+
+</div>
+</div>
 </div>
 
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl
index 3f439bbfa3..5426f28337 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl
@@ -1,7 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Reports</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!--TMPL_INCLUDE NAME="menus.inc" --><!-- TMPL_INCLUDE NAME="menu-reports.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" --><!-- TMPL_INCLUDE NAME="menu-reports.inc" -->
 <!-- Additions to enable Calendar system -->
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css" />
 <!-- End of additions --><!-- Additions to enable Calendar system -->
@@ -10,6 +10,11 @@
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-setup.js"></script>
 <!-- End of additions -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
 
 <!-- TMPL_IF NAME="do_it" -->
 	<!-- TMPL_LOOP NAME="mainloop" -->
@@ -273,5 +278,9 @@
 	<input type="hidden" name="do_it" value="1" />
 	</form>
 <!-- /TMPL_IF -->
+</div>
+</div>
+</div>
 
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl
index 82fce8fa3d..b502cefcc6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl
@@ -1,7 +1,10 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Reports</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!--TMPL_INCLUDE NAME="menus.inc" --><!-- TMPL_INCLUDE NAME="menu-reports.inc"-->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
+
+<!-- TMPL_INCLUDE NAME="menu-reports.inc"-->
+
 <!-- Additions to enable Calendar system -->
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css" />
 <!-- End of additions --><!-- Additions to enable Calendar system -->
@@ -10,6 +13,11 @@
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-setup.js"></script>
 <!-- End of additions -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
 
 <!-- TMPL_IF NAME="do_it" -->
 <script language="JavaScript" type="text/javascript">
@@ -17,6 +25,8 @@ function Dopop(link) {
 	newin=window.open(link,'width=500,height=400,toolbar=false,scrollbars=yes');
 }
 </script>
+
+
 	<!-- TMPL_LOOP NAME="mainloop" -->
 		<h1>Top <!-- TMPL_VAR NAME="limit"--> List patrons for Checkouts</h1>
 		<!-- TMPL_IF NAME="loopfilter"-->
@@ -74,7 +84,7 @@ function Dopop(link) {
 			<tr>
 				<td>
 					<select name="Limit">
-						<option value ="5" checked="checked"> 5</option>
+						<option value ="5" selected="selected"> 5</option>
 						<option value ="10">10</option>
 						<option value ="15">15</option>
 						<option value ="20">20</option>
@@ -86,7 +96,7 @@ function Dopop(link) {
 				</td>
 				<td>
 					<select name="Criteria">
-						<option value ="" checked="checked">None</option>
+						<option value ="" selected="selected">None</option>
 						<option value ="issuingbranch">Branch</option>
 						<option value ="categorycode">Categorycode</option>
 						<option value ="itemtype">Itemtype</option>
@@ -103,7 +113,7 @@ function Dopop(link) {
 				<td>&nbsp;</td>
 				<td>Issue date</td>
 				<td> From <input type="text" readonly="readonly" size="10" id="from" name="Filter" />
-							<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" border="0" hspace="0" vspace="0" id="openCalendarFrom" style="cursor: pointer;" valign="top">
+							<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" border="0" id="openCalendarFrom" style="cursor: pointer;" valign="top" />
 								<script language="JavaScript" type="text/javascript">
 									function validate1(date) {
 										var day = date.getDate();
@@ -132,7 +142,7 @@ function Dopop(link) {
 									);
 								</script>
 					To <input readonly="readonly" size="10" id="to" name="Filter" value="" type="text" />
-						<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" valign="top" border="0" hspace="0" vspace="0">
+						<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" alt="" border="0" />
 							<script type="text/javascript">
 								function validate2(date) {
 									var day = date.getDate();
@@ -167,7 +177,7 @@ function Dopop(link) {
 				<td> &nbsp;</td>
 				<td>Returns</td>
 				<td > From <input type="text" readonly="readonly" size="10" id="fromRO" name="Filter" />
-							<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" border="0" hspace="0" vspace="0" id="openCalendarFromRO" style="cursor: pointer;" valign="top">
+							<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" border="0" id="openCalendarFromRO" style="cursor: pointer;" alt="" />
 								<script language="JavaScript" type="text/javascript">
 									function validate1(date) {
 										var day = date.getDate();
@@ -196,7 +206,7 @@ function Dopop(link) {
 									);
 								</script>
 					To <input type="text" readonly="readonly" size="10" id="toRO" name="Filter" value="" />
-						<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="openCalendarToRO" style="cursor: pointer;" valign="top" border="0" hspace="0" vspace="0">
+						<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="openCalendarToRO" style="cursor: pointer;" alt="" border="0" />
 							<script type="text/javascript">
 								function validate2(date) {
 									var day = date.getDate();
@@ -272,13 +282,15 @@ function Dopop(link) {
 		<input type="radio" name="output" value="file" /> To file <input type="text" name="basename" value="Export" /> into an application  
 		<!-- TMPL_VAR NAME="CGIextChoice" -->
 		<!-- TMPL_VAR NAME="CGIsepChoice" -->
-	</p>
-	
-	<p>
+
 	<input type="submit" value="OK" />
 	<input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->" />
 	<input type="hidden" name="do_it" value="1" />
 	</form>
 <!-- /TMPL_IF -->
+</div>
+</div>
+</div>
 
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl
index 652a679319..ba5259fcb4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl
@@ -1,7 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Reports</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!--TMPL_INCLUDE NAME="menus.inc" --><!-- TMPL_INCLUDE NAME="menu-reports.inc"-->
+<!-- TMPL_INCLUDE NAME="header.inc" --><!-- TMPL_INCLUDE NAME="menu-reports.inc"-->
 <!-- Additions to enable Calendar system -->
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css" />
 <!-- End of additions --><!-- Additions to enable Calendar system -->
@@ -10,6 +10,11 @@
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-setup.js"></script>
 <!-- End of additions -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
 
 <!-- TMPL_IF NAME="do_it" -->
     <!-- TMPL_LOOP NAME="mainloop" -->
@@ -116,5 +121,9 @@
     <input type="hidden" name="do_it" value="1" />
     </form>
 <!-- /TMPL_IF -->
+</div>
+</div>
+</div>
 
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl
index cd68d20e86..b3fd9a503a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl
@@ -1,7 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Reports</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!--TMPL_INCLUDE NAME="menus.inc" --><!-- TMPL_INCLUDE NAME="menu-reports.inc"-->
+<!-- TMPL_INCLUDE NAME="header.inc" --><!-- TMPL_INCLUDE NAME="menu-reports.inc"-->
 <!-- Additions to enable Calendar system -->
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css" />
 <!-- End of additions --><!-- Additions to enable Calendar system -->
@@ -10,6 +10,11 @@
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-setup.js"></script>
 <!-- End of additions -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
 
 <!-- TMPL_IF NAME="do_it" -->
 	<!-- TMPL_LOOP NAME="mainloop" -->
@@ -234,5 +239,9 @@
 	<input type="hidden" name="do_it" value="1" />
 	</form>
 <!-- /TMPL_IF -->
+</div>
+</div>
+</div>
 
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl
index 82e622c390..45d534c25c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl
@@ -1,11 +1,9 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Reports</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-reports.inc"-->
 
-<!--TMPL_INCLUDE NAME="menus.inc" --><!-- TMPL_INCLUDE NAME="menu-reports.inc"-->
-
-
-<!-- TMPL_IF NAME="do_it" -->
 <!-- Additions to enable Calendar system -->
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css" />
 <!-- End of additions --><!-- Additions to enable Calendar system -->
@@ -13,11 +11,21 @@
 <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 -->
+
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
+<!-- TMPL_IF NAME="do_it" -->
+
 <script language="JavaScript" type="text/javascript">
 function Dopop(link) {
 	newin=window.open(link,'width=500,height=400,toolbar=false,scrollbars=yes');
 }
 </script>
+
 	<!-- TMPL_LOOP NAME="mainloop" -->
 		<h1>Top <!-- TMPL_VAR NAME="limit"--> List On Catalogue Checkout </h1>
 		<!-- TMPL_IF NAME="loopfilter"-->
@@ -104,7 +112,7 @@ function Dopop(link) {
 				<td>&nbsp;</td>
 				<td>Issue date</td>
 				<td> From <input type="text" readonly="readonly" size="10" id="from" name="Filter" />
-							<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" border="0" hspace="0" vspace="0" id="openCalendarFrom" style="cursor: pointer;" valign="top">
+							<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" border="0" id="openCalendarFrom" style="cursor: pointer;" alt="" />
 								<script language="JavaScript" type="text/javascript">
 									function validate1(date) {
 										var day = date.getDate();
@@ -133,7 +141,7 @@ function Dopop(link) {
 									);
 								</script>
 					To <input readonly="readonly" size="10" id="to" name="Filter" value="" type="text" />
-						<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" valign="top" border="0" hspace="0" vspace="0">
+						<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" valign="top" border="0" alt="" />
 							<script type="text/javascript">
 								function validate2(date) {
 									var day = date.getDate();
@@ -168,7 +176,7 @@ function Dopop(link) {
 				<td> &nbsp;</td>
 				<td>Returns</td>
 				<td > From <input type="text" readonly="readonly" size="10" id="fromRO" name="Filter" />
-							<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" border="0" hspace="0" vspace="0" id="openCalendarFromRO" style="cursor: pointer;" valign="top">
+							<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" border="0" id="openCalendarFromRO" style="cursor: pointer;" alt="" />
 								<script language="JavaScript" type="text/javascript">
 									function validate1(date) {
 										var day = date.getDate();
@@ -197,7 +205,7 @@ function Dopop(link) {
 									);
 								</script>
 					To <input type="text" readonly="readonly" size="10" id="toRO" name="Filter" value="" />
-						<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="openCalendarToRO" style="cursor: pointer;" valign="top" border="0" hspace="0" vspace="0">
+						<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="openCalendarToRO" style="cursor: pointer;"  border="0" alt="" />
 							<script type="text/javascript">
 								function validate2(date) {
 									var day = date.getDate();
@@ -281,5 +289,9 @@ function Dopop(link) {
 	<input type="hidden" name="do_it" value="1" />
 	</form>
 <!-- /TMPL_IF -->
+</div>
+</div>
+</div>
 
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl
index 585145525d..010ced3991 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl
@@ -1,7 +1,10 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Reports</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!--TMPL_INCLUDE NAME="menus.inc" --><!-- TMPL_INCLUDE NAME="menu-reports.inc"-->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
+
+<!-- TMPL_INCLUDE NAME="menu-reports.inc"-->
+
 <!-- Additions to enable Calendar system -->
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css" />
 <!-- End of additions --><!-- Additions to enable Calendar system -->
@@ -10,6 +13,11 @@
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-setup.js"></script>
 <!-- End of additions -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
 
 <!-- TMPL_IF NAME="do_it" -->
 	<!-- TMPL_LOOP NAME="mainloop" -->
@@ -22,7 +30,7 @@
 		<!-- /TMPL_IF NAME="loopfilter"-->
 		
 		<table>
-			<tr >
+			<tr>
 				<th>Num/Items</th>
 				<!-- TMPL_LOOP NAME="loopcol" -->
 					<th><!-- TMPL_VAR NAME="coltitle" --></th>
@@ -99,11 +107,15 @@
 		<!-- TMPL_VAR NAME="CGIextChoice" -->
 		<!-- TMPL_VAR NAME="CGIsepChoice" -->
 	
-	<p>
 	<input type="submit" value="OK" />
 	<input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->" />
 	<input type="hidden" name="do_it" value="1" />
 	</form>
 <!-- /TMPL_IF -->
 
-<!-- TMPL_INCLUDE NAME="reports-bottom.inc" -->
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl
index 49b89fa0fe..46a224916c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl
@@ -1,7 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Reports</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!--TMPL_INCLUDE NAME="menus.inc" --><!-- TMPL_INCLUDE NAME="menu-reports.inc"-->
+<!-- TMPL_INCLUDE NAME="header.inc" --><!-- TMPL_INCLUDE NAME="menu-reports.inc"-->
 <!-- Additions to enable Calendar system -->
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css" />
 <!-- End of additions --><!-- Additions to enable Calendar system -->
@@ -10,6 +10,11 @@
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-setup.js"></script>
 <!-- End of additions -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
 
 <!-- TMPL_IF NAME="do_it" -->
 	<!-- TMPL_LOOP NAME="mainloop" -->
@@ -189,5 +194,9 @@
 	<input type="hidden" name="do_it" value="1" />
 	</form>
 <!-- /TMPL_IF -->
+</div>
+</div>
+</div>
 
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/inventory.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/inventory.tmpl
index a4b80ab847..839521e4de 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/inventory.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/inventory.tmpl
@@ -1,7 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Reports</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!--TMPL_INCLUDE NAME="menus.inc" --><!-- TMPL_INCLUDE NAME="menu-reports.inc"-->
+<!-- TMPL_INCLUDE NAME="header.inc" --><!-- TMPL_INCLUDE NAME="menu-reports.inc"-->
 <!-- Additions to enable Calendar system -->
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css" />
 <!-- End of additions --><!-- Additions to enable Calendar system -->
@@ -10,6 +10,12 @@
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-setup.js"></script>
 <!-- End of additions -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 	<h1>Inventory/Stocktaking</h1>
 	<form method="post">
 		<h2>Select items you want to check</h2>
@@ -91,5 +97,9 @@
 		<input type="submit" value="&gt;&gt;&gt;" />
 	</form>
 	<!-- /TMPL_IF -->
+</div>
+</div>
+</div>
 
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl
index a4a9ec84d7..ff498ef62c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl
@@ -1,7 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Reports</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!--TMPL_INCLUDE NAME="menus.inc" --><!-- TMPL_INCLUDE NAME="menu-reports.inc"-->
+<!-- TMPL_INCLUDE NAME="header.inc" --><!-- TMPL_INCLUDE NAME="menu-reports.inc"-->
 <!-- Additions to enable Calendar system -->
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css" />
 <!-- End of additions --><!-- Additions to enable Calendar system -->
@@ -10,6 +10,11 @@
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-setup.js"></script>
 <!-- End of additions -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
 
 <!-- TMPL_IF NAME="do_it" -->
 	<!-- TMPL_LOOP NAME="mainloop" -->
@@ -281,5 +286,9 @@
 	<input type="hidden" name="do_it" value="1" />
 	</form>
 <!-- /TMPL_IF -->
+</div>
+</div>
+</div>
 
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_by_borrower_category.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_by_borrower_category.tmpl
index 51dd0906f4..929175b563 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_by_borrower_category.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_by_borrower_category.tmpl
@@ -1,7 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Reports</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!--TMPL_INCLUDE NAME="menus.inc" --><!-- TMPL_INCLUDE NAME="menu-reports.inc"-->
+<!-- TMPL_INCLUDE NAME="header.inc" --><!-- TMPL_INCLUDE NAME="menu-reports.inc"-->
 <!-- Additions to enable Calendar system -->
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css" />
 <!-- End of additions --><!-- Additions to enable Calendar system -->
@@ -10,6 +10,12 @@
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-setup.js"></script>
 <!-- End of additions -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <!-- TMPL_IF NAME="do_it" -->
 <!-- TMPL_LOOP NAME="mainloop" -->
 	<h1>Checkouts by patron category <!--TMPL_IF NAME="borrower_category" --> for category = <!-- TMPL_VAR NAME="borrower_category" --><!-- /TMPL_IF --></h1>
@@ -56,5 +62,9 @@
 		<input type="hidden" name="do_it" value="1" />
 	</form>
 <!-- /TMPL_IF -->
+</div>
+</div>
+</div>
 
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl
index 71cd59534d..5bb91f2b04 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl
@@ -1,7 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Reports</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!--TMPL_INCLUDE NAME="menus.inc" --><!-- TMPL_INCLUDE NAME="menu-reports.inc"-->
+<!-- TMPL_INCLUDE NAME="header.inc" --><!-- TMPL_INCLUDE NAME="menu-reports.inc"-->
 <!-- Additions to enable Calendar system -->
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css" />
 <!-- End of additions --><!-- Additions to enable Calendar system -->
@@ -10,6 +10,11 @@
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-setup.js"></script>
 <!-- End of additions -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
 
 <!-- TMPL_IF NAME="do_it" -->
     <!-- TMPL_LOOP NAME="mainloop" -->
@@ -238,5 +243,9 @@
     <input type="hidden" name="do_it" value="1" />
     </form>
 <!-- /TMPL_IF -->
+</div>
+</div>
+</div>
 
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tmpl
index 28a5935e26..1a808d20eb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tmpl
@@ -1,7 +1,9 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Reports</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!--TMPL_INCLUDE NAME="menus.inc" --><!-- TMPL_INCLUDE NAME="menu-reports.inc"-->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
+
+<!-- TMPL_INCLUDE NAME="menu-reports.inc"-->
 <!-- Additions to enable Calendar system -->
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css" />
 <!-- End of additions --><!-- Additions to enable Calendar system -->
@@ -10,6 +12,12 @@
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-setup.js"></script>
 <!-- End of additions -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <!-- TMPL_IF NAME="do_it" -->
 <!-- TMPL_LOOP NAME="mainloop" -->
 	<h1>Koha : Reports on itemtypes <!--TMPL_IF NAME="branch" --> for branch = <!-- TMPL_VAR NAME="branch" --><!-- /TMPL_IF --></h1>
@@ -38,5 +46,9 @@
 		<input type="hidden" name="do_it" value="1" />
 	</form>
 <!-- /TMPL_IF -->
+</div>
+</div>
+</div>
 
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl
index ae9d9df9e2..766af108bd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl
@@ -1,8 +1,10 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Reports</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc"-->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
+
 <!-- TMPL_INCLUDE NAME="menu-reports.inc"-->
+
 <!-- Additions to enable Calendar system -->
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css" />
 <!-- End of additions --><!-- Additions to enable Calendar system -->
@@ -10,7 +12,12 @@
 <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 -->
-<!-- ------------------------MAIN BODY OF PAGE------------------------ -->
+
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
 
 <h1>Reports</h1>
 
@@ -38,12 +45,14 @@
 	<h2>Other</h2>
 	<ul>
 		<li><a href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Catalogue by itemtype</a></li>
-	</ul>
-	<ul>
 		<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>
 
+</div>
+</div>
+</div>
 
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reservereport.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reservereport.tmpl
index 7928c7fc69..67c79709a7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reservereport.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reservereport.tmpl
@@ -1,6 +1,13 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Hold Report &rsaquo; All Holds</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
+
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
 
 <table>
 	<tr><th>Name</th><th>Hold Date</th><th>Title</th><th>Class</th></tr>
@@ -23,5 +30,9 @@
 </table>
 <p><!-- TMPL_VAR Name="count" --></p>
 
+</div>
+</div>
+</div>
 
-<!-- TMPL_INCLUDE Name="intranet-bottom.inc" -->
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tmpl
index 246d9a961e..65b629e94f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tmpl
@@ -1,10 +1,15 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Serials &rsaquo; Select Supplier</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
+
+<div id="doc" class="yui-t7">
+   <div id="bd">
+	<div class="yui-g">
+
 <h1>Supplier Search Results</h1>
 <h2>You searched on <b>supplier <!-- TMPL_VAR name="supplier" -->,</b> <!-- TMPL_VAR name="count" --> results found</h2>
 
-<div class="searchresults">
 <!-- TMPL_IF NAME="loop_suppliers" -->
 <table>
 	<tr>
@@ -14,14 +19,13 @@
 	<!-- TMPL_LOOP name="loop_suppliers" -->
 		<tr>
 			<td><!-- TMPL_VAR name="name" --></td>
-			<td><a href="#" onclick="GetIt(<!-- TMPL_VAR NAME="aqbooksellerid" -->,'<!--  TMPL_VAR escape="URL" NAME="name" -->')">Get It !</td>
+			<td><a href="#" onclick="GetIt(<!-- TMPL_VAR NAME="aqbooksellerid" -->,'<!--  TMPL_VAR escape="URL" NAME="name" -->')">Get It !</a></td>
 		</tr>
 	<!-- /TMPL_LOOP -->
 </table>
 <!-- /TMPL_IF -->
-    <br />
-    <a href="javascript:back();">Perform a new search</a>
-</div>
+
+    <p><a href="javascript:back();">Perform a new search</a></p>
 
 <script type="text/javascript" language="Javascript">
 
@@ -33,3 +37,8 @@ function GetIt(aqbooksellerid,name)
 }
 </script>
 
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search.tmpl
index 398396e783..8347a75563 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search.tmpl
@@ -1,6 +1,11 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Serials &rsaquo; Search for Supplier</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
+
+<div id="doc" class="yui-t7">
+   <div id="bd">
+	<div class="yui-g">
 
 <script language="Javascript">
 
@@ -15,6 +20,12 @@ function GetIt(aqbooksellerid,name)
 <h1>Search supplier for serial subscription</h1>
     <form action="/cgi-bin/koha/serials/acqui-search-result.pl" method="post">
         <label for="text">Supplier name : </label>
-        <input id="text" type="text"  size="25"   name="supplier">
-        <input type="submit" class="button serial" value="OK">
+        <input id="text" type="text"  size="25"   name="supplier" />
+        <input type="submit" class="button serial" value="OK" />
     </form>
+
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tmpl
index 993bf62921..dad4c4f08a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tmpl
@@ -1,6 +1,14 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Serials Expiration</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-serials.inc" -->
+
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
 
 <!-- Additions to enable Calendar system -->
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css" />
@@ -9,20 +17,14 @@
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-setup.js"></script>
 <!-- End of additions -->
 
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-serials.inc" -->
-
 <h1>Check expiration</h1>
 
 <fieldset>
     <legend>Select record which will expire</legend>
     
-    <form name="f"
-          action="/cgi-bin/koha/serials/checkexpiration.pl"
-          method="post"
-          onsubmit="return CheckForm(this);">
+    <form name="f" action="/cgi-bin/koha/serials/checkexpiration.pl" method="post" onsubmit="return CheckForm(this);">
          
-        <label for="title">Filter on title&nbsp;</label>
+        <label for="title">Filter on title</label>
         <input id="title" type="texte" name="title" size="15" value="<!--TMPL_VAR NAME="title"-->" />
         <br />
         <label for="issn">Filter on ISSN</label>
@@ -54,8 +56,7 @@
     <!-- /TMPL_IF -->
         will expirate bebore <b><!-- TMPL_VAR NAME="date" --></b>
 </p>
-<div class="searchresults">
-    <table>
+<table>
         <tr>
             <th>
                 issn
@@ -117,7 +118,6 @@
         </tr>
     <!-- /TMPL_LOOP -->
     </table>
-</div>
 <!-- /TMPL_IF -->
 
 <script type="text/javascript" language="JavaScript">
@@ -142,4 +142,9 @@
 </script>
 
 
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl
index 5fddac6238..e15e497682 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl
@@ -2,8 +2,7 @@
     <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
     <title>Koha &rsaquo; Subscription edit</title>
     <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-    
-    <!-- TMPL_INCLUDE NAME="menus.inc" -->
+    <!-- TMPL_INCLUDE NAME="header.inc" -->
     <!--TMPL_INCLUDE NAME="menu-serials.inc" -->
     
     <script type="text/javascript">
@@ -17,7 +16,6 @@
         document.claims.submit();
     }
     </script>
-    <div id="mainbloc">
 <!-- TMPL_ELSE -->
     <!-- TMPL_INCLUDE NAME="popup-top.inc" -->
     <div class="popup-block">
@@ -104,8 +102,8 @@
 name="supplierid" -->&amp;op=preview" onclick="popup(<!-- TMPL_VAR
 name="supplierid" -->,''); return false" class="button">Supplier Group Claim Letter</a></p> -->
         <!-- /TMPL_IF -->
-<p><br />
-<!--TMPL_IF Name="letter--">
+
+<!--TMPL_IF Name="letter" -->
                 <input type="submit" name="submit" class="button" value="Send letter" />
             <!--/TMPL_IF-->
         </form>
@@ -165,11 +163,10 @@ name="supplierid" -->,''); return false" class="button">Supplier Group Claim Let
             <!-- /TMPL_LOOP -->
         </table>
         <!-- /TMPL_IF -->
-<br />
+
 <p class="noprint"><a href="javascript:window.print()" class="button">Print</a> &nbsp; <a href="javascript:window.close()" class="button">Close</a></p>
 <!-- /TMPL_UNLESS -->
 
-</div>
 <script type="text/javascript">
 <!--
 
@@ -179,7 +176,13 @@ function popup(supplierid,serialid){
 //-->
 </script>
 <!-- TMPL_UNLESS NAME="preview" -->
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+
 <!-- TMPL_ELSE -->
 <!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
 <!-- /TMPL_UNLESS -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/distributedto.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/distributedto.tmpl
index 597e449edb..52042c6aeb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/distributedto.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/distributedto.tmpl
@@ -1,8 +1,15 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Serials &rsaquo; Select Supplier</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!--TMPL_INCLUDE NAME="menu-serials.inc" -->
-<div id="mainbloc">
+
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 	<h1>Select borrowers or enter manually the names</h1>
 	<p>
 		<form action="/cgi-bin/koha/serials/distributedto.pl" method="post" name="Aform">
@@ -19,7 +26,7 @@
 				</p>
 				<p>
 					<!-- TMPL_IF name="save" -->
-						saved</p><p>
+						saved</p>
 					<!-- /TMPL_IF -->
 					<input type="hidden" name="SaveList" value="0">
 					<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->">
@@ -85,4 +92,9 @@
 		}
 	</script>
 </div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tmpl
index 0ea66e1c59..e08f590426 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tmpl
@@ -1,12 +1,15 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Search Results</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<div id="mainbloc">
-    <h1>Search results</h1>
+<div id="doc" class="yui-t7">
+   <div id="bd">
+	<div class="yui-g">
+
+<h1>Search results</h1>
 <!-- TMPL_IF NAME="total"-->
-<div class="searchresults">
-    <table>
+<table>
     <tr>
        <th>Title</th>
        <th>Author</th>
@@ -34,7 +37,6 @@
         </tr>
     <!-- /TMPL_LOOP -->
     </table>
-</div>
 <!-- TMPL_ELSE -->
 No result found for <b><!-- TMPL_VAR NAME="query" --></b>
 <!-- /TMPL_IF-->
@@ -53,3 +55,9 @@ function GetIt(bibno,title)
     window.close();
 }
 </script>
+
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tmpl
index f6df55f382..b21754c38b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tmpl
@@ -1,12 +1,16 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Serials</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!--TMPL_INCLUDE NAME="menu-serials.inc" -->
 
-<div id="mainbloc">
-<h1 class="bull">Preview Routing List</h1>
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
+<h1>Preview Routing List</h1>
 
 <form method="post" action="routing-preview.pl">
 <input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR NAME="subscriptionid" -->" />
@@ -14,7 +18,7 @@
 <p><b>Issue:</b> <!-- TMPL_VAR NAME="issue" --></p>
 
 <table border="0" cellspacing="0" cellpadding="0">
-<tr valign="top"><td style="padding-top: 5px;"><b>List Member:</b>&nbsp;</td>
+<tr><td style="padding-top: 5px;"><b>List Member:</b>&nbsp;</td>
     <td><table cellspacing="0" cellpadding="0" border="0" class="collapse">
         <tr><td class="cell-header">Name</td>
             <td class="cell-header">Location</td></tr>
@@ -23,8 +27,8 @@
             <td class="cell"><!-- TMPL_VAR NAME="location" --></td></tr>
 <!-- /TMPL_LOOP -->
         </table></td></tr>
-<tr valign="top"><td colspan="2">&nbsp;</td></tr>
-<tr valign="top"><td><b>Notes:</b></td>
+<tr><td colspan="2">&nbsp;</td></tr>
+<tr><td><b>Notes:</b></td>
     <td><!-- TMPL_VAR NAME="routingnotes" --></td></tr>
 </table>
 <p>
@@ -32,7 +36,6 @@
 <input type="submit" name="edit" class="button" value="Edit" />
 <input type="submit" name="delete" class="button" value="Delete" /></p>
 </form>
-</div>
 
 <script type="text/javascript">
 <!--
@@ -44,4 +47,9 @@ window.open(myurl,'PrintSlip','width=400,height=500,toolbar=no,scrollbars=yes');
 }
 //-->
 </script>
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl
index 8ba7aed608..187180c58d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl
@@ -1,10 +1,15 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Serials</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!--TMPL_INCLUDE NAME="menu-serials.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <script language="javascript" type="text/javascript">
 <!--
 
@@ -15,7 +20,6 @@ function reorder_item(sid,rid,rank){
 //-->
 </script>
 
-<div id="mainbloc">
 <!-- TMPL_IF NAME="op" -->
 <h1>Create Routing List</h1>
 <!-- TMPL_ELSE -->
@@ -39,7 +43,7 @@ function reorder_item(sid,rid,rank){
 
 <!-- TMPL_IF NAME="memberloop" -->
 <table border="0" cellspacing="0" cellpadding="0">
-<tr valign="top"><td style="padding-top:5px;"><b>List Member:</b>&nbsp;</td>
+<tr valign="top"><td style="padding-top:5px;"><b>List Member:</b></td>
     <td><table cellspacing="0" cellpadding="0" border="0" class="collapse">
         <tr><td class="cell-header">Name</td>
             <td class="cell-header">Location</td>
@@ -60,11 +64,11 @@ href="/cgi-bin/koha/serials/routing.pl?subscriptionid=<!-- TMPL_VAR NAME="subscr
 
 <!-- TMPL_ELSE -->
 <table border="0" cellspacing="0" cellpadding="0">
-<tr><td><b>List Member:&nbsp;</b></td>
+<tr><td><b>List Member:</b></td>
     <td><p><a onclick="search_member(<!-- TMPL_VAR NAME="subscriptionid"
 -->); return false" href="/cgi-bin/koha/serials/member-search.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->" class="button">Add List Member</a></p></td></tr>
 <!-- /TMPL_IF -->
-<tr><td valign="top" colspan="2">&nbsp;</td></tr>
+<tr><td valign="top" colspan="2"></td></tr>
 <tr><td valign="top"><b>Notes:</b></td>
     <td><textarea name="notes" rows="3" cols="50"><!-- TMPL_VAR NAME="routingnotes" --></textarea></td></tr>
 <tr><td></td>
@@ -80,4 +84,9 @@ function search_member(subscriptionid){
 }
 //-->
 </script>
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues.tmpl
index 482f0c1ce1..359ca69ddb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues.tmpl
@@ -1,10 +1,15 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Serials</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!--TMPL_INCLUDE NAME="menu-serials.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <h1>Subscription information for <!-- TMPL_VAR name="bibliotitle" --></h1>
 <div id="action">
     <a href="/cgi-bin/koha/serials/serials-home.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">Subscriptions</a>
@@ -52,25 +57,25 @@
         <!-- /TMPL_IF -->
         </b>
         <!--TMPL_IF name="arrival1" -->
-            on <b>monday</b>
+            on <b>Monday</b>
         <!-- /TMPL_IF -->
         <!--TMPL_IF name="arrival2" -->
-            on <b>tuesday</b>
+            on <b>Tuesday</b>
         <!-- /TMPL_IF -->
         <!--TMPL_IF name="arrival3" -->
-            on <b>wednesday</b>
+            on <b>Wednesday</b>
         <!-- /TMPL_IF -->
         <!--TMPL_IF name="arrival4" -->
-            on <b>thursday</b>
+            on <b>Thursday</b>
         <!-- /TMPL_IF -->
         <!--TMPL_IF name="arrival5" -->
-            on <b>friday</b>
+            on <b>Friday</b>
         <!-- /TMPL_IF -->
         <!--TMPL_IF name="arrival6" -->
-            on <b>saturday</b>
+            on <b>Saturday</b>
         <!-- /TMPL_IF -->
         <!--TMPL_IF name="arrival7" -->
-            on <b>sunday</b>
+            on <b>Sunday</b>
         <!-- /TMPL_IF -->
         for <b>
             <!-- TMPL_IF name="numberlength" --><!-- TMPL_VAR name="numberlength" --> issues<!-- /TMPL_IF -->
@@ -103,5 +108,10 @@
     </div>
     <!-- /TMPL_UNLESS -->
 <!-- /TMPL_LOOP -->
+
 </div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl
index 82770ee239..8c1d048109 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl
@@ -1,10 +1,14 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Serials</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!--TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!--TMPL_INCLUDE NAME="menu-serials.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
 
 <script language="JavaScript" type="text/javascript">
 showlayer('<!-- TMPL_VAR NAME="yearmax"-->');
@@ -64,7 +68,6 @@ function popup(subscriptionid) {
 <!-- /TMPL_UNLESS -->
 
 <!--TMPL_IF Name="subscriptions"-->
-<font size ="-2">
 <table>
 <!--TMPL_IF Name="onesubscription"-->
 <caption> Subscription Summary</caption>
@@ -158,7 +161,6 @@ function popup(subscriptionid) {
 </tr>
 <!--/TMPL_IF-->
 </table>
-</font>
 <!--/TMPL_IF -->
     <div class="tabsubs">
     <!-- TMPL_LOOP NAME="years" -->
@@ -250,11 +252,17 @@ function popup(subscriptionid) {
             </tr>
       <!-- /TMPL_LOOP -->
         </table>
-      <p><input type="submit" value="Edit serials"></p>
+      <p><input type="submit" value="Edit serials" /></p>
     </div>
     <!--/TMPL_LOOP -->
-  <input type="hidden" name="subscriptionid" value="<!--TMPL_VAR Name="subscriptionidlist"-->">
+  <input type="hidden" name="subscriptionid" value="<!--TMPL_VAR Name="subscriptionidlist"-->" />
 
 </form>
 
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl
index 290c900aaf..e43b1c6aa4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl
@@ -1,13 +1,17 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Serials</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!--TMPL_INCLUDE NAME="menu-serials.inc" -->
 
-<!--------------------------MAIN BODY OF PAGE-------------------------->
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <h1>Serial Edition <!-- TMPL_VAR name="bibliotitle" --></h1>
-<form method="post" name="f" action="serials-edit.pl" >
+<form method="post" name="f" action="serials-edit.pl">
 <!--onsubmit="return barcode_check()">-->
 <div id="action">
     <a href="serials-collection.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" title="serial Collection for <!--TMPL_VAR Name="bibliotitle"-->">Serial collection</a>
@@ -24,7 +28,7 @@
 Error : Barcode Not Unique For serialseq <!--TMPL_VAR Name="errserialseq"-->
 <!--/TMPL_IF -->
 
- <input type="hidden" name="op" value="serialchangestatus">
+ <input type="hidden" name="op" value="serialchangestatus" />
 	<table cellspacing="0" cellpadding="0" border="0" class="collapse">
 	<tr>
 		<th>
@@ -51,19 +55,19 @@ Error : Barcode Not Unique For serialseq <!--TMPL_VAR Name="errserialseq"-->
             <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
             <input type="hidden" name="itemcount" value="<!-- TMPL_VAR name="issuesatonce" -->" />
             <input type="hidden" name="user" value="<!-- TMPL_VAR name="librarian" -->" />
-            Issue <input type="text" name="serialseq" value="<!-- TMPL_VAR name="serialseq" -->" size="20" maxlength="100">
+            Issue <input type="text" name="serialseq" value="<!-- TMPL_VAR name="serialseq" -->" size="20" maxlength="100" />
         </td>
         <td>
-            <input type="text" name="publisheddate" value="<!-- TMPL_VAR name="publisheddate" -->" size="10" maxlength="15">
+            <input type="text" name="publisheddate" value="<!-- TMPL_VAR name="publisheddate" -->" size="10" maxlength="15" />
         </td>
         <td>
-            <input type="text" name="planneddate" value="<!-- TMPL_VAR name="planneddate" -->" size="10" maxlength="15">
+            <input type="text" name="planneddate" value="<!-- TMPL_VAR name="planneddate" -->" size="10" maxlength="15" />
         </td>
         <td>
             <!--TMPL_IF name="editdisable"-->
               <select name="status" size="1" id="status<!-- TMPL_VAR NAME="num" -->" disabled="disabled">
             <!--TMPL_ELSE-->
-              <select name="status" size="1" id="status<!-- TMPL_VAR NAME="num" -->" onchange="javascript:if (this.value==2){unHideItems('items'+<!-- TMPL_VAR NAME="subscriptionid" -->+<!-- TMPL_VAR NAME="serialid" -->,'label<!-- TMPL_VAR NAME="subscriptionid" --><!--TMPL_VAR Name="serialid"-->')}" >
+              <select name="status" size="1" id="status<!-- TMPL_VAR NAME="num" -->" onchange="if (this.value==2){unHideItems('items'+<!-- TMPL_VAR NAME="subscriptionid" -->+<!-- TMPL_VAR NAME="serialid" -->,'label<!-- TMPL_VAR NAME="subscriptionid" --><!--TMPL_VAR Name="serialid"-->')}" >
             <!--/TMPL_IF-->
   <!--TMPL_IF name="status1" -->
                     <option value="1" selected="selected">Waited</option>
@@ -102,7 +106,7 @@ Error : Barcode Not Unique For serialseq <!--TMPL_VAR Name="errserialseq"-->
 
         </td>
         <td>
-            <input type="text" name="notes" value="<!-- TMPL_VAR name="sernotes" -->" size="20" maxlength="255">
+            <input type="text" name="notes" value="<!-- TMPL_VAR name="sernotes" -->" size="20" maxlength="255" />
         </td>
     </tr>
   <!--TMPL_UNLESS Name="subscriptionexpired"-->
@@ -156,16 +160,16 @@ Error : Barcode Not Unique For serialseq <!--TMPL_VAR Name="errserialseq"-->
             <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
             <input type="hidden" name="itemcount" value="<!-- TMPL_VAR name="issuesatonce" -->" />
             <input type="hidden" name="user" value="<!-- TMPL_VAR name="librarian" -->" />
-            <b>Subs. <!-- TMPL_VAR name="subscriptionid" --></b> New Issue <input type="text" name="serialseq" value="" size="20" maxlength="100" onchange="javascript:if (this.value!=''){unHideItems('items<!-- TMPL_VAR NAME="subscriptionid" --><!-- TMPL_VAR NAME="serialid" -->','label<!-- TMPL_VAR NAME="subscriptionid" --><!--TMPL_VAR Name="serialid"-->')} else {HideItems('items<!-- TMPL_VAR NAME="subscriptionid" --><!-- TMPL_VAR NAME="serialid" -->','label<!-- TMPL_VAR NAME="subscriptionid" --><!--TMPL_VAR Name="serialid"-->')}" />
+            <b>Subs. <!-- TMPL_VAR name="subscriptionid" --></b> New Issue <input type="text" name="serialseq" value="" size="20" maxlength="100" onchange="if (this.value!=''){unHideItems('items<!-- TMPL_VAR NAME="subscriptionid" --><!-- TMPL_VAR NAME="serialid" -->','label<!-- TMPL_VAR NAME="subscriptionid" --><!--TMPL_VAR Name="serialid"-->')} else {HideItems('items<!-- TMPL_VAR NAME="subscriptionid" --><!-- TMPL_VAR NAME="serialid" -->','label<!-- TMPL_VAR NAME="subscriptionid" --><!--TMPL_VAR Name="serialid"-->')}" />
         </td>
         <td>
-            <input type="text" name="publisheddate" value="<!-- TMPL_VAR name="publisheddate" -->" size="10" maxlength="15">
+            <input type="text" name="publisheddate" value="<!-- TMPL_VAR name="publisheddate" -->" size="10" maxlength="15" />
         </td>
         <td>
-            <input type="text" name="planneddate" value="<!-- TMPL_VAR name="planneddate" -->" size="10" maxlength="15">
+            <input type="text" name="planneddate" value="<!-- TMPL_VAR name="planneddate" -->" size="10" maxlength="15" />
         </td>
         <td>
-            <select name="status" size="1" id="status<!-- TMPL_VAR NAME="num" -->" >
+            <select name="status" size="1" id="status<!-- TMPL_VAR NAME="num" -->">
   <!--TMPL_IF name="status1" -->
                     <option value="1" selected="selected">Waited</option>
   <!-- /TMPL_IF -->
@@ -203,7 +207,7 @@ Error : Barcode Not Unique For serialseq <!--TMPL_VAR Name="errserialseq"-->
 
         </td>
         <td>
-            <input type="text" name="notes" value="" size="20" maxlength="255">
+            <input type="text" name="notes" value="" size="20" maxlength="255" />
         </td>
     </tr>
   <!--TMPL_IF Name="serialsadditems"-->
@@ -326,4 +330,9 @@ function HideItems(index,labelindex) {
 <!--/TMPL_IF>
 </script>
 
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl
index 18d39374ea..beb41cfc12 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl
@@ -1,13 +1,16 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Serials <!-- TMPL_VAR name="biblionumber" --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-serials.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
 
 <!--TMPL_IF Name="information"-->
-<div id="information">
 Serials updated :
 <table>
   <tr>
@@ -47,11 +50,9 @@ Serials updated :
   </tr>  
 <!--/TMPL_LOOP -->
 </table>
-</div>
 <!--/TMPL_IF-->
 <h1>Serials subscription</h1>
-<div id="serials_home">
-	<h2>Search existing subscription</h2>
+<h2>Search existing subscription</h2>
 <!-- TMPL_IF NAME="routing" -->
         <h3>Search for Serial Routing List</h3>
 <!-- /TMPL_IF -->
@@ -79,7 +80,7 @@ Serials updated :
             <!-- /TMPL_IF -->
             <input type="hidden" name="searched" value="1" />
             <td>
-                <input type="text" size="10" maxlength="11" name="ISSN_filter" value="<!-- TMPL_VAR name="ISSN_filter" -->" title="type ISSN here to filter subscription">
+                <input type="text" size="10" maxlength="11" name="ISSN_filter" value="<!-- TMPL_VAR name="ISSN_filter" -->" title="type ISSN here to filter subscription" />
             </td>
             <td>
                 <input type="text" size="40" maxlength="40" name="title_filter" value="<!-- TMPL_VAR name="title_filter" -->" title="type a title -complete or partial- to filter subscription" />
@@ -88,7 +89,7 @@ Serials updated :
                 &nbsp;
             </td>
             <td colspan="2">
-                <input type="submit" value="filter" class="button serial" title="set a filter on ISSN / title">
+                <input type="submit" value="filter" class="button serial" title="set a filter on ISSN / title" />
             </td>
         </tr>
         <!-- TMPL_IF NAME="done_searched"-->
@@ -166,5 +167,8 @@ Serials updated :
         </div>
     <!-- /TMPL_IF -->
 </div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+</div>
+</div>
 
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl
index 34834adcfc..b0872223a1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl
@@ -1,11 +1,15 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Serials</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!--TMPL_INCLUDE NAME="menu-serials.inc" -->
 
-<!--------------------------MAIN BODY OF PAGE-------------------------->
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <h1>Check In subscription for: <!-- TMPL_VAR name="bibliotitle" --></h1>
 <div id="action">
     <a href="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" title="detail of the subscription">Subscription Details</a>
@@ -333,4 +337,9 @@ function barcode_check(){
 }
 </script>
 
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl
index 7d1fe442e1..87d30dbcfa 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl
@@ -1,10 +1,15 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Serials</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!--TMPL_INCLUDE NAME="menu-serials.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <!-- Additions to enable Calendar system -->
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css" />
 <!-- End of additions -->
@@ -19,8 +24,8 @@
 <!--
 
 // the english words used in display purposes
-var text = new Array(_('Number'),_('Volume'),_('Issue'),_('Month'),_('Week'),_('Starting with:'),_('Rollover at:'),_('Choose Hemisphere:'),_('Northern'),_('Southern'),
-_('Autumn'),_('Winter'),_('Spring'),_('Summer'),_('Fall'),_('Season'),_('Year'));
+var text = new Array('Number','Volume','Issue','Month','Week','Starting with:','Rollover at:','Choose Hemisphere:','Northern','Southern',
+'Autumn','Winter','Spring','Summer','Fall','Season','Year');
 var is_season = 0;
 var is_hemisphere = 1;
 
@@ -44,7 +49,7 @@ var patternchoice = document.getElementById("numberpattern").value;
         document.f.lastvalue1.value=1;
         document.f.lastvalue2.value=1;
         document.f.lastvalue3.value=1;
-        document.f.numberingmethod.value=_('Vol {X}, No {Y}, Issue {Z}');
+        document.f.numberingmethod.value= 'Vol {X}, No {Y}, Issue {Z}';
         moreoptions(text[1],text[0],text[2]);
         display_table(0); // toggle info box on (1) or off (0)
         break;
@@ -64,7 +69,7 @@ var patternchoice = document.getElementById("numberpattern").value;
         document.f.lastvalue1.value=1;
         document.f.lastvalue2.value=1;
         document.f.lastvalue3.value='';
-        document.f.numberingmethod.value=_('Vol {X}, No {Y}');
+        document.f.numberingmethod.value= 'Vol {X}, No {Y}';
         moreoptions(text[1],text[0]);
         display_table(0);
         break;
@@ -84,7 +89,7 @@ var patternchoice = document.getElementById("numberpattern").value;
         document.f.lastvalue1.value=1;
         document.f.lastvalue2.value=1;
         document.f.lastvalue3.value='';
-        document.f.numberingmethod.value=_('Vol {X}, Issue {Y}');
+        document.f.numberingmethod.value= 'Vol {X}, Issue {Y}';
         moreoptions(text[1],text[2]);
         display_table(0);
         break;
@@ -104,7 +109,7 @@ var patternchoice = document.getElementById("numberpattern").value;
         document.f.lastvalue1.value=1;
         document.f.lastvalue2.value=1;
         document.f.lastvalue3.value='';
-        document.f.numberingmethod.value=_('No {X}, Issue {Y}');
+        document.f.numberingmethod.value= 'No {X}, Issue {Y}';
         moreoptions(text[0],text[2]);
         display_table(0);
         break;
@@ -127,7 +132,7 @@ var patternchoice = document.getElementById("numberpattern").value;
         document.f.lastvalue2.value='1';
         document.f.lastvalue3.value='';
         document.f.periodicity.value='8';
-        document.f.numberingmethod.value=_('{Y} {X}');
+        document.f.numberingmethod.value='{Y} {X}';
         moreoptions_seasons(text[15],sYear);
         display_table(0);
         is_season = 1;
@@ -156,7 +161,7 @@ var patternchoice = document.getElementById("numberpattern").value;
         document.f.lastvalue2.value='1';
         document.f.lastvalue3.value='';
         document.f.periodicity.value=1;
-        document.f.numberingmethod.value=_('{X}/{Y}');
+        document.f.numberingmethod.value='{X}/{Y}';
         display_table(0);
         break;
     default:
@@ -242,8 +247,8 @@ function moreoptions_daily_check(x) {
     var errortext='';
     if(periodicity == 1){
         document.getElementById("irregularity").innerHTML = '';
-        var daynames = new Array(_('Monday'),_('Tuesday'),_('Wednesday'),_('Thursday'),_('Friday'),_('Saturday'),_('Sunday'));
-        errortext =_("Please indicate which days of the week you <b>DO NOT<\/b> expect to receive issues.<br \/>");
+        var daynames = new Array('Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday');
+        errortext = "Please indicate which days of the week you <b>DO NOT<\/b> expect to receive issues.<br \/>";
         for(var j=0;j<daynames.length;j++){
             errortext +="<input type='checkbox' name='irregular' id='irregular"+(j+1)+"' value='"+(j+1)+"' />"+daynames[j]+" &nbsp; ";
         }
@@ -282,14 +287,14 @@ var textbox = '';
         textbox +="<\/tr>\n";
         if(y){
             textbox +="<tr><td>"+text[6]+"<\/td>";
-            textbox +="<td><a href='javascript:irregularity_check()'>"+_('Irregularity?')+"<\/a><\/td>\n";
+            textbox +="<td><a href='javascript:irregularity_check()'>"+'Irregularity?'+"<\/a><\/td>\n";
             textbox +="<td><input type='text' name='whenmorethantemp2' size='4' onkeyup='moreoptionsupdate(\"whenmorethan2\",1)'><\/td>\n";
             if(z){
                 textbox +="<td><input type='text' name='whenmorethantemp3' size='4' onkeyup='moreoptionsupdate(\"whenmorethan3\",1)'><\/td>\n";
             }
             textbox +="<\/tr>";
         } else {
-          textbox +="<tr> <td>"+_('issues expected')+"</td><td><input type='text' name='issuesexpectedtemp1' size='4' onkeyup='moreoptionsupdate(\"issuesexpected1\",0)'><br /><a href='javascript:irregularity_check()'>"+_('Irregularity?')+"</a></td></tr>";
+          textbox +="<tr> <td>"+'issues expected'+"</td><td><input type='text' name='issuesexpectedtemp1' size='4' onkeyup='moreoptionsupdate(\"issuesexpected1\",0)'><br /><a href='javascript:irregularity_check()'>"+_('Irregularity?')+"</a></td></tr>";
         }
         textbox +="<\/table>\n";
     }
@@ -352,7 +357,7 @@ var textbox = '';
         }
         textbox +="<\/select><\/td><\/tr>\n";
         textbox +="<tr><td>"+text[6]+"<\/td>";
-        textbox +="<td><a href='javascript:irregularity_check()'>"+_('Irregularity?')+"<\/a><\/td>\n";
+        textbox +="<td><a href='javascript:irregularity_check()'>"+'Irregularity?'+"<\/a><\/td>\n";
         textbox +="<td><input type='text' name='whenmorethantemp2' size='4' onkeyup='moreoptionsupdate(\"whenmorethan2\",1)'><\/td>\n";
                 textbox +="<\/tr><\/table>\n";
     }
@@ -372,7 +377,7 @@ function irregularity_check(){
     var error='';
     var toobig;
     var expected; 
-    var errortext = _("<b>Warning irregularity detected<\/b><br \/>");
+    var errortext = "<b>Warning irregularity detected<\/b><br \/>";
     switch(periodicity){
     case "12":
         if(rollover < 730) expected =730;
@@ -463,17 +468,17 @@ function irregularity_check(){
     }
     if(expected){
         if(expected == 365 || expected==730){
-            var daynames = new Array(_('Monday'),_('Tuesday'),_('Wednesday'),_('Thursday'),_('Friday'),_('Saturday'),_('Sunday'));
-            errortext += _("Please indicate which days of the week you <b>DO NOT<\/b> expect to receive issues.<br \/>");
+            var daynames = new Array('Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday');
+            errortext += "Please indicate which days of the week you <b>DO NOT<\/b> expect to receive issues.<br \/>";
             for(var j=0;j<daynames.length;j++){
-                errortext +="<input type='checkbox' name='irregular' id='irregular"+(j+1)+"' value='"+(j+1)+"' />"+daynames[j]+" &nbsp; ";
+                errortext +="<input type=\"checkbox\" name=\"irregular\" id=\"irregular"+(j+1)+"\" value=\""+(j+1)+"\" />"+daynames[j]+" &nbsp; ";
             }
             error=errortext;
         } else {
-            errortext +=expected+_(" issues expected ")+rollover+_(" were entered. <br \/>Please indicate which date(s) an issue is not expected<br \/>");
+            errortext +=expected+" issues expected "+rollover+" were entered. <br \/>Please indicate which date(s) an issue is not expected<br \/>";
             var count=0;
             for(var i=rollover;i<expected;i++){
-                errortext +="<select name='irregular' id='irregular"+count+"' onchange='display_example(expected)'>\n";
+                errortext +="<select name=\"irregular\" id=\"irregular"+count+"\" onchange=\"display_example(expected)\">\n";
                 errortext +=irregular_options(periodicity);
                 errortext +="<\/select>\n";
                 count++;
@@ -482,7 +487,7 @@ function irregularity_check(){
         }
     }
     if(toobig){
-        errortext +=expectedover+_(" issues expected ")+rollover+_(" were entered.<br \/> You seem to have indicated more issues per year than expected.");
+        errortext +=expectedover+" issues expected "+rollover+" were entered.<br \/> You seem to have indicated more issues per year than expected.";
         error=errortext;
     }
     if(error.length ==0){
@@ -498,8 +503,8 @@ function irregular_options(periodicity){
 <!-- TMPL_IF NAME="weekarrayjs" -->
     var weeks = new Array(<!-- TMPL_VAR NAME="weekarrayjs" -->); 
 <!-- /TMPL_IF -->
-    var months = new Array(_('January'),_('February'),_('March'),_('April'),_('May'),_('June'),_('July'),_('August'),_('September'),_('October'),_('November'),_('December'));
-    var seasons = new Array(_('Autumn'),_('Winter'),_('Spring'),_('Summer'),_('Fall'));
+    var months = new Array('January','February','March','April','May','June','July','August','September','October','November','December');
+    var seasons = new Array('Autumn','Winter','Spring','Summer','Fall');
     var errortext='';
     if(periodicity == 1) {
         expected = 366;
@@ -583,7 +588,7 @@ function display_example(expected){
     var whenmorethan3 = parseInt(document.f.whenmorethan3.value);
     var setto2 = parseInt(document.f.setto2.value);
     var setto3 = parseInt(document.f.setto3.value);
-    var displaytext = _('Based on the information<br \/>entered the Numbering Pattern<br \/>will look like this<br \/>\n');
+    var displaytext = "Based on the information<br \/>entered the Numbering Pattern<br \/>will look like this<br \/>\n";
     if(startfrom3>0){
         var count=startfrom3-1;
         var count2=startfrom2;
@@ -683,19 +688,17 @@ function check_input(e){
 <!-- TMPL_IF name="mod" -->
     <h1>Modify a subscription</h1>
     <form method="post" name="f">
-        <input type="hidden" name="op" value="modsubscription">
-        <input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->">
+        <input type="hidden" name="op" value="modsubscription" />
+        <input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" />
 <!-- TMPL_ELSE -->
     <h1>Add a subscription (Serial Holdings Record)</h1>
-    <form method="post" name="f">
-        <input type="hidden" name="op" value="addsubscription">
+    <form method="post" action="/cgi-bin/koha/serials/subscription-add.pl" name="f">
+        <input type="hidden" name="op" value="addsubscription" />
 <!-- /TMPL_IF -->
-<input type="hidden" name="user" value="<!-- TMPL_VAR name="loggedinusername" -->">
-<input type="hidden" name="irreg_check" value="0">
-<input type="hidden" name="issuesexpected1" value="0">
+<input type="hidden" name="user" value="<!-- TMPL_VAR name="loggedinusername" -->" />
+<input type="hidden" name="irreg_check" value="0" />
+<input type="hidden" name="issuesexpected1" value="0" />
 
-
-<div id="subscription_form">
     <h2>Subscription information for subscription #<!--TMPL_VAR name="subscriptionid"--></h2>
     <table>
         <tr>
@@ -704,12 +707,12 @@ function check_input(e){
         </tr>
         <tr>
             <td><label>Supplier:</label></td>
-            <td><input type="text" name="aqbooksellerid" value="<!-- TMPL_VAR name="aqbooksellerid" -->" size="8"> (<input type="text" name="aqbooksellername" value="<!-- TMPL_VAR name="aqbooksellername" -->" disabled="disabled" readonly="readonly" />) <a href="#" onclick="FindAcqui(f)">Search for a Supplier</a></td>
+            <td><input type="text" name="aqbooksellerid" value="<!-- TMPL_VAR name="aqbooksellerid" -->" size="8" /> (<input type="text" name="aqbooksellername" value="<!-- TMPL_VAR name="aqbooksellername" -->" disabled="disabled" readonly="readonly" />) <a href="#" onclick="FindAcqui(f)">Search for a Supplier</a></td>
         </tr>
         <tr>
             <td><label>Biblio</label></td>
             <td>
-                <input type="text" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" size="8"> 
+                <input type="text" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" size="8" /> 
                 (<input type="text" name="title" value="<!-- TMPL_VAR name="bibliotitle" -->" disabled="disabled" readonly="readonly" />)
                 <a href="#" onclick="Plugin(f)">Search for Biblio</a> <!--TMPL_UNLESS Name="mod"--> |
                 <a href="#" onclick="Create_biblio(f)">Create Biblio</a><!--/TMPL_UNLESS-->
@@ -717,7 +720,7 @@ function check_input(e){
         </tr>
         <tr>
             <td><label>Call Number</label></td>
-            <td><input type="text" name="callnumber" value="<!-- TMPL_VAR name="callnumber" -->" size="20"></td>
+            <td><input type="text" name="callnumber" value="<!-- TMPL_VAR name="callnumber" -->" size="20" /></td>
         </tr>
         <tr>
             <td>Branch</td>
@@ -765,15 +768,14 @@ function check_input(e){
             </td>
         </tr>
     </table>
-<div>
 <div id="subscription_form_planning">
     <h2>Planning</h2>
     <table>
         <tr>
             <td>First Issue ETA:</td>
             <td>
-                <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="button2" style="cursor: pointer;"  />
-                <input type="text" name="firstacquidate" value="<!-- TMPL_VAR name="startdate" -->" size="13" maxlength="10" id="acqui_date" style="border-width: 0px;" />
+                <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="button2" style="cursor: pointer;" alt="" />
+                <input type="text" name="firstacquidate" value="<!-- TMPL_VAR name="startdate" -->" size="13" maxlength="10" id="acqui_date" />
                 <!-- both scripts for calendar must follow the input field --> 
                 <script type="text/javascript">
                     Calendar.setup({
@@ -941,8 +943,8 @@ function check_input(e){
         <tr>
             <td>Begins On: (*)</td>
             <td>
-                <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="button1" style="cursor: pointer;"  />
-                <input type="text" name="startdate" value="<!-- TMPL_VAR name="startdate" -->" size="13" maxlength="10" id="beginning_date" style="border-width: 0px;">
+                <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="button1" style="cursor: pointer;" alt=""  />
+                <input type="text" name="startdate" value="<!-- TMPL_VAR name="startdate" -->" size="13" maxlength="10" id="beginning_date" />
                 <!-- both scripts for calendar must follow the input field --> 
                 <script type="text/javascript">
                     Calendar.setup({
@@ -968,7 +970,7 @@ function check_input(e){
                 <select name="subtype">
                     <!-- TMPL_LOOP NAME="subtype" -->
                         <!-- TMPL_IF NAME="selected" -->
-                        <option value="<!-- TMPL_VAR NAME="name" -->"  selected="SELECTED">
+                        <option value="<!-- TMPL_VAR NAME="name" -->" selected="selected">
                         <!-- TMPL_ELSE -->
                         <option value="<!-- TMPL_VAR NAME="name" -->">
                         <!-- /TMPL_IF -->
@@ -976,12 +978,12 @@ function check_input(e){
                         </option>
                     <!-- /TMPL_LOOP -->
                 </select>
-                <input type="text" name="sublength" value="<!-- TMPL_VAR name="sublength" -->" size="3" onkeypress="return check_input(event)"> (*) (enter amount in numerals)
+                <input type="text" name="sublength" value="<!-- TMPL_VAR name="sublength" -->" size="3" onkeypress="return check_input(event)" /> (*) (enter amount in numerals)
             </td>
         </tr>
     <tr>
         <td>Numbering calculation</td>
-        <td>Numbering formula: <input type="text" name="numberingmethod" value="<!-- TMPL_VAR name="numberingmethod" -->"></td>
+        <td>Numbering formula: <input type="text" name="numberingmethod" id="numberingmethod" value="<!-- TMPL_VAR name="numberingmethod" -->" /></td>
     </tr>
     <tr>
     <td colspan="3">
@@ -996,40 +998,40 @@ function check_input(e){
                 <tr>
                     <td>Add</td>
                     <td>
-                        <input type="text" name="add1" value="<!-- TMPL_VAR name="add1" -->">
+                        <input type="text" name="add1" value="<!-- TMPL_VAR name="add1" -->" />
                     </td>
                     <td>
-                        <input type="text" name="add2" value="<!-- TMPL_VAR name="add2" -->">
+                        <input type="text" name="add2" value="<!-- TMPL_VAR name="add2" -->" />
                     </td>
                     <td>
-                        <input type="text" name="add3" value="<!-- TMPL_VAR name="add3" -->">
+                        <input type="text" name="add3" value="<!-- TMPL_VAR name="add3" -->" />
                     </td>
                 </tr>
                 <tr>
                     <td>once every</td>
-                    <td><input type="text" name="every1" value="<!-- TMPL_VAR name="every1" -->"></td>
-                    <td><input type="text" name="every2" value="<!-- TMPL_VAR name="every2" -->"></td>
-                    <td><input type="text" name="every3" value="<!-- TMPL_VAR name="every3" -->"></td>
+                    <td><input type="text" name="every1" value="<!-- TMPL_VAR name="every1" -->" /></td>
+                    <td><input type="text" name="every2" value="<!-- TMPL_VAR name="every2" -->" /></td>
+                    <td><input type="text" name="every3" value="<!-- TMPL_VAR name="every3" -->" /></td>
                 </tr>
                 <tr>
                     <td>When more than</td>
-                    <td><input type="text" name="whenmorethan1" value="<!-- TMPL_VAR name="whenmorethan1" -->"></td>
-                    <td><input type="text" name="whenmorethan2" value="<!-- TMPL_VAR name="whenmorethan2" -->"></td>
-                    <td><input type="text" name="whenmorethan3" value="<!-- TMPL_VAR name="whenmorethan3" -->"></td>
+                    <td><input type="text" name="whenmorethan1" value="<!-- TMPL_VAR name="whenmorethan1" -->" /></td>
+                    <td><input type="text" name="whenmorethan2" value="<!-- TMPL_VAR name="whenmorethan2" -->" /></td>
+                    <td><input type="text" name="whenmorethan3" value="<!-- TMPL_VAR name="whenmorethan3" -->" /></td>
                 </tr>
                 <!-- TMPL_IF name="mod" -->
                 <tr>
                     <td>The loop is for instance</td>
-                    <td><input type="text" name="innerloop1" value="<!-- TMPL_VAR name="innerloop1" -->"></td>
-                    <td><input type="text" name="innerloop2" value="<!-- TMPL_VAR name="innerloop2" -->"></td>
-                    <td><input type="text" name="innerloop3" value="<!-- TMPL_VAR name="innerloop3" -->"></td>
+                    <td><input type="text" name="innerloop1" value="<!-- TMPL_VAR name="innerloop1" -->" /></td>
+                    <td><input type="text" name="innerloop2" value="<!-- TMPL_VAR name="innerloop2" -->" /></td>
+                    <td><input type="text" name="innerloop3" value="<!-- TMPL_VAR name="innerloop3" -->" /></td>
                 </tr>
                 <!-- /TMPL_IF -->
                 <tr>
                     <td>Set back to</td>
-                    <td><input type="text" name="setto1" value="<!-- TMPL_VAR name="setto1" -->"></td>
-                    <td><input type="text" name="setto2" value="<!-- TMPL_VAR name="setto2" -->"></td>
-                    <td><input type="text" name="setto3" value="<!-- TMPL_VAR name="setto3" -->"></td>
+                    <td><input type="text" name="setto1" value="<!-- TMPL_VAR name="setto1" -->" /></td>
+                    <td><input type="text" name="setto2" value="<!-- TMPL_VAR name="setto2" -->" /></td>
+                    <td><input type="text" name="setto3" value="<!-- TMPL_VAR name="setto3" -->" /></td>
                 </tr>
                 <tr>
                     <td>
@@ -1039,9 +1041,9 @@ function check_input(e){
                             Begins with
                         <!-- /TMPL_IF -->
                     </td>
-                    <td><input type="text" name="lastvalue1" value="<!-- TMPL_VAR name="lastvalue1" -->"></td>
-                    <td><input type="text" name="lastvalue2" value="<!-- TMPL_VAR name="lastvalue2" -->"></td>
-                    <td><input type="text" name="lastvalue3" value="<!-- TMPL_VAR name="lastvalue3" -->"></td>
+                    <td><input type="text" name="lastvalue1" value="<!-- TMPL_VAR name="lastvalue1" -->" /></td>
+                    <td><input type="text" name="lastvalue2" value="<!-- TMPL_VAR name="lastvalue2" -->" /></td>
+                    <td><input type="text" name="lastvalue3" value="<!-- TMPL_VAR name="lastvalue3" -->" /></td>
                 </tr>
             </table>
         </div>
@@ -1054,11 +1056,11 @@ function check_input(e){
     <table>
         <tr>
           <td>Starting date:</td>
-          <td><input type="text" name="histstartdate" value="<!-- TMPL_VAR name="histstartdate" -->"> (the date of the 1st subscription)</td>
+          <td><input type="text" name="histstartdate" value="<!-- TMPL_VAR name="histstartdate" -->" /> (the date of the 1st subscription)</td>
         </tr>
         <tr>
           <td>Ending date:</td>
-          <td><input type="text" name="enddate" value="<!-- TMPL_VAR name="enddate" -->">(if empty : subscription still active)</td>
+          <td><input type="text" name="enddate" value="<!-- TMPL_VAR name="enddate" -->" />(if empty : subscription still active)</td>
         </tr>
         <tr>
             <td>Recieved issues</td>
@@ -1080,15 +1082,11 @@ function check_input(e){
 </div>
 <!--/TMPL_IF-->
 <!-- TMPL_IF name="mod" -->
-    <input type="button" value="Save subscription" onclick="Check(this.form)" accesskey="w">
+    <input type="button" value="Save subscription" onclick="Check(this.form)" accesskey="w" />
 <!-- TMPL_ELSE -->
-    <input type="button" value="Add subscription" onclick="Check(this.form)" accesskey="w">
+    <input type="button" value="Add subscription" onclick="Check(this.form)" accesskey="w" />
 <!-- /TMPL_IF -->
 </form>
-</div>
-
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
 
 <script language="JavaScript" type="text/javascript">
 function Create_biblio(f)
@@ -1118,13 +1116,13 @@ function Check(f) {
             document.f.submit();
         } else {
             if(f.numbering_pattern.value == ''){
-                alert(_("need to choose a numbering pattern"));
+                alert("need to choose a numbering pattern");
             } else {
-                alert(_("need to check for irregularity by clicking 'Irregularity?'"));
+                alert("need to check for irregularity by clicking 'Irregularity?'");
             }
         }
     } else {
-        alert(_('field marked with * are mandatory'));
+        alert('field marked with * are mandatory');
     }
     return false;
 }
@@ -1143,3 +1141,10 @@ window.onload = irregularity_check();
 window.onload = irregular_order();
 </script>
 <!-- /TMPL_IF -->
+
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tmpl
index f06f4b83bf..0e4e664622 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tmpl
@@ -1,6 +1,12 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Serials</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
+
+<div id="doc" class="yui-t7">
+   <div id="bd">
+	<div class="yui-g">
+
 <h1>Catalogue search</h1>
 
 <form name="f" action="/cgi-bin/koha/serials/subscription-bib-search.pl" method="post">
@@ -10,3 +16,9 @@
     <input type="text" id="q"  name="q" />
     <input type="submit" value="Search" />
 </form>
+
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl
index c3789a1167..575f265c0b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl
@@ -1,10 +1,15 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Serials Detail for Subscription #<!-- TMPL_VAR name="subscriptionid" --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!--TMPL_INCLUDE NAME="menu-serials.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <script type="text/javascript" language="javascript">
 <!--
 // the english words used in display purposes
@@ -172,9 +177,9 @@ function irregularity(){
                 <!-- /TMPL_IF -->
               Manual history :
                 <!--TMPL_IF Name="manualhistory"-->
-                    <input type="checkbox" checked disabled>
+                    <input type="checkbox" checked="checked" disabled="disabled" />
                 <!-- TMPL_ELSE -->
-                    <input type="checkbox" disabled>
+                    <input type="checkbox" disabled="disabled" />
                 <!--/TMPL_IF-->
             </p>
             <p><label>Number Pattern:</label>
@@ -365,4 +370,9 @@ function popup(subscriptionid) {
 
 // window.onload = num_pattern();
 </script>
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tmpl
index 7f3a006976..1915dd14e4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tmpl
@@ -1,12 +1,17 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; View Alerts</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!--TMPL_INCLUDE NAME="menu-serials.inc" -->
-<div id="mainbloc">
-		<h1 class="serial">Alert subscribers for <!-- TMPL_VAR name="bibliotitle" --></h1>
-		<a href="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button serial">subscription</a>
-		<div class="bloc25">
+
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
+<h1 class="serial">Alert subscribers for <!-- TMPL_VAR name="bibliotitle" --></h1>
+		<a href="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button">subscription</a>
 		<!-- TMPL_IF name="alertloop" -->
 			<table>
 			<tr>
@@ -24,8 +29,9 @@
 		<!-- TMPL_ELSE -->
 			Nobody
 		<!-- /TMPL_IF -->
-		</div>
-
-	
 </div>
-<!-- TMPL_INCLUDE NAME="serials-bottom.inc" -->
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/acceptorreject.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/acceptorreject.tmpl
index a615d4336b..51fe1c2f96 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/acceptorreject.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/acceptorreject.tmpl
@@ -1,9 +1,16 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Suggestion Management</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!--TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
+
 <!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
     <h1>Suggestions Management</h1>
     
     <div id="action">
@@ -13,7 +20,6 @@
     </div>
 
 <!-- TMPL_IF name="op_else" -->
-    <br />
     <!-- TMPL_IF NAME="suggestions_loop" -->
     <b>Waiting suggestion,</b> accept or reject these suggestions with a reason.
     <form name="f" method="post" action="/cgi-bin/koha/suggestion/acceptorreject.pl">
@@ -55,7 +61,7 @@
                 </td>
                 <td>
 		<!-- TMPL_VAR NAME="title" --><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --><br />
-                    <!-- TMPL_IF name="copyrightdate" -->&copy <!-- TMPL_VAR name="copyrightdate" --> <!-- /TMPL_IF -->
+                    <!-- TMPL_IF name="copyrightdate" -->&copy; <!-- TMPL_VAR name="copyrightdate" --> <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="volumedesc" -->; Volume:<i><!-- TMPL_VAR name="volumedesc" --></i> <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="isbn" -->; ISBN :<i><!-- TMPL_VAR name="isbn" --></i> <!-- /TMPL_IF --><!-- TMPL_IF name="publishercode" -->; Published by <!-- TMPL_VAR name="publishercode" --> <!-- /TMPL_IF --><!-- TMPL_IF name="publicationyear" --> in <i><!-- TMPL_VAR name="publicationyear" --></i> <!-- /TMPL_IF --><!-- TMPL_IF name="place" --> in <i><!-- TMPL_VAR name="place" --></i> <!-- /TMPL_IF --><br /><!-- TMPL_IF name="note" --><!-- TMPL VAR NAME="note" --><!-- /TMPL_IF -->
                 </td>
@@ -185,4 +191,9 @@
 // ]]>
 </script>
 
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl
index b3cc7498b3..62c6d0b220 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl
@@ -1,10 +1,16 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Cataloging &rsaquo; MARC Import</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-tools.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <h1>MARC acquisition system</h1>
 <h4>Import into the reservoir</h4>
 
@@ -55,4 +61,9 @@
 </form>
 <!-- /TMPL_IF -->
 
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tmpl
index 55a7e14578..7b2d9180a8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tmpl
@@ -1,6 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Tools &rsaquo; Clean Borrowers</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 
 <!-- Additions to enable Calendar system -->
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css" />
@@ -10,9 +11,14 @@
 <script type="text/javascript" src="<!-- TMPL_VAR name='themelang' -->/lib/calendar/calendar-setup.js"></script>
 <!-- End of additions -->
 
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-tools.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <h1>Delete some old borrowers/Anonymize some issue history</h1>
 
 <!-- TMPL_IF NAME="step1" -->
@@ -151,4 +157,10 @@
           }
      // ]]>
 </script>
+
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tmpl
index 0557abb64f..59b63b323e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tmpl
@@ -1,10 +1,16 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; MARC biblio export</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-tools.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <h1>Select biblios to export</h1>
 <p>
     <b>Note : The items are exported by this tool unless specified.</b>
@@ -93,4 +99,9 @@
     <input type="submit" value="Export" class="button" />
 </form>
 
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import.tmpl
index b04efa15a8..1362c9b87e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import.tmpl
@@ -1,9 +1,15 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Cataloging &rsaquo; MARC Import</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-tools.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <h1>MARC acquisition system</h1>
 <h4>Import into the reservoir</h4>
 
@@ -54,4 +60,9 @@
 </form>
 <!-- /TMPL_IF -->
 
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl
index c310d749d0..63909453c1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl
@@ -1,13 +1,22 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Inventory</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!--TMPL_INCLUDE NAME="menus.inc" --><!-- TMPL_INCLUDE NAME="menu-reports.inc"-->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-reports.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>
 <!-- End of additions -->
+
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
     <h1>Inventory/Stocktaking</h1>
     <form method="post">
         <fieldset>
@@ -67,7 +76,7 @@
         </p>
         </fieldset>
     </form>
-    <form  name="barcodefile" method="post">
+    <form name="barcodefile" method="post">
         <fieldset>
             <legend>Use a barcode file</legend>
             <p>barcode filename : <input type="file" name="uploadbarcodes" /></p>
@@ -99,14 +108,14 @@
     <!-- /TMPL_LOOP-->
     <!-- TMPL_IF NAME="loop" -->
     <form method="post">
-    <input type="hidden" name="markseen" value="1">
-    <input type="hidden" name="minlocation" value="<!-- TMPL_VAR NAME="minlocation" -->">
-    <input type="hidden" name="maxlocation" value="<!-- TMPL_VAR NAME="maxlocation" -->">
-    <input type="hidden" name="location" value="<!-- TMPL_VAR NAME="location" -->">
-    <input type="hidden" name="branchcode" value="<!-- TMPL_VAR NAME="branchcode" -->">
-    <input type="hidden" name="datelastseen" value="<!-- TMPL_VAR NAME="datelastseen" -->">
-    <input type="hidden" name="pagesize" value="<!-- TMPL_VAR NAME="pagesize" -->">
-    <input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="offset" -->">
+    <input type="hidden" name="markseen" value="1" />
+    <input type="hidden" name="minlocation" value="<!-- TMPL_VAR NAME="minlocation" -->" />
+    <input type="hidden" name="maxlocation" value="<!-- TMPL_VAR NAME="maxlocation" -->" />
+    <input type="hidden" name="location" value="<!-- TMPL_VAR NAME="location" -->" />
+    <input type="hidden" name="branchcode" value="<!-- TMPL_VAR NAME="branchcode" -->" />
+    <input type="hidden" name="datelastseen" value="<!-- TMPL_VAR NAME="datelastseen" -->" />
+    <input type="hidden" name="pagesize" value="<!-- TMPL_VAR NAME="pagesize" -->" />
+    <input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="offset" -->" />
     <table>
         <tr>
             <th>Seen</th>
@@ -117,7 +126,7 @@
     <!-- TMPL_LOOP NAME="loop" -->
         <tr>
             <td>
-                <input type="checkbox" name="SEEN-<!-- TMPL_VAR NAME="itemnumber" -->" value="1">
+                <input type="checkbox" name="SEEN-<!-- TMPL_VAR NAME="itemnumber" -->" value="1" />
             </td>
             <td>
                 <!-- TMPL_VAR NAME="barcode" -->
@@ -132,32 +141,38 @@
         </tr>
     <!-- /TMPL_LOOP -->
     </table>
-    <input type="submit" value="Mark seen">
+    <input type="submit" value="Mark seen" />
     </form>
     <!-- TMPL_IF NAME="offset" -->
     <form method="post">
-        <input type="hidden" name="minlocation" value="<!-- TMPL_VAR NAME="minlocation" -->">
-        <input type="hidden" name="maxlocation" value="<!-- TMPL_VAR NAME="maxlocation" -->">
-        <input type="hidden" name="location" value="<!-- TMPL_VAR NAME="location" -->">
-        <input type="hidden" name="branchcode" value="<!-- TMPL_VAR NAME="branchcode" -->">
-        <input type="hidden" name="datelastseen" value="<!-- TMPL_VAR NAME="datelastseen" -->">
-        <input type="hidden" name="pagesize" value="<!-- TMPL_VAR NAME="pagesize" -->">
-        <input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="prevoffset" -->">
-        <input type="submit" value="&lt;&lt;&lt;" class="button reports">
+        <input type="hidden" name="minlocation" value="<!-- TMPL_VAR NAME="minlocation" -->" />
+        <input type="hidden" name="maxlocation" value="<!-- TMPL_VAR NAME="maxlocation" -->" />
+        <input type="hidden" name="location" value="<!-- TMPL_VAR NAME="location" -->" />
+        <input type="hidden" name="branchcode" value="<!-- TMPL_VAR NAME="branchcode" -->" />
+        <input type="hidden" name="datelastseen" value="<!-- TMPL_VAR NAME="datelastseen" -->" />
+        <input type="hidden" name="pagesize" value="<!-- TMPL_VAR NAME="pagesize" -->" />
+        <input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="prevoffset" -->" />
+        <input type="submit" value="&lt;&lt;&lt;" class="button" />
     </form>
     <!-- /TMPL_IF -->
     <!-- TMPL_IF NAME="nextoffset" -->
     <form method="post">
-        <input type="hidden" name="location" value="<!-- TMPL_VAR NAME="location" -->">
-        <input type="hidden" name="branchcode" value="<!-- TMPL_VAR NAME="branchcode" -->">
-        <input type="hidden" name="minlocation" value="<!-- TMPL_VAR NAME="minlocation" -->">
-        <input type="hidden" name="maxlocation" value="<!-- TMPL_VAR NAME="maxlocation" -->">
-        <input type="hidden" name="datelastseen" value="<!-- TMPL_VAR NAME="datelastseen" -->">
-        <input type="hidden" name="pagesize" value="<!-- TMPL_VAR NAME="pagesize" -->">
-        <input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="nextoffset" -->">
-        <input type="submit" value="&gt;&gt;&gt;" class="button reports">
+        <input type="hidden" name="location" value="<!-- TMPL_VAR NAME="location" -->" />
+        <input type="hidden" name="branchcode" value="<!-- TMPL_VAR NAME="branchcode" -->" />
+        <input type="hidden" name="minlocation" value="<!-- TMPL_VAR NAME="minlocation" -->" />
+        <input type="hidden" name="maxlocation" value="<!-- TMPL_VAR NAME="maxlocation" -->" />
+        <input type="hidden" name="datelastseen" value="<!-- TMPL_VAR NAME="datelastseen" -->" />
+        <input type="hidden" name="pagesize" value="<!-- TMPL_VAR NAME="pagesize" -->" />
+        <input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="nextoffset" -->" />
+        <input type="submit" value="&gt;&gt;&gt;" class="button" />
     </form>
     <!-- /TMPL_IF -->
     <!-- /TMPL_IF -->
+
 </div>
+</div>
+</div>
+
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/itemslost.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/itemslost.tmpl
index 5c1955e48e..2982beee77 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/itemslost.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/itemslost.tmpl
@@ -1,10 +1,16 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Tools &rsaquo; Lost Items</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-tools.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <h1>Items lost</h1>
 
 <b>
@@ -120,10 +126,9 @@
     </table>
 </form>
 
-<script type="text/javascript" language="JavaScript">
-// <![CDATA[
-    
-     // ]]>
-</script>
+</div>
+</div>
+</div>
 
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl
index 829e06b377..20c9c73f49 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl
@@ -1,6 +1,8 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; News Management</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-tools.inc" -->
 
 <!-- Additions to enable Calendar system -->
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css" />
@@ -10,8 +12,12 @@
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-setup.js"></script>
 <!-- End of additions -->
 
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-tools.inc" -->
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 
 <div id="koha-news_main" class="searchresults">
     <h1> OPAC &amp; KOHA News</h1>
@@ -65,6 +71,7 @@
                 <input class="button" type="button" value="Cancel" onclick="window.location.href='/cgi-bin/koha/tools/opac-news.pl'" />
             </p>
         </form>
+		</div>
     <!-- TMPL_ELSE -->
         <div id="koha-news_filter">
             <form name="add_form" method="post" action="/cgi-bin/koha/tools/koha-news.pl" />
@@ -127,14 +134,20 @@
                 <input type="hidden" name="op" value="del" />
                 <input type="submit" class="button" value="Delete selected" />
             </form>
+			</div>
         <!-- TMPL_ELSE -->
             <p>No news loaded</p>
         <!-- /TMPL_IF -->
         <div id="action">
           <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form">Add news</a>
         </div>
-    </div>
+		</div>
     <!-- /TMPL_IF -->
+
+
+</div>
+</div>
 </div>
 
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl
index e59bd69b06..e56c4dd263 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl
@@ -1,9 +1,16 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Letters Administration</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
+
 <!-- TMPL_INCLUDE NAME="menu-tools.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 	<!-- TMPL_IF NAME="else" -->
 		<form action="/cgi-bin/koha/tools/letter.pl" method="post">
 		<input type="text" name="searchfield" value="">
@@ -132,8 +139,7 @@
 		}
 		
 		</script>
-	<div id="bloc25">
-		<!-- TMPL_IF name="modify" -->
+	<!-- TMPL_IF name="modify" -->
 			<h2 class="parameters">Modify letter</h2>
 		<!-- TMPL_ELSE -->
 			<h2 class="parameters">Add letter</h2>
@@ -243,7 +249,6 @@
 		</p>
 		<p><input type="button" value="OK" onclick="Check(this.form)" class="button"></p>
 		</form>
-	</div>
 	<!-- /TMPL_IF -->
 	
 	<!-- TMPL_IF NAME="add_validate" -->
@@ -294,5 +299,10 @@
 	<input type="submit" value="OK">
 	</form>
 	<!-- /TMPL_IF -->
+
 </div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tmpl
index 3f389d5a90..7298f33666 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tmpl
@@ -1,10 +1,16 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Tools &rsaquo; Overdue Rules</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-tools.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 	<h1>Defining <!-- TMPL_IF NAME="branch" -->overdue actions for <!-- TMPL_VAR NAME="branch" --><!-- TMPL_ELSE -->default overdue actions<!-- /TMPL_IF --></h1>
 	<div class="help">
 		<p>Delay is the number of days after an issue is due before an action is triggered. </p>
@@ -163,4 +169,9 @@
 			<input type="submit" value="Save Changes" />
 		</form>
 
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl
index 7d68e9f7da..2f89b75369 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl
@@ -1,10 +1,16 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Tools</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-tools.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <h1>Koha tools</h1>
 
 <table>
@@ -55,5 +61,9 @@
 </tr>
 </table>
 
+</div>
+</div>
+</div>
 
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl
index 34495cc289..5d4bad6946 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl
@@ -1,6 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Tools &rsaquo; Logs</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 
 <!-- Additions to enable Calendar system -->
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css" />
@@ -10,9 +11,15 @@
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-setup.js"></script>
 <!-- End of additions -->
 
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+
 <!-- TMPL_INCLUDE NAME="menu-tools.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-b"><div class="yui-g">
+
 <h1>Browse system logs</h1>
 
 <form method="post" action="/cgi-bin/koha/tools/viewlog.pl">
@@ -102,8 +109,7 @@
         <!-- /TMPL_IF -->
         </p>
     <!-- /TMPL_IF -->
-    <div class="searchresults">
-	<table>
+    <table>
     <tr>
         <th>Date</th>
         <th>Librarian</th>
@@ -194,6 +200,9 @@
 					</tr>
 		<!-- /TMPL_LOOP -->
     </table>
-    </div>
+</div>
+</div>
+</div>
 
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->