diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 3660726f33..bd7b23fed1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -245,6 +245,7 @@ div#header_search {
 	float: left;
 	padding-left : 14.2em;
 	margin: .3em 0 .5em 0;
+	min-height : 52px;
 }
 
 div#header_search input {
@@ -268,6 +269,12 @@ div#circ_search,div#catalog_search,div#patron_search,div#subscription_search,div
 	padding : 0 0 .2em 0;
 }
 
+div#header_search div.residentsearch {
+	border : 0;
+	border-bottom : 1px solid #FF9900;
+	padding : 0 0 .2em 0;
+}
+
 div#reserves,div#checkouts {
 	border : 1px solid #E8E8E8;
 	padding : 1em;
@@ -520,6 +527,8 @@ padding: 0;
 width: 100%; 
 }
 
+
+
 fieldset.rows legend {  
 	margin-left: 1em;
 	font-weight: bold;
@@ -529,7 +538,7 @@ fieldset.rows legend {
 fieldset.rows label, fieldset.rows span.label {  
 	float: left;  
 	font-weight : bold;
-	width: 12em;  
+	width: 9em;  
 	margin-right: 1em;  
 	text-align: right;
 }
@@ -556,6 +565,17 @@ fieldset.rows.left li {
 	padding-bottom : .4em;
 }
 
+fieldset.rows li.radio {
+	padding-left: 9em;
+	width : auto;
+}
+
+fieldset.rows li.radio label {
+	float : none;
+	width : auto;
+	margin : 0 0 0 1em;
+}
+
 fieldset.rows ol.radio label {
 	width : auto;
 	float : none;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc
index 5668ee9f59..86a7f70d35 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc
@@ -1,7 +1,5 @@
 <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>
+	<li><a href="/cgi-bin/koha/admin/aqbookfund.pl">Book Funds</a></li>
 </ul>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc
new file mode 100644
index 0000000000..e2723deeed
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc
@@ -0,0 +1,21 @@
+
+<div id="header_search">
+<div id="supplier_search" class="residentsearch">
+	<p class="tip">Search suppliers:</p>
+        <form name="findsupplier" action="/cgi-bin/koha/acqui/booksellers.pl" method="post">
+           <input type="text" size="25" name="supplier" id="supplier" class="focus" />
+            <input type="submit" value="Search" /></form>
+</div>
+	<div id="orders_search" class="residentsearch">
+	<p class="tip">Search orders:</p>
+	
+		<form action="/cgi-bin/koha/acqui/histsearch.pl" method="post">
+		<label for="title">Title: </label><input type="text" id="title" name="title" size="15" value="<!-- TMPL_VAR name="title"-->" /> <label for="supplier">Supplier:</label> <input type="text" id="supplier" name="name" size="15" value="<!-- TMPL_VAR name="name" -->" />
+	<input value="Submit" type="submit" /> <a href="/cgi-bin/koha/acqui/histsearch.pl">Advanced</a>
+	</form>
+	</div>	
+			<ul>
+			<li><a href="/cgi-bin/koha/acqui/booksellers.pl#supplier_search">Supplier Search</a></li>
+			<li><a href="/cgi-bin/koha/acqui/histsearch.pl#orders_search">Orders Search</a></li>
+			</ul>	
+</div>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc
new file mode 100644
index 0000000000..8be2bd4c5a
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc
@@ -0,0 +1,12 @@
+<div id="toolbar">
+	<ul class="toolbar">
+		<li><a href="/cgi-bin/koha/acqui/supplier.pl?op=enter">New Supplier</a></li>
+		<!-- TMPL_IF NAME="id" -->
+		<li><a href="/cgi-bin/koha/acqui/basket.pl?supplierid=<!-- TMPL_VAR NAME="id" -->">New Order</a></li>
+		<li><a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!--TMPL_VAR Name="id"-->&amp;op=enter">Edit Supplier</a></li>
+		<li><a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=<!--TMPL_VAR Name="id"-->">Manage Orders</a></li>
+		<li><a href="/cgi-bin/koha/acqui/parcels.pl?supplierid=<!--TMPL_VAR Name="id"-->">Receive Parcel</a></li>
+		<!-- /TMPL_IF -->
+	</ul>
+<br clear="all" />
+</div>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc
new file mode 100644
index 0000000000..ffb5d806e8
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc
@@ -0,0 +1,4 @@
+<!-- Begin Circulation Resident Search Box -->
+<div id="header_search">
+</div>
+<!-- End Circulation Resident Search Box -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc
new file mode 100644
index 0000000000..03d0d37155
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc
@@ -0,0 +1,16 @@
+<div id="toolbar">
+
+  <form name="f2" method="post" action="authorities.pl">
+	<label for="add_authtypecode">New: </label>
+        <select id="add_authtypecode" name="authtypecode">
+<!-- TMPL_LOOP name="authtypesloop" -->
+  <!-- TMPL_IF name="selected" -->
+        <option value="<!-- TMPL_VAR name="value" -->" selected="selected"><!-- TMPL_VAR name="authtypetext" --></option>
+  <!-- TMPL_ELSE -->
+        <option value="<!-- TMPL_VAR name="value" -->"><!-- TMPL_VAR name="authtypetext" --></option>
+  <!-- /TMPL_IF -->
+<!-- /TMPL_LOOP -->
+        </select>
+      <input type="submit" value="Add" class="button" />
+  </form>
+</div>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
index 40e65278a4..58651109cc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
@@ -1,7 +1,7 @@
 <!-- Begin Circulation Resident Search Box -->
 <div id="header_search">
 <div id="addbooks_search">
-	<p class="tip">Search the catalog:</p>
+	<p class="tip">Search the catalog and the reservoir:</p>
 	<form name="search" action="addbooks.pl">
         <input type="text" name="q"  size="40" class="focus" />
         <input type="submit" value="Search" />
@@ -18,7 +18,7 @@
 	</form>
 	</div>	
 			<ul>
-			<li><a href="/cgi-bin/koha/catalogue/advsearch.pl#addbooks_search">Search the Catalog</a></li>
+			<li><a href="/cgi-bin/koha/catalogue/advsearch.pl#addbooks_search">Cataloguing Search</a></li>
 			<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check Out</a></li>
 			</ul>	
 </div>
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 8c07b3abda..23fae053ca 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
@@ -4,7 +4,7 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
+<!-- TMPL_INCLUDE NAME="acquisitions-search.inc" -->
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; </div>
 
@@ -14,12 +14,14 @@
 	<div id="yui-main">
 	<div class="yui-b">
 
+<!-- TMPL_INCLUDE NAME="acquisitions-toolbar.inc" -->
+
 <h1>Acquisitions</h1>
 <div id="acqui_acqui_home_order">
     <fieldset>
         <legend>Start, receive, or modify any order</legend>
     <!-- TMPL_IF name="nobudget" -->
-        <span class="problem">You must <a href="/cgi-bin/koha/admin/aqbookfund.pl">define a budget</a> in parameters</span>
+        <span class="problem">You must <a href="/cgi-bin/koha/admin/aqbookfund.pl">define a budget</a> in Administration</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" class="focus" />
             <input type="submit" value="Search" />
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 eb418b8ee0..194a67793e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
@@ -15,7 +15,7 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
+<!-- TMPL_INCLUDE NAME="acquisitions-search.inc" -->
 
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <!-- TMPL_UNLESS name="basketno" -->New <!-- /TMPL_UNLESS -->Shopping Basket <!-- TMPL_IF NAME="basketno" -->(<!-- TMPL_VAR NAME="basketno" -->)<!-- /TMPL_IF --> for <!-- TMPL_VAR NAME="name" --></div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/bookfund.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/bookfund.tmpl
index 404c1b582f..3d0601cded 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/bookfund.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/bookfund.tmpl
@@ -4,7 +4,7 @@
 </head>   
 <body>  
 <!-- TMPL_INCLUDE NAME="header.inc" -->                                   
-<!-- TMPL_INCLUDE NAME="cat-search.inc" -->   
+<!-- TMPL_INCLUDE NAME="acquisitions-search.inc" -->   
                                                                            
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo;  Book Funds</div>
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 d688029789..8a708aa444 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl
@@ -4,7 +4,7 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
+<!-- TMPL_INCLUDE NAME="acquisitions-search.inc" -->
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; </div>
 
@@ -14,6 +14,8 @@
 	<div id="yui-main">
 	<div class="yui-b">
 	
+<!-- TMPL_INCLUDE NAME="acquisitions-toolbar.inc" -->
+	
 <h1>You searched on <b>supplier <!-- TMPL_VAR name="supplier" -->,</b> <!-- TMPL_VAR name="count" --> results found</h1>
 <div id="acqui_order_supplierlist">
 	<table>
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 f412d57361..b801f55485 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl
@@ -6,7 +6,7 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
+<!-- TMPL_INCLUDE NAME="acquisitions-search.inc" -->
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; Order search</div>
 
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 15f8d4486c..bef259d1cb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tmpl
@@ -4,7 +4,7 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
+<!-- TMPL_INCLUDE NAME="acquisitions-search.inc" -->
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; Late issues</div>
 
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 27eecc7423..e5697deebe 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl
@@ -4,7 +4,7 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
+<!-- TMPL_INCLUDE NAME="acquisitions-search.inc" -->
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; Search Existing Records</div>
 
@@ -39,7 +39,7 @@
 <div class="searchresults">
     <table>
     <tr>
-       <th>Summary</th>
+       <th colspan="2">Summary</th>
     </tr>
     <!-- TMPL_LOOP NAME="resultsloop" -->
         <tr>
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 6accf54c2f..674f123f8a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
@@ -69,7 +69,7 @@ if (quantity ==0) {
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
+<!-- TMPL_INCLUDE NAME="acquisitions-search.inc" -->
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->">Shopping Basket <!-- TMPL_VAR NAME="basketno" --></a> &rsaquo; <!-- TMPL_IF name="ordnum" -->Modify order details (line #<!-- TMPL_VAR NAME="ordnum" -->)<!-- TMPL_ELSE -->New order<!-- /TMPL_IF --></div>
 
@@ -79,7 +79,6 @@ if (quantity ==0) {
 	<div id="yui-main">
 	<div class="yui-b">
 	
-
 <h1>
     <!-- TMPL_IF name="ordnum" -->
         Modify order details (line #<!-- TMPL_VAR NAME="ordnum" -->)
@@ -101,7 +100,7 @@ if (quantity ==0) {
 <!-- /TMPL_IF -->
 
 <form action="/cgi-bin/koha/acqui/addorder.pl" method="post" name="frusin">
-    <fieldset>
+    <fieldset class="rows">
         <legend>Catalogue details</legend>
         <!-- TMPL_UNLESS name="existing" -->
 		<input type="hidden" name="existing" value="no" />
@@ -120,65 +119,65 @@ if (quantity ==0) {
         <!-- TMPL_LOOP NAME="loop_currencies" -->
             <input type="hidden" name="<!-- TMPL_VAR NAME="currency" -->" value="<!-- TMPL_VAR NAME="rate" -->" />
         <!-- /TMPL_LOOP -->
-        <p>
+        <ol><li>
             <!-- TMPL_IF name="biblio" -->
-			<strong>Title</strong>
-                <input type="hidden" size="20" name="title" value="<!-- TMPL_VAR NAME="title" -->" /><!-- TMPL_VAR NAME="title" -->
+			<span class="label">Title</span>
+                <input type="hidden" size="20" id="title" name="title" value="<!-- TMPL_VAR NAME="title" -->" /><!-- TMPL_VAR NAME="title" -->
             <!-- TMPL_ELSE -->
             <label for="title" class="required">Title</label>
                 <input type="text" id="title" size="20" name="title" value="<!-- TMPL_VAR NAME="title" -->" />
             <!-- /TMPL_IF -->
-        </p>
-        <p>
+        </li>
+        <li>
             <!-- TMPL_IF name="biblio" -->
-			<strong>Author</strong>
-                <input type="hidden" size="20" name="author" value="<!-- TMPL_VAR NAME="author" -->" /><!-- TMPL_VAR NAME="author" -->
+			<span class="label">Author</label>
+                <input type="hidden" size="20" name="author" id="author" value="<!-- TMPL_VAR NAME="author" -->" /><!-- TMPL_VAR NAME="author" -->
             <!-- TMPL_ELSE -->
             <label for="author">Author</label>
-                <input type="text" id="author" size="20" name="author" value="<!-- TMPL_VAR NAME="author" -->" />
+                <input type="text" id="author" size="20" name="author" id="author" value="<!-- TMPL_VAR NAME="author" -->" />
             <!-- /TMPL_IF -->
-        </p>
-        <p>
+        </li>
+        <li>
             <!-- TMPL_IF name="biblio" -->
-			<strong>Publisher</strong>
-                <input type="hidden" size="20" name="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->" /><!-- TMPL_VAR NAME="publishercode" -->
+			<span class="label">Publisher</label>
+                <input type="hidden" size="20" name="publishercode" id="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->" /><!-- TMPL_VAR NAME="publishercode" -->
             <!-- TMPL_ELSE -->
             <label for="publishercode"> Publisher</label>
-                <input type="text" id="publishercode" size="20" name="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->" />
+                <input type="text" id="publishercode" size="20" name="publishercode" id="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->" />
             <!-- /TMPL_IF -->
-        </p>
-        <p>
+        </li>
+        <li>
             <!-- TMPL_IF name="biblio" -->
-			<strong>Copyright Date</strong>
-                <input type="hidden" size="20" name="copyrightdate" value="<!-- TMPL_VAR NAME="copyrightdate" -->" /><!-- TMPL_VAR NAME="copyrightdate" -->
+			<lspan class="label">Copyright Date</label>
+                <input type="hidden" size="20" name="copyrightdate" id="copyrightdate" value="<!-- TMPL_VAR NAME="copyrightdate" -->" /><!-- TMPL_VAR NAME="copyrightdate" -->
             <!-- TMPL_ELSE -->
             <label for="copyrightdate">Copyright Date</label>
-                <input type="text" id="copyrightdate" size="20" name="copyrightdate" value="<!-- TMPL_VAR NAME="copyrightdate" -->" />
+                <input type="text" id="copyrightdate" size="20" name="copyrightdate" id="copyrightdate" value="<!-- TMPL_VAR NAME="copyrightdate" -->" />
             <!-- /TMPL_IF -->
-        </p>
-        <p>
+        </li>
+        <li>
             <label for="format">Format</label>
             <!-- TMPL_VAR NAME="CGIitemtype" -->
-        </p>
-        <p>
+        </li>
+        <li>
             <!-- TMPL_IF name="biblio" -->
-			<strong>ISBN</strong>
-                <input type="hidden" size="20" name="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->" /><!-- TMPL_VAR NAME="isbn" -->
+			<span class="label">ISBN</label>
+                <input type="hidden" size="20" name="ISBN" id="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->" /><!-- TMPL_VAR NAME="isbn" -->
             <!-- TMPL_ELSE -->
             <label for="ISBN">ISBN</label>
-                <input type="text" id="ISBN" size="20" name="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->" />
+                <input type="text" id="ISBN" size="20" name="ISBN" id="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->" />
             <!-- /TMPL_IF -->
-        </p>
-        <p>
+        </li>
+        <li>
             <!-- TMPL_IF name="biblio" -->
-			<strong>Series</strong>
-                <input type="hidden" size="20" name="series" value="<!-- TMPL_VAR NAME="seriestitle" -->" /><!-- TMPL_VAR NAME="seriestitle" -->
+			<span class="label">Series</label>
+                <input type="hidden" size="20" name="series" id="series" value="<!-- TMPL_VAR NAME="seriestitle" -->" /><!-- TMPL_VAR NAME="seriestitle" -->
             <!-- TMPL_ELSE -->
             <label for="series">Series</label>
-                <input type="text" id="series" size="20" name="series" value="<!-- TMPL_VAR NAME="seriestitle" -->" />
+                <input type="text" id="series" size="20" name="series" id="series" value="<!-- TMPL_VAR NAME="seriestitle" -->" />
             <!-- /TMPL_IF -->
-        </p>
-        <p>
+        </li>
+        <li>
             <label for="branch">Branch</label>
             <select name="branch" id="branch">
             <!-- TMPL_LOOP name="branchloop" -->
@@ -188,109 +187,108 @@ if (quantity ==0) {
 				<!-- /TMPL_IF -->
             <!-- /TMPL_LOOP -->
             </select>
-        </p>
+        </li>
     </fieldset>
-    <fieldset>
+    <fieldset class="rows">
         <legend>Accounting details</legend>
-            <p>
+            <li>
                 <!-- TMPL_IF name="close" -->
-			<strong>Quantity</strong>
-                    <input type="hidden" size="20" name="quantity" value="<!-- TMPL_VAR NAME="quantity" -->" /><!-- TMPL_VAR NAME="quantity" -->
+			<span class="label">Quantity</label>
+                    <input type="hidden" size="20" id="quantity" name="quantity" value="<!-- TMPL_VAR NAME="quantity" -->" /><!-- TMPL_VAR NAME="quantity" -->
                 <!-- TMPL_ELSE -->
                 <label for="quantity">Quantity</label>
-                    <input type="text" id="quantity" size="20" name="quantity" value="<!-- TMPL_VAR NAME="quantity" -->" onchange="update(this.form);" />
+                    <input type="text" id="quantity" size="20" id="quantity" name="quantity" value="<!-- TMPL_VAR NAME="quantity" -->" onchange="update(this.form);" />
                 <!--/TMPL_IF-->
-            </p>
-            <p>
+            </li>
+            <li>
                 <!-- TMPL_IF name="close" -->
-			<strong>Bookfund</strong>
-                    <input type="hidden" size="20" name="bookfund" value="<!-- TMPL_VAR NAME="bookfundid" -->" /><!-- TMPL_VAR NAME="bookfundname" -->
+			<span class="label">Bookfund</label>
+                    <input type="hidden" size="20" name="bookfund" id="bookfund" value="<!-- TMPL_VAR NAME="bookfundid" -->" /><!-- TMPL_VAR NAME="bookfundname" -->
                 <!-- TMPL_ELSE -->
                 <label for="bookfund">Bookfund</label>
                     <!-- TMPL_VAR NAME="CGIbookfund" -->
                 <!--/TMPL_IF-->
-            </p>
-            <p>
+            </li>
+            <li>
                 <!-- TMPL_IF name="close" -->
-			<strong>Supplier price</strong>
-                    <input type="hidden" size="20" name="list_price" value="<!-- TMPL_VAR NAME="listprice" -->" /><!-- TMPL_VAR NAME="listprice" -->
+			<span class="label">Supplier price</label>
+                    <input type="hidden" size="20" name="list_price" id="list_price" value="<!-- TMPL_VAR NAME="listprice" -->" /><!-- TMPL_VAR NAME="listprice" -->
                 <!-- TMPL_ELSE -->
                 <label for="list_price">Supplier price</label>
-                    <input type="text" id="list_price" size="20" name="list_price" value="<!-- TMPL_VAR NAME="listprice" -->" onchange="update(this.form)" />
+                    <input type="text" id="list_price" size="20" name="list_price" id="list_price" value="<!-- TMPL_VAR NAME="listprice" -->" onchange="update(this.form)" />
                 <!--/TMPL_IF-->
-            </p>
-            <p>
+            </li>
+            <li>
                 <!-- TMPL_IF name="close" -->
-			<strong>Replacement Cost</strong>
-                    <input type="hidden" size="20" name="rrp" value="<!-- TMPL_VAR NAME="rrp" -->" /><!-- TMPL_VAR NAME="rrp" -->
+			<span class="label">Replacement Cost</label>
+                    <input type="hidden" size="20" name="rrp" id="rrp" value="<!-- TMPL_VAR NAME="rrp" -->" /><!-- TMPL_VAR NAME="rrp" -->
                 <!-- TMPL_ELSE -->
                 <label for="rrp">Replacement Cost </label>
-                    <input type="text" id="rrp" size="20" name="rrp" value="<!-- TMPL_VAR NAME="rrp" -->" />
+                    <input type="text" id="rrp" size="20" name="rrp" id="rrp" value="<!-- TMPL_VAR NAME="rrp" -->" />
                 <!--/TMPL_IF-->
-            </p>
-            <p>
+            </li>
+            <li>
                 <!-- TMPL_IF name="close" -->
-			<strong>Budgeted Cost</strong>
-                    <input type="text" id="" size="20" name="ecost" value="<!-- TMPL_VAR NAME="ecost" -->" readonly="readonly"  />
+			<label for="ecost">Budgeted Cost</label>
+                    <input type="text" size="20" name="ecost" id="ecost" value="<!-- TMPL_VAR NAME="ecost" -->" readonly="readonly"  />
                 <!-- TMPL_ELSE -->
                 <label for="ecost">Budgeted Cost</label>
-                    <input type="text" id="ecost" size="20" name="ecost" value="<!-- TMPL_VAR NAME="ecost" -->" />
+                    <input type="text" id="ecost" size="20" name="ecost" id="ecost" value="<!-- TMPL_VAR NAME="ecost" -->" />
                 <!--/TMPL_IF-->
-            </p>
+            </li>
             <!-- TMPL_IF NAME="GST"-->
-            <p>
+            <li>
 				<!-- TMPL_IF name="close" -->
-			<strong>Budgeted GST</strong>
-                <input type="text" id="" size="20" name="GST" value="" readonly="readonly" />
+			<label for="GST">Budgeted GST</label>
+                <input type="text" id="" size="20" name="GST" value="" id="GST" readonly="readonly" />
 				<!-- TMPL_ELSE -->
                 <label for="GST">Budgeted GST</label>
-                <input type="text" id="GST" size="20" name="GST" value="" />
+                <input type="text" id="GST" size="20" name="GST" id="GST" value="" />
 				<!--/TMPL_IF-->
-            </p>
+            </li>
             <!-- /TMPL_IF -->
-            <p>
+            <li>
                 <!-- TMPL_IF name="close" -->
-			<strong>Total</strong>
-				<input type="text" id="" size="20" name="total" value="<!-- TMPL_VAR name="total" -->" readonly="readonly" />
+			<label for="total">Total</label>
+				<input type="text" id="total" size="20" name="total" value="<!-- TMPL_VAR name="total" -->" readonly="readonly" />
 				<!-- TMPL_ELSE -->
-                <label for="total"><strong>Total</strong></label>
+                <label for="total"><label for="">Total</label></label>
                 <input type="text" id="total" size="20" name="total" value="<!-- TMPL_VAR name="total" -->" />
 				<!--/TMPL_IF-->
-            </p>
-            <p>
+            </li>
+            <li>
 				<!-- TMPL_IF name="close" -->
-			<strong>Actual Cost</strong>
-                <input type="text" id="" size="20" name="cost" value="<!-- TMPL_VAR name="ecost"-->" readonly="readonly" />
+			<label for="cost">Actual Cost</label>
+                <input type="text" id="cost" size="20" name="cost" value="<!-- TMPL_VAR name="ecost"-->" readonly="readonly" />
 				<!-- TMPL_ELSE -->
                 <label for="cost">Actual Cost</label>
                 <input type="text" id="cost" size="20" name="cost" value="<!-- TMPL_VAR name="ecost"-->" />
 				<!--/TMPL_IF-->
-            </p>
-            <p>
+            </li>
+            <li>
                 <label for="invoice">Invoice Number</label>
                 <input type="text" id="invoice" size="20" name="invoice"  value="<!-- TMPL_VAR name="invoice" -->" />(usually empty)
-            </p>
-            <p>
+            </li>
+            <li>
                 <label for="notes">Notes</label>
                 <input type="text" id="notes" size="20" name="notes" value="<!-- TMPL_VAR NAME="notes" -->" />
-            </p>
-            <p>The 2 following fields are available for your own usage. They can be useful for stat purposes</p>
-            <p>
+            </li>
+            <li>The 2 following fields are available for your own usage. They can be useful for statistical purposes
                 <!-- TMPL_IF Name="CGIsort1" -->
                     <!-- TMPL_VAR Name="CGIsort1" -->
                 <!-- TMPL_ELSE -->
                 <label for="sort1">Sort field 1</label>
                     <input type="text" id="sort1" size="20" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->" />
                 <!--/TMPL_IF -->
-            </p>
-            <p>
+            </li>
+            <li>
                 <!-- TMPL_IF Name="CGIsort2" -->
                     <!-- TMPL_VAR Name="CGIsort2" -->
                 <!-- TMPL_ELSE -->
                 <label for="sort2">Sort field 2</label>
                     <input type="text" id="sort2" size="20" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->" />
                 <!--/TMPL_IF -->
-            </p>
+            </li></ol>
     </fieldset>
     <p>
         <input type="button" value="OK" onclick="check(this.form)" />
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 8c483f4d3d..db9eba99bc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl
@@ -4,7 +4,7 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
+<!-- TMPL_INCLUDE NAME="acquisitions-search.inc" -->
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; Receipt order for : <!-- TMPL_VAR NAME="name" --> <!-- TMPL_IF NAME="invoice" -->Parcel <!-- TMPL_VAR NAME="invoice" --><!-- /TMPL_IF --> (order #<!-- TMPL_VAR NAME="ordernumber" -->)</div>
 
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 a2af92ebd5..6c705913f2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl
@@ -5,7 +5,7 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
+<!-- TMPL_INCLUDE NAME="acquisitions-search.inc" -->
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo;  <!-- 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>
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 bbf1089d98..002d8c18cc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl
@@ -4,7 +4,7 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
+<!-- TMPL_INCLUDE NAME="acquisitions-search.inc" -->
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; Receive parcel from supplier <!-- TMPL_VAR NAME="name" --></div>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tmpl
index 33d74107c5..fe5ccf7e42 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tmpl
@@ -4,7 +4,7 @@
 </head>   
 <body>  
 <!-- TMPL_INCLUDE NAME="header.inc" -->                                   
-<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
+<!-- TMPL_INCLUDE NAME="acquisitions-search.inc" -->
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; Budgets and Bookfunds: Spent</div>
 
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 a4615c3ee1..46bb6d0c62 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl
@@ -13,17 +13,17 @@ function confirm_deletion() {
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
+<!-- TMPL_INCLUDE NAME="acquisitions-search.inc" -->
 
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <!--TMPL_IF Name="enter"--><!-- TMPL_IF name="id" --> <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR NAME="id" -->"><!-- TMPL_VAR NAME="name" --></a> &rsaquo; Update: <!-- TMPL_VAR NAME="name" --><!-- TMPL_ELSE -->Add supplier<!-- /TMPL_IF --> <!-- /TMPL_IF --></div>
 
-
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo;     <!--TMPL_IF Name="enter"--><!-- TMPL_IF name="id" -->Update: <!-- TMPL_VAR NAME="name" --><!-- TMPL_ELSE -->Add supplier<!-- /TMPL_IF --> <!-- /TMPL_IF --></div>
-
-<div id="doc3" class="yui-t2">
+<div id="doc" class="yui-t7">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b">
+	<div class="yui-g">
+	
+<!-- TMPL_INCLUDE NAME="acquisitions-toolbar.inc" -->
 	
 <!--TMPL_IF Name="enter"-->
     <form action="updatesupplier.pl" method="post">
@@ -35,158 +35,154 @@ function confirm_deletion() {
     <!-- TMPL_ELSE -->
         <h1>Add supplier</h1>
     <!-- /TMPL_IF -->
-        <fieldset>
+        <fieldset class="rows">
             <legend>Company details</legend>
-            <p><label for="company">Company Name</label>
-                <input type="text" size="40" id="company" name="company" value="<!-- TMPL_VAR NAME="name" -->" /></p>
-            <p><label for="company_postal">Postal Address</label>
-                    <textarea id="company_postal" name="company_postal" cols="40" rows="3"><!-- TMPL_VAR NAME="postal" --></textarea></p>
-            <p><label for="physical">Physical Address</label>
-                <textarea id="physical" name="physical" cols="40" rows="3"><!-- TMPL_VAR NAME="address1" --><!-- TMPL_VAR NAME="address2" --><!-- TMPL_VAR NAME="address3" --><!-- TMPL_VAR NAME="address4" --></textarea></p>
-            <p><label for="company_phone">Phone</label>
-                <input type="text" size="20" id="company_phone" name="company_phone" value="<!-- TMPL_VAR NAME="phone" -->" /></p>
-            <p><label for="company_fax">Fax</label>
-                <input type="text" size="20" id="company_fax" name="company_fax" value="<!-- TMPL_VAR NAME="fax" -->" /></p>
-            <p><label for="website">Website</label>
-                <input type="text" size="40" id="website" name="website" value="<!-- TMPL_VAR NAME="url" -->" /></p>
+            <ol><li><label for="company">Company Name</label>
+                <input type="text" size="40" id="company" name="company" value="<!-- TMPL_VAR NAME="name" -->" /></li>
+            <li><label for="company_postal">Postal Address</label>
+                    <textarea id="company_postal" name="company_postal" cols="40" rows="3"><!-- TMPL_VAR NAME="postal" --></textarea></li>
+            <li><label for="physical">Physical Address</label>
+                <textarea id="physical" name="physical" cols="40" rows="3"><!-- TMPL_VAR NAME="address1" --><!-- TMPL_VAR NAME="address2" --><!-- TMPL_VAR NAME="address3" --><!-- TMPL_VAR NAME="address4" --></textarea></li>
+            <li><label for="company_phone">Phone</label>
+                <input type="text" size="20" id="company_phone" name="company_phone" value="<!-- TMPL_VAR NAME="phone" -->" /></li>
+            <li><label for="company_fax">Fax</label>
+                <input type="text" size="20" id="company_fax" name="company_fax" value="<!-- TMPL_VAR NAME="fax" -->" /></li>
+            <li><label for="website">Website</label>
+                <input type="text" size="40" id="website" name="website" value="<!-- TMPL_VAR NAME="url" -->" /></li></ol>
         </fieldset>
-        <fieldset>
+        <fieldset class="rows">
             <legend>Contact details</legend>
-            <p><label for="company_contact_name">Contact Name</label>
-                <input type="text" size="40" id="company_contact_name" name="company_contact_name" value="<!-- TMPL_VAR NAME="contact" -->" /></p>
-            <p><label for="company_contact_position">Position</label>
-                <input type="text" size="40" id="company_contact_position" name="company_contact_position" value="<!-- TMPL_VAR NAME="contpos" -->" /></p>
-            <p><label for="contact_phone">Phone</label>
-                <input type="text" size="20" id="contact_phone" name="contact_phone" value="<!-- TMPL_VAR NAME="contphone" -->" /> </p>
-            <p><label for="contact_phone_2">Alternative phone</label>
-                <input type="text" size="20" id="contact_phone_2" name="contact_phone_2" value="<!-- TMPL_VAR NAME="contaltphone" -->" /></p>
-            <p><label for="contact_fax">Fax</label>
-                <input type="text" size="20" id="contact_fax" name="contact_fax" value="<!-- TMPL_VAR NAME="contfax" -->" /></p>
-            <p><label for="company_email">E-mail</label>
-                <input type="text" size="40" id="company_email" name="company_email" value="<!-- TMPL_VAR NAME="contemail" -->" /></p>
-            <p><label for="contact_notes">Notes</label>
-                <textarea id="contact_notes" name="contact_notes" cols="40" rows="4"><!-- TMPL_VAR NAME="contnotes" --></textarea></p>
+           <ol> <li><label for="company_contact_name">Contact Name</label>
+                <input type="text" size="40" id="company_contact_name" name="company_contact_name" value="<!-- TMPL_VAR NAME="contact" -->" /></li>
+            <li><label for="company_contact_position">Position</label>
+                <input type="text" size="40" id="company_contact_position" name="company_contact_position" value="<!-- TMPL_VAR NAME="contpos" -->" /></li>
+            <li><label for="contact_phone">Phone</label>
+                <input type="text" size="20" id="contact_phone" name="contact_phone" value="<!-- TMPL_VAR NAME="contphone" -->" /> </li>
+            <li><label for="contact_phone_2">Alternative phone</label>
+                <input type="text" size="20" id="contact_phone_2" name="contact_phone_2" value="<!-- TMPL_VAR NAME="contaltphone" -->" /></li>
+            <li><label for="contact_fax">Fax</label>
+                <input type="text" size="20" id="contact_fax" name="contact_fax" value="<!-- TMPL_VAR NAME="contfax" -->" /></li>
+            <li><label for="company_email">E-mail</label>
+                <input type="text" size="40" id="company_email" name="company_email" value="<!-- TMPL_VAR NAME="contemail" -->" /></li>
+            <li><label for="contact_notes">Notes</label>
+                <textarea id="contact_notes" name="contact_notes" cols="40" rows="4"><!-- TMPL_VAR NAME="contnotes" --></textarea></li></ol>
         </fieldset>
-        <fieldset>
+        <fieldset class="rows">
             <legend>Ordering information</legend>
-            <p><strong>Supplier is</strong>
+            <ol class="radio"><li><label for="activestatus" class="radio">Supplier is:</label>
                     <!-- TMPL_IF name="active" -->
-                        <input type="radio" id="activestatus" name="status" value="1" checked="checked" /><label for="activestatus">Active</label>
-                        <input type="radio" id="inactivestatus" name="status" value="0" /><label for="inactivestatus">Inactive</label>
+                        <label for="activestatus">Active</label> <input type="radio" id="activestatus" name="status" value="1" checked="checked" />
+                        <label for="inactivestatus">Inactive</label> <input type="radio" id="inactivestatus" name="status" value="0" />
                     <!-- TMPL_ELSE -->
-                        <input type="radio" id="activestatus" name="status" value="1" /><label for="activestatus">Active</label>
-                        <input type="radio" id="inactivestatus" name="status" value="0" checked="checked" /><label for="inactivestatus">Inactive</label>
-                    <!-- /TMPL_IF --></p>
-            <p><label for="publishers_imprints">Preferred publishers</label>
-                <textarea id="publishers_imprints" name="publishers_imprints" cols="40" rows="3"><!-- TMPL_VAR NAME="specialty" --></textarea></p>
-            <p><label for="list_currency">List Prices are</label>
+                        <label for="activestatus">Active</label> <input type="radio" id="activestatus" name="status" value="1" />
+                        <label for="inactivestatus">Inactive</label> <input type="radio" id="inactivestatus" name="status" value="0" checked="checked" />
+                    <!-- /TMPL_IF --></li>
+			</ol>
+			<ol>
+            <li><label for="publishers_imprints">Preferred publishers</label>
+                <textarea id="publishers_imprints" name="publishers_imprints" cols="40" rows="3"><!-- TMPL_VAR NAME="specialty" --></textarea></li>
+            <li><label for="list_currency">List Prices are</label>
                     <select name="list_currency" id="list_currency">
                     <!-- TMPL_LOOP NAME="loop_pricescurrency" -->
                         <!-- TMPL_VAR NAME="currency" -->
                     <!-- /TMPL_LOOP -->
-                    </select></p>
-            <p><label for="invoice_currency">Invoice Prices are</label>
+                    </select></li>
+            <li><label for="invoice_currency">Invoice Prices are</label>
                     <select name="invoice_currency" id="invoice_currency">
                     <!-- TMPL_LOOP NAME="loop_invoicecurrency" -->
                         <!-- TMPL_VAR NAME="currency" -->
                     <!-- /TMPL_LOOP -->
-                    </select></p>
-            <!-- TMPL_IF NAME="GST" --><p><strong>GST Registered</strong>
+                    </select></li>
+            <!-- TMPL_IF NAME="GST" --><li>GST Registered
 				<!-- TMPL_IF name="gstreg" -->
 					<input type="radio" name="gst" id="gstyes" value="1" checked="checked" /><label for="gstyes">Yes</label>
                     <input type="radio" name="gst" id="gstno" value="0" /><label for="gstno">No</label>
 				<!-- TMPL_ELSE -->
                     <input type="radio" name="gst" id="gstyes" value="1" /><label for="gstyes">Yes</label>
                     <input type="radio" name="gst" id="gstno" value="0" checked="checked" /><label for="gstno">No</label>
-				<!-- /TMPL_IF --></p><!-- TMPL_ELSE --><input type="hidden" name="gst" value="0" /><!-- /TMPL_IF -->
+				<!-- /TMPL_IF --></li><!-- TMPL_ELSE --><input type="hidden" name="gst" value="0" /><!-- /TMPL_IF -->
 			
-            <!-- TMPL_IF NAME="GST" --><p><strong>Ordering prices</strong>
+            <!-- TMPL_IF NAME="GST" --><li>Ordering prices
 				<!-- TMPL_IF name="listincgst" -->
 					<input type="radio" id="list_gstyes" name="list_gst" value="1" checked="checked" /><label for="list_gstyes">include GST</label>
                     <input type="radio" id="list_gstno" name="list_gst" value="0" /><label for="list_gstno">don't include GST</label>
 				<!-- TMPL_ELSE -->
                     <input type="radio" id="list_gstyes" name="list_gst" value="1" /><label for="list_gstyes">include GST</label>
                     <input type="radio" id="list_gstno" name="list_gst" value="0" checked="checked" /><label for="list_gstno">don't include GST</label>
-				<!-- /TMPL_IF --></p><!-- TMPL_ELSE --><input type="hidden" name="list_gst" value="0" /><!-- /TMPL_IF -->
+				<!-- /TMPL_IF --></li><!-- TMPL_ELSE --><input type="hidden" name="list_gst" value="0" /><!-- /TMPL_IF -->
 			
-            <!-- TMPL_IF NAME="GST" --><p><strong>Invoice prices</strong>
+            <!-- TMPL_IF NAME="GST" --><li>Invoice prices
 				<!-- TMPL_IF name= "invoiceincgst" -->
                     <input type="radio" id="invoice_gstyes" name="invoice_gst" value="1" checked="checked" /><label for="invoice_gstyes">include GST</label>
                     <input type="radio" id="invoice_gstno" name="invoice_gst" value="0" /><label for="invoice_gstno">don't include GST</label>
 					<!-- TMPL_ELSE -->
                     <input type="radio" id="invoice_gstyes" name="invoice_gst" value="1"><label for="invoice_gstyes">include GST</label>
                     <input type="radio" id="invoice_gstno" name="invoice_gst" value="0" checked="checked" /><label for="invoice_gstno">don't include GST</label>
-				<!-- /TMPL_IF --></p><!-- TMPL_ELSE --><input type="hidden"  name="invoice_gst" value="0" /><!-- /TMPL_IF -->
-            <p><label for="discount">Discount</label>
-                <input type="text" size="3" id="discount" name="discount" value="<!-- TMPL_VAR NAME="discount" -->" /> %</p>
-            <p><label for="notes">Notes</label>
-                <textarea cols="40" rows="4" id="notes" name="notes" ><!-- TMPL_VAR NAME="notes" --></textarea></p>
+				<!-- /TMPL_IF --></li><!-- TMPL_ELSE --><input type="hidden"  name="invoice_gst" value="0" /><!-- /TMPL_IF -->
+            <li><label for="discount">Discount</label>
+                <input type="text" size="3" id="discount" name="discount" value="<!-- TMPL_VAR NAME="discount" -->" /> %</li>
+            <li><label for="notes">Notes</label>
+                <textarea cols="40" rows="4" id="notes" name="notes" ><!-- TMPL_VAR NAME="notes" --></textarea></li></ol>
         </fieldset>
         <p><input type="submit" value="Save" /></p>
     </form>
 <!--TMPL_ELSE-->
     <h1>Information for : <!-- TMPL_VAR NAME="name" --></h1>
-    <div id="action">
-<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>
+
         <div id="supplier-company-details">
             <h3>Company details</h3>
-            <p>Company Name
+            <p><strong>Company Name: </strong>
                 <!-- TMPL_VAR NAME="name" --></p>
-            <p>Postal Address
+            <p><strong>Postal Address: </strong>
                     <!-- TMPL_VAR NAME="postal" --></p>
-            <p>Physical Address
+            <p><strong>Physical Address: </strong>
                 <!-- TMPL_VAR NAME="address1" --><!-- TMPL_VAR NAME="address2" --><!-- TMPL_VAR NAME="address3" --><!-- TMPL_VAR NAME="address4" --></p>
-            <p>Phone
+            <p><strong>Phone: </strong>
                 <!-- TMPL_VAR NAME="phone" --></p>
-            <p>Fax
+            <p><strong>Fax: </strong>
                 <!-- TMPL_VAR NAME="fax" --></p>
-            <p>Website
-                <!-- TMPL_VAR NAME="url" --></p>
+           <!-- TMPL_IF NAME="url" --> <p><strong>Web site: </strong>
+                <a href="<!-- TMPL_VAR NAME="url" -->"><!-- TMPL_VAR NAME="url" --></a></p><!-- /TMPL_IF -->
         </div>
         <div id="supplier-contact-details">
             <h3>Contact details</h3>
-            <p>Contact name
+            <p><strong>Contact name: </strong>
                 <!-- TMPL_VAR NAME="contact" --></p>
-            <p>Position
+            <p><strong>Position: </strong>
                 <!-- TMPL_VAR NAME="contpos" --></p>
-            <p>Phone
+            <p><strong>Phone: </strong>
                 <!-- TMPL_VAR NAME="contphone" --></p>
-            <p>Alternative phone
+            <p><strong>Alternative phone: </strong>
                 <!-- TMPL_VAR NAME="contaltphone" --></p>
-            <p>Fax
+            <p><strong>Fax: </strong>
                 <!-- TMPL_VAR NAME="contfax" --></p>
-            <p>E-mail
-                <!-- TMPL_VAR NAME="contemail" --></p>
-            <p>Notes
+            <!-- TMPL_IF NAME="contemail" --><p><strong>E-mail: </strong>
+                <a href="mailto:<!-- TMPL_VAR NAME="contemail" -->"><!-- TMPL_VAR NAME="contemail" --></a></p><!-- /TMPL_IF -->
+            <p><strong>Notes: </strong>
                 <!-- TMPL_VAR NAME="contnotes" --></p>
         
         </div>
         <div id="supplier-ordering-information">
         <h3>Ordering information</h3>
-            <p>Supplier is
+            <p><strong>Supplier is: </strong>
                     <!-- TMPL_IF name="active" -->
                         Active
                     <!-- TMPL_ELSE -->
                         Inactive
                     <!-- /TMPL_IF --></p>
-            <p>Publishers and Imprints
+            <p><strong>Publishers and Imprints: </strong>
                 <!-- TMPL_VAR NAME="specialty" --></p>
-            <p>List Prices are<!--TMPL_VAR Name="listprice"--></p>
-            <p>Invoice Prices are<!--TMPL_VAR Name="invoiceprice"--></p>
-            <p>GST Registered
+            <p><strong>List Prices are: </strong><!--TMPL_VAR Name="listprice"--></p>
+            <p><strong>Invoice Prices are: </strong><!--TMPL_VAR Name="invoiceprice"--></p>
+            <p><strong>GST Registered: </strong>
                     <!-- TMPL_IF name="gstreg" -->Yes<!--TMPL_ELSE-->No<!-- /TMPL_IF --></p>
-            <p>List Item Price Includes GST
+            <p><strong>List Item Price Includes GST: </strong>
                     <!-- TMPL_IF name="listincgst" -->Yes<!--TMPL_ELSE-->No<!-- /TMPL_IF --></p>
-            <p>Invoice Item Price Includes GST
+            <p><strong>Invoice Item Price Includes GST: </strong>
                     <!-- TMPL_IF name= "invoiceincgst" -->Yes<!--TMPL_ELSE-->No<!-- /TMPL_IF --></p>
-            <p>Discount
+            <p><strong>Discount: </strong>
                 <!-- TMPL_VAR NAME="discount" --> %</p>
-            <p>Notes
+            <p><strong>Notes: </strong>
                 <!-- TMPL_VAR NAME="notes" --></p>
         </div>
 
@@ -194,8 +190,5 @@ function confirm_deletion() {
 
 </div>
 </div>
-<div class="yui-b">
-<!-- TMPL_INCLUDE NAME="acquisitions-menu.inc" -->
-</div>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl
index a287d10afd..53c8b5a612 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,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Authorities</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-</head>
-<body>
-<!-- TMPL_INCLUDE NAME="header.inc" -->
-
 <script language="JavaScript" type="text/javascript">
 function Help() {
     newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
@@ -20,12 +16,20 @@ function searchauthority() {
     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>
+</head>
+<body>
+<!-- TMPL_INCLUDE NAME="header.inc" -->
+<!-- TMPL_INCLUDE NAME="authorities-search.inc" -->
 
-<div id="doc3" class="yui-t2">
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Authorities</div>
+
+<div id="doc" class="yui-t7">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-g">
+	
+	<!-- TMPL_INCLUDE NAME="authorities-toolbar.inc" -->
 
 <fieldset id="authorities_authorities_home_search">
   <legend>Authority search</legend>
@@ -90,28 +94,8 @@ function searchauthority() {
   </form>
 </fieldset>
     
-<fieldset id="authorities_authorities_home_add">
-  <legend>Add authority</legend>
 
-  <form name="f2" method="post" action="authorities.pl">
-    <p><label for="add_authtypecode">Authority type</label>
-        <select id="add_authtypecode" name="authtypecode">
-<!-- TMPL_LOOP name="authtypesloop" -->
-  <!-- TMPL_IF name="selected" -->
-        <option value="<!-- TMPL_VAR name="value" -->" selected="selected"><!-- TMPL_VAR name="authtypetext" --></option>
-  <!-- TMPL_ELSE -->
-        <option value="<!-- TMPL_VAR name="value" -->"><!-- TMPL_VAR name="authtypetext" --></option>
-  <!-- /TMPL_IF -->
-<!-- /TMPL_LOOP -->
-        </select>
-    </p>
-    <div id="action">
-      <input type="submit" value="Add" class="button" />
-    </div>
-  </form>
-</fieldset>
 
-</div>
 </div>
 </div>
 
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 f55aae7d26..6855402ecf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl
@@ -2,6 +2,7 @@
 <Title>Koha -- Authority details</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script type="text/javascript">
+function _(s) { return s } // dummy function for gettext
 function active(numlayer)
 {
 	for (i=0; i < 10 ; i++ ) {
@@ -157,18 +158,6 @@ function unHideSubfield(index,labelindex) {
 	label.style.display='none';	
 }
 
-</script>
-
-</head>
-<body>
-<!-- TMPL_INCLUDE NAME="header.inc" -->
-
-
-<script language="JavaScript" type="text/javascript">
-function Help() {
-    newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
-}
-
 function addauthority() {
     X = document.forms[0].authtype.value;
     window.location="/cgi-bin/koha/authorities/authorities.pl?authtypecode="+X;
@@ -179,12 +168,17 @@ function searchauthority() {
     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>
+</head>
+<body>
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<div id="doc3" class="yui-t2">
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a> &rsaquo; <!-- TMPL_IF name="authid" -->Modify authority #<!-- TMPL_VAR NAME="authid" --> (<!-- TMPL_VAR name="authtypetext" -->)<!-- TMPL_ELSE -->Adding authority (<!-- TMPL_VAR name="authtypetext" -->)<!-- /TMPL_IF -->  </div>
+
+<div id="doc" class="yui-t7">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-g">
 
 <!-- TMPL_IF name="authid" -->
   <h1>Modify authority #<!-- TMPL_VAR NAME="authid" --> (<!-- TMPL_VAR name="authtypetext" -->)</h1>
@@ -303,9 +297,7 @@ function searchauthority() {
 	</form>
 </fieldset>
 
-</div>
 </div>
 </div>
 
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
index b76b757c0c..a6be6b700a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
@@ -160,9 +160,10 @@ function confirm_deletion(count) {
 		</ul>
 		</div>
 		
-		<div class="yui-u">
-<!-- TMPL_IF NAME="AmazonContent" --><a href="http://www.amazon.com/gp/reader/<!-- TMPL_VAR NAME="isbn" -->/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img border="0" src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="isbn" -->.01._PIdp-schmooS,TopRight,7,-26_SCMZZZZZZZ_.jpg" alt="Book Cover Image" /></a><!-- /TMPL_IF -->
-</div>
+<!-- TMPL_IF NAME="AmazonContent" -->
+		<!-- TMPL_IF NAME="AmazonISBN" --><div class="yui-u"><a href="http://www.amazon.com/gp/reader/<!-- TMPL_VAR NAME="isbn" -->/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img border="0" src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="isbn" -->.01._PIdp-schmooS,TopRight,7,-26_SCMZZZZZZZ_.jpg" alt="Book Cover Image" /></a>
+</div><!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
 		
 		<div class="yui-u">
 		<ul>
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 7bef6899fb..8a5b770579 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl
@@ -13,12 +13,10 @@
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Cataloguing</div>
 
-<div id="doc3" class="yui-t2">
+<div id="doc" class="yui-t7">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b">
-
 	<!-- TMPL_IF name="noitemsfound" -->
 		No items found
 	<!-- /TMPL_IF -->
@@ -160,8 +158,6 @@
     <!-- /TMPL_IF -->
 </div>
 <!-- /TMPL_IF -->
-
-</div>
 </div>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file