From 33f8001652470fbb407414453493cd78656f363e Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Mon, 24 Sep 2007 15:16:45 -0500
Subject: [PATCH] Cleaning up acquisitions, adding breadcrumbs, adding resident
 search. Other minor corrections.

Signed-off-by: Chris Cormack <crc@liblime.com>
---
 acqui/neworderempty.pl                        |   2 +
 .../prog/en/css/staff-global.css              |   2 +-
 .../prog/en/includes/acquisitions-menu.inc    |   7 +
 .../prog/en/includes/circ-search.inc          |   8 +
 .../en/includes/suggestions-add-search.inc    |  35 ++
 .../en/lib/jquery/plugins/jquery.tabs.css     |   1 +
 .../prog/en/modules/acqui/acqui-home.tmpl     |  28 +-
 .../prog/en/modules/acqui/basket.tmpl         |  39 ++-
 .../prog/en/modules/acqui/bookfund.tmpl       | 136 +++----
 .../prog/en/modules/acqui/booksellers.tmpl    |  26 +-
 .../prog/en/modules/acqui/histsearch.tmpl     |  30 +-
 .../prog/en/modules/acqui/lateorders.tmpl     |  42 ++-
 .../prog/en/modules/acqui/neworderbiblio.tmpl |  17 +-
 .../prog/en/modules/acqui/neworderempty.tmpl  | 146 ++++----
 .../en/modules/acqui/newordersuggestion.tmpl  |  32 +-
 .../prog/en/modules/acqui/orderreceive.tmpl   |  53 ++-
 .../prog/en/modules/acqui/parcel.tmpl         |  28 +-
 .../prog/en/modules/acqui/parcels.tmpl        |  71 ++--
 .../prog/en/modules/acqui/spent.tmpl          | 137 +++-----
 .../prog/en/modules/acqui/supplier.tmpl       | 331 +++++++-----------
 .../prog/en/modules/catalogue/detail.tmpl     |   2 +-
 .../prog/en/modules/circ/branchtransfers.tmpl |  27 +-
 22 files changed, 521 insertions(+), 679 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc

diff --git a/acqui/neworderempty.pl b/acqui/neworderempty.pl
index d1a21a583d..5d1321ad9f 100755
--- a/acqui/neworderempty.pl
+++ b/acqui/neworderempty.pl
@@ -159,6 +159,7 @@ foreach my $thisitemtype (sort keys %$itemtypes) {
 
 my $CGIitemtype = CGI::scrolling_list(
     -name     => 'format',
+	-id          => 'format',
     -values   => \@itemtypesloop,
     -default  => $data->{'itemtype'},
     -labels   => \%itemtypesloop,
@@ -202,6 +203,7 @@ for ( my $i = 0 ; $i < $count2 ; $i++ ) {
 }
 my $CGIbookfund = CGI::scrolling_list(
     -name     => 'bookfund',
+	-id         => 'bookfund',
     -values   => \@select_bookfund,
     -default  => $data->{'bookfundid'},
     -labels   => \%select_bookfunds,
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 3385518854..47c9a2bc8c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -258,7 +258,7 @@ div#header_search ul.link-tabs li.off a {
 	padding : 0.1em .5em .2em .5em;
 }
 
-div#circ_search,div#catalog_search,div#patron_search,div#subscription_search,div#addbooks_search,div#notices_search,div#printer_search {
+div#circ_search,div#catalog_search,div#patron_search,div#subscription_search,div#addbooks_search,div#notices_search,div#printer_search,div#checkin_search,div#suggestions_search {
 	border : 0;
 	border-bottom : 1px solid #FF9900;
 	padding : 0 0 .2em 0;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc
new file mode 100644
index 0000000000..5668ee9f59
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc
@@ -0,0 +1,7 @@
+<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>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
index 76629a5d75..c4da0b0a7e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
@@ -10,6 +10,13 @@
 	<input value="Submit" type="submit" />
 	</form>
 	</div>	
+	<div id="checkin_search">
+	<p class="tip">Scan a barcode to check in:</p>
+	<form method="post" action="/cgi-bin/koha/circ/returns.pl">
+		<input name="barcode" id="ret_barcode" size="40" maxlength="14" />
+	    <input value="Submit" type="submit" />
+    </form>
+	</div>
 	<div id="catalog_search">
 	<p class="tip">Enter search keywords:</p>
 		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
@@ -19,6 +26,7 @@
 	</div>
 			<ul>
 			<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check Out</a></li>
+			<li><a href="/cgi-bin/koha/circ/returns.pl#checkin_search">Check In</a></li>
 			<li><a href="/cgi-bin/koha/catalogue/advsearch.pl#catalog_search">Search the Catalog</a></li>
 			</ul>	
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
new file mode 100644
index 0000000000..d6fcfa446a
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
@@ -0,0 +1,35 @@
+<!-- Begin Members Resident Search Box -->
+<div id="header_search">
+	<div id="suggestions_search">
+	<p class="tip">Suggestions Search:</p>
+	<form action="/cgi-bin/koha/acqui/newordersuggestion.pl" method="get">
+	<label for="searchtitle">Title:</label> <input type="text" id="searchtitle" name="title" value="<!-- TMPL_VAR NAME="title"-->" />
+    <label for="searchauthor">Author:</label> <input type="text" id="searchauthor" name="author" value="<!-- TMPL_VAR NAME="author" -->" />
+    <label for="searchpublishercode">Publisher:</label> <input type="text" id="searchpublishercode" name="publishercode" value="<!-- TMPL_VAR NAME="publishercode"-->" />
+    <input type="submit" class="button" value="Search Suggestions" />
+        </form>
+	</div>
+	<div id="circ_search">
+	<p class="tip">Enter patron card number or partial name:</p>
+	<form action="/cgi-bin/koha/circ/circulation.pl" method="post">
+			<label for="findborrower"> </label>
+    <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
+	<input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
+    <input name="printer" value="" type="hidden" />
+	<input value="Submit" type="submit" />
+	</form>
+	</div>	
+	<div id="catalog_search">
+	<p class="tip">Enter search keywords:</p>
+		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
+			 <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
+				<input type="submit" name="op" id="opac-submit" value="Submit"  class="form-submit" />
+		</form>
+	</div>
+			<ul>
+			<li><a href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=<!-- TMPL_VAR NAME="supplierid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->#suggestions_search">Search Printers</a></li>
+			<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check Out</a></li>
+			<li><a href="/cgi-bin/koha/catalogue/advsearch.pl#catalog_search">Search the Catalog</a></li>
+			</ul>	
+</div>
+<!-- End Members Resident Search Box -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.tabs.css b/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.tabs.css
index 0ffac06d5b..eb721e6f47 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.tabs.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.tabs.css
@@ -49,6 +49,7 @@
 	border-bottom: 1px solid #FF9900;
 	border-left: 1px solid #FFCC66;
 	font-weight : bold;
+	text-align : center;
 	text-decoration : none;
 	top : -1px;
 }
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 fad281bb42..8c07b3abda 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,19 +4,20 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
+<!-- TMPL_INCLUDE NAME="cat-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>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 <h1>Acquisitions</h1>
 <div id="acqui_acqui_home_order">
     <fieldset>
-        <legend>Start, recieve, or modify any order</legend>
+        <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>
         <form name="findsupplier" action="/cgi-bin/koha/acqui/booksellers.pl" method="post">
@@ -26,7 +27,7 @@
         </form>
     <!-- TMPL_ELSE -->
         <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" />
+            <p><label for="supplier">Supplier: </label><input type="text" size="25" name="supplier" id="supplier" class="focus" />
             <input type="submit" value="Search" />
             </p>
         </form>
@@ -94,22 +95,22 @@
         <!-- TMPL_LOOP name="loop_budget" -->
             <tr>
                 <td><!-- TMPL_VAR name="bookfundname" --></td>
-                <td><a href="/cgi-bin/koha/admin/aqbudget.pl?op=add_form&aqbudgetid=<!--TMPL_VAR NAME="aqbudgetid"-->"><!-- TMPL_VAR name="budgetamount" --></a></td>
-                <td><a href="/cgi-bin/koha/acqui/spent.pl?bookfund=<!--TMPL_VAR NAME="bookfundid"-->&start=<!--TMPL_VAR NAME="sdate"-->&end=<!-- TMPL_VAR NAME="edate"-->"><!-- TMPL_VAR name="spent" --></a></td>
-                <td><a href="/cgi-bin/koha/acqui/bookfund.pl?bookfund=<!--TMPL_VAR NAME="bookfundid"-->&start=<!--TMPL_VAR NAME="sdate"-->&end=<!-- TMPL_VAR NAME="edate"-->"><!-- TMPL_VAR name="comtd" --></a></td>
+                <td><a href="/cgi-bin/koha/admin/aqbudget.pl?op=add_form&amp;aqbudgetid=<!--TMPL_VAR NAME="aqbudgetid"-->"><!-- TMPL_VAR name="budgetamount" --></a></td>
+                <td><a href="/cgi-bin/koha/acqui/spent.pl?bookfund=<!--TMPL_VAR NAME="bookfundid"-->&amp;start=<!--TMPL_VAR NAME="sdate"-->&amp;end=<!-- TMPL_VAR NAME="edate"-->"><!-- TMPL_VAR name="spent" --></a></td>
+                <td><a href="/cgi-bin/koha/acqui/bookfund.pl?bookfund=<!--TMPL_VAR NAME="bookfundid"-->&amp;start=<!--TMPL_VAR NAME="sdate"-->&amp;end=<!-- TMPL_VAR NAME="edate"-->"><!-- TMPL_VAR name="comtd" --></a></td>
                 <td><!-- TMPL_VAR name="avail" --></td>
             </tr>
         <!-- /TMPL_LOOP -->
         </tbody>
-        <tfooter>
+        <tfoot>
         <tr>
-            <th>Total</td>
+            <th>Total</th>
             <th><!-- TMPL_VAR name="total" --></th>
             <th><!-- TMPL_VAR name="totspent" --></th>
             <th><!-- TMPL_VAR name="totcomtd" --></th>
             <th><!-- TMPL_VAR name="totavail" --></th>
         </tr>
-        </tfooter>
+        </tfoot>
     </table>
     </div>
     <!-- /TMPL_IF -->
@@ -126,7 +127,8 @@
 
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="acquisitions-menu.inc" -->
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+</div>
+<!-- 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 f9c42fed13..eb418b8ee0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
@@ -1,41 +1,45 @@
 <!-- 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>
+<title>Koha &rsaquo; Acquisitions &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" --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_UNLESS name="closedate" -->
 <script type="text/javascript">
-            function confirm_close() {
+//<![CDATA[            function confirm_close() {
                 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" -->";
                 }
             }
+//]]>
         </script>
 		<!-- /TMPL_UNLESS -->
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
+<!-- TMPL_INCLUDE NAME="cat-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>
+
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
     <h1><!-- 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">
+
+    <!-- TMPL_IF NAME="basketno" --><div id="acqui_basket_summary">
         <h2>Basket Details</h2>
-        <p><label>Basket number </label> <!-- TMPL_VAR NAME="basketno" -->&nbsp;</p>
-        <p><label>Managed by </label> <!-- TMPL_VAR NAME="authorisedbyname" -->&nbsp;</p>
-        <p><label>Open on </label> <!-- TMPL_VAR NAME="creationdate" -->&nbsp;</p>
-        <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 -->
+        <p>Basket number  <!-- TMPL_VAR NAME="basketno" --></p>
+        <p>Managed by  <!-- TMPL_VAR NAME="authorisedbyname" --></p>
+        <p>Open on  <!-- TMPL_VAR NAME="creationdate" --></p>
+        <p>For  Supplier Id <!-- TMPL_VAR NAME="booksellerid" --></p>
+        <p>Invoice number <!-- TMPL_VAR NAME="booksellerinvoicenumber" --></p>
+        <!-- TMPL_IF name="closedate" --><p>Closed On:  <!-- TMPL_VAR name="closedate" --></p><!-- /TMPL_IF -->
         <!-- TMPL_UNLESS name="closedate" -->
         <p><a href="javascript:confirm_close()" class="button">Close this basket</a></p>
         <!-- /TMPL_UNLESS -->
-    </div>
+    </div><!-- /TMPL_IF -->
     
     <div id="acqui_basket_content">
     <h2>Order Details</h2>
@@ -49,7 +53,7 @@
                 <th>Est.</th>
                 <th>Qty.</th>
                 <th>Total</th>
-                <th class="DoNotPrint">
+                <th>
                     <a href="basket.pl?basketno=<!-- TMPL_VAR name="basketno" -->&amp;order=aqorderbreakdown.bookfundid,biblioitems.publishercode">Fund</a>
                 </th>
                 <!-- TMPL_IF name="active" -->
@@ -85,7 +89,7 @@
                     <td class="number"><!-- TMPL_VAR NAME="ecost" --></td>
                     <td class="number"><!-- TMPL_VAR NAME="quantity" --></td>
                     <td class="number"><!-- TMPL_VAR NAME="line_total" --></td>
-                    <td class="DoNotPrint"><!-- TMPL_VAR NAME="bookfundname" --></td>
+                    <td><!-- TMPL_VAR NAME="bookfundname" --></td>
                     <!-- TMPL_IF name="active" -->
                         <!-- TMPL_UNLESS name="closedate" -->
                         <td>
@@ -142,7 +146,7 @@
         <form action="/cgi-bin/koha/acqui/neworderbiblio.pl" method="post">
             <input type="hidden" name="booksellerid" value="<!-- TMPL_VAR NAME="booksellerid" -->" />
             <input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" />
-            <ul><li><label for="q">From an existing record: </label><input id="q" type="text"  size="25"   name="q" />
+            <ul><li><label for="q">From an existing record: </label><input id="q" type="text"  size="25" name="q" />
             <input type="submit" value="Search" /></li>
             <li><a href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->">From a Suggestion</a></li>
             <li><a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->">New Record</a></li>
@@ -153,7 +157,8 @@
 
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="acquisitions-menu.inc" -->
+</div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/bookfund.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/bookfund.tmpl
index d9d748e60b..404c1b582f 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/bookfund.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/bookfund.tmpl
@@ -1,120 +1,64 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->         
-<title>Koha &rsaquo; Acquisitions</title>                                     
+<title>Koha &rsaquo; Acquisitions &rsaquo; Book Funds</title>                                     
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->           
 </head>   
 <body>  
 <!-- TMPL_INCLUDE NAME="header.inc" -->                                   
-<!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->   
+<!-- TMPL_INCLUDE NAME="cat-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>
+
 <div id="doc3" class="yui-t2">                          
 <div id="bd">         
 <div id="yui-main">               
 <div class="yui-b">               
-<div class="yui-g"> 
-
-
-<table cellspacing="0" cellpadding="0" border="0" id="spent" class="collapse">
-<tr valign="top">
-   <td class="cell-header">
-	 	Title
-	</td>
-	<td class="cell-header">
-	 	Order
-	</td>
-	<td class="cell-header">
-	 	Itemtype
-	</td>
-	<td class="cell-header">
-		Left on Order
-	</td>
-	<td class="cell-header">
-		Estimated cost per unit
-	</td>
-	<td class="cell-header">
-		Budget Date
-	</td>
-	<td class="cell-header">
-		Subtotal
-	</td>
+ 
+
+<table id="spent">
+<tr>
+   <th>Title</th>
+	<th>Order</th>
+	<th>Itemtype</th>
+	<th>Left on Order</th>
+	<th>Estimated cost per unit</th>
+	<th>Budget Date</th>
+	<th>Subtotal</th>
 </tr>
 
 <!--TMPL_LOOP NAME="commitedloop"-->
 	<!--TMPL_IF name="toggle"-->
-		<tr valign="top" class="hilighted">
+		<tr class="hilighted">
 	<!--TMPL_ELSE-->
-		<tr valign="top" class="hilighted2">
+		<tr class="hilighted2">
 	<!--/TMPL_IF-->
-	<tr valign="top">
-		<td class="cell">
-			<!--TMPL_VAR NAME="title"-->	
-		</td>
-		<td class="cell">
-				<a href=/cgi-bin/koha/acqui/newbiblio.pl?ordnum=<!--TMPL_VAR NAME="ordnum"-->&booksellerid=<!--TMPL_VAR NAME="booksellerid"-->&basket=<!--TMPL_VAR NAME="basketno"-->><!--TMPL_VAR NAME="ordnum"--></a>
-		</td>
-		<td class="cell">
-			<!--TMPL_VAR NAME="itemtype"-->	
-		</td>
-		<td class="cell">
-			<!--TMPL_VAR NAME="left"-->	
-		</td>
-		<td class="cell">
-			<!--TMPL_VAR NAME="ecost"-->	
-		</td>
-		<td class="cell">
-			<!--TMPL_VAR NAME="budgetdate"-->	
-		</td>
-		<td class="cell">
-			<!--TMPL_VAR NAME="subtotal"-->		
-		</td>
+	<tr>
+		<td><!--TMPL_VAR NAME="title"-->	</td>
+		<td>	<a href="/cgi-bin/koha/acqui/newbiblio.pl?ordnum=<!--TMPL_VAR NAME="ordnum"-->&amp;booksellerid=<!--TMPL_VAR NAME="booksellerid"-->&amp;basket=<!--TMPL_VAR NAME="basketno"-->"><!--TMPL_VAR NAME="ordnum"--></a></td>
+		<td><!--TMPL_VAR NAME="itemtype"-->	</td>
+		<td><!--TMPL_VAR NAME="left"-->	</td>
+		<td><!--TMPL_VAR NAME="ecost"-->	</td>
+		<td><!--TMPL_VAR NAME="budgetdate"-->	</td>
+		<td><!--TMPL_VAR NAME="subtotal"-->		</td>
 </tr>
 <!--/TMPL_LOOP-->
 
-<tr valign="top">
-   <td class="cell-header">
-	 	Total
-	</td>
-	<td class="cell-header">
-	 	
-	</td>
-	<td class="cell-header">
-	 	
-	</td>
-	<td class="cell-header">
-		
-	</td>
-	<td class="cell-header">
-		
-	</td>
-	<td class="cell-header">
-		
-	</td>
-	<td class="cell-header">
-		<!--TMPL_VAR NAME="total"-->
-	</td>
+<tr>
+   <th>Total</th>
+	<th>&nbsp;</th>
+	<th>&nbsp;</th>
+	<th>&nbsp;</th>
+	<th>&nbsp;</th>
+	<th>&nbsp;</th>
+	<th><!--TMPL_VAR NAME="total"--></th>
 </tr>
 
 </table>
 
-
-</div>  
-</div>  
-</div>  
-</div>  
-</div>  
-                                                                           
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->                                     
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-
-
-
-
-
-
-
-
-
-
-
-
+</div>
+</div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="labels-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/acqui/booksellers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl
index 07ce985984..d688029789 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl
@@ -4,13 +4,15 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
+<!-- TMPL_INCLUDE NAME="cat-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>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 	
 <h1>You searched on <b>supplier <!-- TMPL_VAR name="supplier" -->,</b> <!-- TMPL_VAR name="count" --> results found</h1>
 <div id="acqui_order_supplierlist">
@@ -24,19 +26,16 @@
 	
 	<!-- TMPL_LOOP name="loop_suppliers" -->
 		<tr>
-			<td>
-				<!-- TMPL_IF name="active" -->
+			<td>	<!-- TMPL_IF name="active" -->
 					<a href="basket.pl?supplierid=<!-- TMPL_VAR name="supplierid" -->">Add order</a>
 				<!-- TMPL_ELSE -->
 					Inactive
 				<!-- /TMPL_IF -->
 			</td>
-			<td>
-				<a href="parcels.pl?supplierid=<!-- TMPL_VAR name="supplierid" -->">Receive order</a>
+			<td>	<a href="parcels.pl?supplierid=<!-- TMPL_VAR name="supplierid" -->">Receive order</a>
 			</td>
 			<td><a href="supplier.pl?supplierid=<!-- TMPL_VAR name="supplierid" -->"><!-- TMPL_VAR name="name" --></a></td>
-			<td>
-				<table>
+			<td>	<table>
 				    <!-- TMPL_IF NAME="loop_basket"-->
 						<tr>
 							<th>Basket</th>
@@ -49,13 +48,11 @@
 							<tr>
 								<td><!-- TMPL_VAR NAME="basketno" --></td>
 								<td><TMPL_VAR NAME="total"></td>
-								<td>
-									<!-- TMPL_VAR name="firstname" -->
+								<td>						<!-- TMPL_VAR name="firstname" -->
 										<!-- TMPL_VAR name="surname" -->
 								</td>
 								<td><!-- TMPL_VAR NAME="creationdate" --></td>
-								<td>
-									<!-- TMPL_IF name="closedate" -->
+								<td>						<!-- TMPL_IF name="closedate" -->
 										closed on <!-- TMPL_VAR NAME="closedate" -->
 										<a href="/cgi-bin/koha/acqui/basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->">View</a>
 									<!-- TMPL_ELSE -->
@@ -82,7 +79,8 @@
 </div>
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="acquisitions-menu.inc" -->
+</div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl
index f9e0143047..f412d57361 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl
@@ -1,26 +1,20 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Acquisitions order search</title>
+<title>Koha &rsaquo; Acquisitions &rsaquo; Order search</title>
 <!-- TMPL_INCLUDE NAME="doc-head-calendar.inc" -->
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- Additions to enable Calendar system -->
-<link rel="stylesheet" type="text/css" href="/intranet-tmpl/prog/en/lib/calendar/calendar-system.css" />
-<!-- End of additions -->
-
-<!-- Additions to enable Calendar system -->
-<script type="text/javascript" src="/intranet-tmpl/prog/en/lib/calendar/calendar.js"></script>
-<script type="text/javascript" src="/intranet-tmpl/prog/en/lib/calendar/calendar-en.js"></script>
-<script type="text/javascript" src="/intranet-tmpl/prog/en/lib/calendar/calendar-setup.js"></script>
-<!-- End of additions -->
+<!-- TMPL_INCLUDE NAME="calendar.inc" -->
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
+<!-- TMPL_INCLUDE NAME="cat-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>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 	
 
 
@@ -44,7 +38,7 @@
 					<th><input type="text" name="title" value="<!-- TMPL_VAR name="title"-->" /></th>
 					<th><input type="text" name="author" value="<!-- TMPL_VAR name="author" -->" /></th>
 					<th><input type="text" name="name" value="<!-- TMPL_VAR name="name" -->" /></th>
-					<th>From <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" border="0" hspace="0" vspace="0" id="openCalendarFrom" style="cursor: pointer;" alt="calendar" />
+					<th><label for="from">From</label> <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" border="0" id="openCalendarFrom" style="cursor: pointer;" alt="Show Calendar" />
 						<input type="text" readonly="readonly" size="10" id="from" name="fromplacedon" value="<!-- TMPL_VAR name="from_placed_on" -->" />
 						<script language="JavaScript" type="text/javascript">
 							function validate1(date) {
@@ -72,7 +66,7 @@
 								}
 							);
 						</script>
-						To <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" alt="calendar" />
+						<label for="to">To</label> <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" alt="Show Calendar" />
 						<input readonly="readonly" size="10" id="to" name="toplacedon" value="<!-- TMPL_VAR name="to_placed_on" -->" type="text" />
 						<script type="text/javascript">
 							function validate2(date) {
@@ -108,8 +102,7 @@
 			</tr>
 			<!-- TMPL_LOOP NAME="suggestions_loop" -->
 				<tr>
-					<td>
-					    <!-- TMPL_IF NAME="invoicenumber" -->
+					<td>		    <!-- TMPL_IF NAME="invoicenumber" -->
 					        <a href="/cgi-bin/koha/acqui/parcel.pl?invoice=<!-- TMPL_VAR NAME="invoicenumber"-->&amp;supplierid=<!-- TMPL_VAR NAME="id"-->&amp;datereceived=<!-- TMPL_VAR NAME="datereceived" -->">Parcel</a>
 					    <!-- TMPL_ELSE -->
 					        &nbsp;
@@ -131,7 +124,8 @@
 
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="acquisitions-menu.inc" -->
+</div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tmpl
index 19b8b43c5a..15f8d4486c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tmpl
@@ -1,16 +1,18 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Acquisitions</title>
+<title>Koha &rsaquo; Acquisitions &rsaquo; Late issues</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
+<!-- TMPL_INCLUDE NAME="cat-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>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 	
 <h1 ><!-- TMPL_IF name="Supplier" --><!-- TMPL_VAR name="Supplier" --> : <!--/TMPL_IF -->Late issues</h1>
 <div id="acqui_lateorders">
@@ -24,28 +26,29 @@
             <th>&nbsp;</th>
         </tr>
         <tr>
-            <td align="center" class="doNotPrint">
+            <td>
                 <form action="lateorders.pl" method="post">
-                <input align="right" size="4" maxlength="3" type="text" name="delay" value="<!--TMPL_VAR Name="delay" -->" /> days
+                <input size="4" maxlength="3" type="text" name="delay" value="<!--TMPL_VAR Name="delay" -->" /> days
             </td>
-            <td class="doNotPrint">
+            <td>
                     <!-- TMPL_VAR name="CGIsupplier" -->
             </td>
             <td colspan="2">
                     &nbsp;
             </td>
-            <td class="doNotPrint">
+            <td>
                 <input type="submit" value="filter" />
                 </form>
             </td>
-            <td class="doNotPrint">
-                <form name="claim" method="post">
+            <td>
+                <form action="lateorders.pl" name="claim" method="post">
                     <input type="hidden" name="op" value="send_alert" />
-                    <select name="letter_code" >
+                    <!-- TMPL_IF NAME="letters" --><select name="letter_code" id="letter_code">
                         <!--TMPL_LOOP Name="letters"-->
                             <option value="<!--TMPL_VAR Name="code"-->"><!--TMPL_VAR Name="name"--></option>
                         <!--/TMPL_LOOP -->
                     </select>
+					<!-- /TMPL_IF -->
                     <input type="submit" value="Claim Order" />
             </td>
         </tr>
@@ -59,10 +62,10 @@
                     <!-- TMPL_VAR name="orderdate" -->
                     (<!-- TMPL_VAR name="latesince" --> days)
                 </td>
-                <td class="doNotPrint">
+                <td>
                         <!-- TMPL_VAR name="supplier" -->
                 </td>
-                <td >
+                <td>
                     <b><!-- TMPL_VAR name="title" --></b>
                     <!-- TMPL_IF name="author" --><br/><i>Author:</i> <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF -->
                     <!-- TMPL_IF name="publisher" -->
@@ -72,19 +75,19 @@
                         <!-- /TMPL_IF -->
                     <!-- /TMPL_IF -->
                 </td>
-                <td align="right">
+                <td>
                     <!-- TMPL_VAR name="unitpricesupplier" -->x<!-- TMPL_VAR name="quantity" --> = 
                     <!-- TMPL_VAR name="subtotal" -->
                     <p title="budget"><!-- TMPL_VAR name="budget" --></p>
                 </td>
-                <td class="doNotPrint">
+                <td>
                     <p><a href="basket.pl?basketno=<!-- TMPL_VAR name="basketno" -->" title="basket">
                         <!-- TMPL_VAR name="basketno" -->
                     </a>
                     </p>
                     <p title="branch"><!-- TMPL_VAR name="branch" --></p>
                 </td>
-                <td class="doNotPrint">
+                <td>
                     <input type="checkbox" name="claim_for" value="<!--TMPL_VAR Name="ordernumber" -->" />
                 </td>
             </tr>
@@ -99,7 +102,7 @@
             <th>
                 <!-- TMPL_VAR name="total" -->
             </th>
-            <th class="doNotPrint"> &nbsp;</th>
+            <th> &nbsp;</th>
             <td>
                 <input type="submit" value="Claim Order" />
                 </form>
@@ -109,7 +112,8 @@
 </div>
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="acquisitions-menu.inc" -->
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+</div>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
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 6c1cd0db71..ae81a0a237 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl
@@ -1,18 +1,20 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Shopping basket for: <!-- TMPL_VAR name="bookselname" --></title>
+<title>Koha &rsaquo; Acquisitions &rsaquo; Search Existing Records</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
+<!-- TMPL_INCLUDE NAME="cat-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>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 	
-<h1>Shopping Basket For: <!-- TMPL_VAR name="bookselname" --></h1>
+<h1>Search Existing Records</h1>
 
 
 <!-- TMPL_IF NAME="total" -->
@@ -28,7 +30,7 @@
 <!-- TMPL_IF NAME="query_error" -->
 <br /><br />
 <b>Error :</b>
-<span  class="problem">
+<span class="problem">
     <!-- TMPL_VAR NAME="query_error" -->
 </span>
 <!-- /TMPL_IF -->
@@ -65,7 +67,8 @@
 
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="acquisitions-menu.inc" -->
+</div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
index 15b727b899..6accf54c2f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
@@ -1,8 +1,8 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Shopping Basket For: <!-- TMPL_VAR name="bookselname" --></title>
+<title>Koha &rsaquo; Acquisitions &rsaquo; Shopping Basket <!-- TMPL_VAR NAME="basketno" --> &rsaquo; <!-- TMPL_IF name="ordnum" -->Modify order details (line #<!-- TMPL_VAR NAME="ordnum" -->)<!-- TMPL_ELSE -->New order<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<script language="javascript">
-<!--
+<script type="text/javascript">
+//<![CDATA[
 function update(f){
 //collect values
 quantity=f.quantity.value
@@ -41,8 +41,6 @@ f.GST.value=GST;
 return true;
 }
 
-
-
 function messenger(X,Y,etc){
     win=window.open("","mess","height="+X+",width="+Y+",screenX=150,screenY=0");
     win.focus();
@@ -66,17 +64,20 @@ if (quantity ==0) {
 }
     document.frusin.submit();
 }
+//]]>
 </script>
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
+<!-- TMPL_INCLUDE NAME="cat-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>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 	
 
 <h1>
@@ -88,28 +89,22 @@ if (quantity ==0) {
         <!-- TMPL_IF name="suggestionid" -->(defined from suggestion #<!-- TMPL_VAR NAME="suggestionid" -->)<!-- /TMPL_IF -->
 </h1>
 
-<fieldset>
-    <legend>Basket Details</legend>
-    <p>
-        <!-- TMPL_IF name="basketno" -->
-            <label>Basket Number</label><!-- TMPL_VAR NAME="basketno" -->
-        <!-- TMPL_ELSE -->
-            New basket
-        <!-- /TMPL_IF -->
-        &nbsp;
-    </p>
-    <p><label>Managed By</label><!-- TMPL_VAR NAME="authorisedbyname" -->&nbsp;</p>
-    <p><label>Open On</label><!-- TMPL_VAR NAME="creationdate" -->&nbsp;</p>
-    <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 -->
-</fieldset>
+<!-- TMPL_IF name="basketno" -->
+<div id="basket-details">Basket Details
+    <p>Basket Number: <!-- TMPL_VAR NAME="basketno" --></p>
+    <p>Managed By: <!-- TMPL_VAR NAME="authorisedbyname" --></p>
+    <p>Open On: <!-- TMPL_VAR NAME="creationdate" --></p>
+    <p>ForSupplier Id: <!-- TMPL_VAR NAME="booksellerid" --></p>
+    <p>Invoice Number: <!-- TMPL_VAR NAME="booksellerinvoicenumber" --></p>
+    <!-- TMPL_IF name="closedate" --><p>Closed On: <!-- TMPL_VAR name="closedate" --></p><!-- /TMPL_IF -->
+</div>
+<!-- /TMPL_IF -->
 
 <form action="/cgi-bin/koha/acqui/addorder.pl" method="post" name="frusin">
     <fieldset>
         <legend>Catalogue details</legend>
         <!-- TMPL_UNLESS name="existing" -->
-            <input type="hidden" name="existing" value="no" />
+		<input type="hidden" name="existing" value="no" />
         <!-- /TMPL_UNLESS -->
         <input type="hidden" name="ordnum" value="<!-- TMPL_VAR NAME="ordnum" -->" />
         <input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" />
@@ -126,60 +121,66 @@ if (quantity ==0) {
             <input type="hidden" name="<!-- TMPL_VAR NAME="currency" -->" value="<!-- TMPL_VAR NAME="rate" -->" />
         <!-- /TMPL_LOOP -->
         <p>
-            <label><b>Title *</b></label>
             <!-- TMPL_IF name="biblio" -->
+			<strong>Title</strong>
                 <input type="hidden" size="20" name="title" value="<!-- TMPL_VAR NAME="title" -->" /><!-- TMPL_VAR NAME="title" -->
             <!-- TMPL_ELSE -->
-                <input type="text" size="20" name="title" value="<!-- TMPL_VAR NAME="title" -->" />
+            <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>
-            <label>Author</label>
             <!-- TMPL_IF name="biblio" -->
+			<strong>Author</strong>
                 <input type="hidden" size="20" name="author" value="<!-- TMPL_VAR NAME="author" -->" /><!-- TMPL_VAR NAME="author" -->
             <!-- TMPL_ELSE -->
-                <input type="text" size="20" name="author" value="<!-- TMPL_VAR NAME="author" -->" />
+            <label for="author">Author</label>
+                <input type="text" id="author" size="20" name="author" value="<!-- TMPL_VAR NAME="author" -->" />
             <!-- /TMPL_IF -->
         </p>
         <p>
-            <label> Publisher</label>
             <!-- TMPL_IF name="biblio" -->
+			<strong>Publisher</strong>
                 <input type="hidden" size="20" name="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->" /><!-- TMPL_VAR NAME="publishercode" -->
             <!-- TMPL_ELSE -->
-                <input type="text" size="20" name="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->" />
+            <label for="publishercode"> Publisher</label>
+                <input type="text" id="publishercode" size="20" name="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->" />
             <!-- /TMPL_IF -->
         </p>
         <p>
-            <label>Copyright Date</label>
             <!-- TMPL_IF name="biblio" -->
+			<strong>Copyright Date</strong>
                 <input type="hidden" size="20" name="copyrightdate" value="<!-- TMPL_VAR NAME="copyrightdate" -->" /><!-- TMPL_VAR NAME="copyrightdate" -->
             <!-- TMPL_ELSE -->
-                <input type="text" size="20" name="copyrightdate" value="<!-- TMPL_VAR NAME="copyrightdate" -->" />
+            <label for="copyrightdate">Copyright Date</label>
+                <input type="text" id="copyrightdate" size="20" name="copyrightdate" value="<!-- TMPL_VAR NAME="copyrightdate" -->" />
             <!-- /TMPL_IF -->
         </p>
         <p>
-            <label>Format</label>
+            <label for="format">Format</label>
             <!-- TMPL_VAR NAME="CGIitemtype" -->
         </p>
         <p>
-            <label>ISBN</label>
             <!-- TMPL_IF name="biblio" -->
+			<strong>ISBN</strong>
                 <input type="hidden" size="20" name="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->" /><!-- TMPL_VAR NAME="isbn" -->
             <!-- TMPL_ELSE -->
-                <input type="text" size="20" name="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->" />
+            <label for="ISBN">ISBN</label>
+                <input type="text" id="ISBN" size="20" name="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->" />
             <!-- /TMPL_IF -->
         </p>
         <p>
-            <label>Series</label>
             <!-- TMPL_IF name="biblio" -->
+			<strong>Series</strong>
                 <input type="hidden" size="20" name="series" value="<!-- TMPL_VAR NAME="seriestitle" -->" /><!-- TMPL_VAR NAME="seriestitle" -->
             <!-- TMPL_ELSE -->
-                <input type="text" size="20" name="series" value="<!-- TMPL_VAR NAME="seriestitle" -->" />
+            <label for="series">Series</label>
+                <input type="text" id="series" size="20" name="series" value="<!-- TMPL_VAR NAME="seriestitle" -->" />
             <!-- /TMPL_IF -->
         </p>
         <p>
-            <label>Branch</label>
-            <select name="branch">
+            <label for="branch">Branch</label>
+            <select name="branch" id="branch">
             <!-- TMPL_LOOP name="branchloop" -->
                 <!-- TMPL_IF NAME="selected" --><option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME="branchname" --></option>
 				<!-- TMPL_ELSE -->
@@ -192,94 +193,102 @@ if (quantity ==0) {
     <fieldset>
         <legend>Accounting details</legend>
             <p>
-                <label>Quantity</label>
                 <!-- TMPL_IF name="close" -->
+			<strong>Quantity</strong>
                     <input type="hidden" size="20" name="quantity" value="<!-- TMPL_VAR NAME="quantity" -->" /><!-- TMPL_VAR NAME="quantity" -->
                 <!-- TMPL_ELSE -->
-                    <input type="text" size="20" name="quantity" value="<!-- TMPL_VAR NAME="quantity" -->" onchange="update(this.form);" />
+                <label for="quantity">Quantity</label>
+                    <input type="text" id="quantity" size="20" name="quantity" value="<!-- TMPL_VAR NAME="quantity" -->" onchange="update(this.form);" />
                 <!--/TMPL_IF-->
             </p>
             <p>
-                <label>Bookfund</label>
                 <!-- TMPL_IF name="close" -->
+			<strong>Bookfund</strong>
                     <input type="hidden" size="20" name="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>
-                <label>Supplier price</label>
                 <!-- 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" -->
                 <!-- TMPL_ELSE -->
-                    <input type="text" size="20" name="list_price" value="<!-- TMPL_VAR NAME="listprice" -->" onchange="update(this.form)" />
+                <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)" />
                 <!--/TMPL_IF-->
             </p>
             <p>
-                <label>Replacement Cost </label>
                 <!-- TMPL_IF name="close" -->
+			<strong>Replacement Cost</strong>
                     <input type="hidden" size="20" name="rrp" value="<!-- TMPL_VAR NAME="rrp" -->" /><!-- TMPL_VAR NAME="rrp" -->
                 <!-- TMPL_ELSE -->
-                    <input type="text" size="20" name="rrp" value="<!-- TMPL_VAR NAME="rrp" -->" />
+                <label for="rrp">Replacement Cost </label>
+                    <input type="text" id="rrp" size="20" name="rrp" value="<!-- TMPL_VAR NAME="rrp" -->" />
                 <!--/TMPL_IF-->
             </p>
             <p>
-                <label>Budgeted Cost</label>
                 <!-- TMPL_IF name="close" -->
-                    <input type="text" size="20" name="ecost" value="<!-- TMPL_VAR NAME="ecost" -->" readonly="readonly"  />
+			<strong>Budgeted Cost</strong>
+                    <input type="text" id="" size="20" name="ecost" value="<!-- TMPL_VAR NAME="ecost" -->" readonly="readonly"  />
                 <!-- TMPL_ELSE -->
-                    <input type="text" size="20" name="ecost" value="<!-- TMPL_VAR NAME="ecost" -->" />
+                <label for="ecost">Budgeted Cost</label>
+                    <input type="text" id="ecost" size="20" name="ecost" value="<!-- TMPL_VAR NAME="ecost" -->" />
                 <!--/TMPL_IF-->
             </p>
             <!-- TMPL_IF NAME="GST"-->
             <p>
-                <label>Budgeted GST</label>
 				<!-- TMPL_IF name="close" -->
-                <input type="text" size="20" name="GST" value="" readonly="readonly" />
+			<strong>Budgeted GST</strong>
+                <input type="text" id="" size="20" name="GST" value="" readonly="readonly" />
 				<!-- TMPL_ELSE -->
-                <input type="text" size="20" name="GST" value="" />
+                <label for="GST">Budgeted GST</label>
+                <input type="text" id="GST" size="20" name="GST" value="" />
 				<!--/TMPL_IF-->
             </p>
             <!-- /TMPL_IF -->
             <p>
-                <label><b>Total</b></label>
                 <!-- TMPL_IF name="close" -->
-				<input type="text" size="20" name="total" value="<!-- TMPL_VAR name="total" -->" readonly="readonly" />
+			<strong>Total</strong>
+				<input type="text" id="" size="20" name="total" value="<!-- TMPL_VAR name="total" -->" readonly="readonly" />
 				<!-- TMPL_ELSE -->
-                <input type="text" size="20" name="total" value="<!-- TMPL_VAR name="total" -->" />
+                <label for="total"><strong>Total</strong></label>
+                <input type="text" id="total" size="20" name="total" value="<!-- TMPL_VAR name="total" -->" />
 				<!--/TMPL_IF-->
             </p>
             <p>
-                <label>Actual Cost</label>
 				<!-- TMPL_IF name="close" -->
-                <input type="text" size="20" name="cost" value="<!-- TMPL_VAR name="ecost"-->" readonly="readonly" />
+			<strong>Actual Cost</strong>
+                <input type="text" id="" size="20" name="cost" value="<!-- TMPL_VAR name="ecost"-->" readonly="readonly" />
 				<!-- TMPL_ELSE -->
-                <input type="text" size="20" name="cost" value="<!-- TMPL_VAR name="ecost"-->" />
+                <label for="cost">Actual Cost</label>
+                <input type="text" id="cost" size="20" name="cost" value="<!-- TMPL_VAR name="ecost"-->" />
 				<!--/TMPL_IF-->
             </p>
             <p>
-                <label>Invoice Number</label>
-                <input type="text" size="20" name="invoice"  value="<!-- TMPL_VAR name="invoice" -->" />(usually empty)
+                <label for="invoice">Invoice Number</label>
+                <input type="text" id="invoice" size="20" name="invoice"  value="<!-- TMPL_VAR name="invoice" -->" />(usually empty)
             </p>
             <p>
-                <label>Notes</label>
-                <input type="text" size="20" name="notes" value="<!-- TMPL_VAR NAME="notes" -->" />
+                <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>
-                <label>Sort field 1</label>
                 <!-- TMPL_IF Name="CGIsort1" -->
                     <!-- TMPL_VAR Name="CGIsort1" -->
                 <!-- TMPL_ELSE -->
-                    <input type="text" size="20" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->" />
+                <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>
-                <label>Sort field 2</label>
                 <!-- TMPL_IF Name="CGIsort2" -->
                     <!-- TMPL_VAR Name="CGIsort2" -->
                 <!-- TMPL_ELSE -->
-                    <input type="text" size="20" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->" />
+                <label for="sort2">Sort field 2</label>
+                    <input type="text" id="sort2" size="20" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->" />
                 <!--/TMPL_IF -->
             </p>
     </fieldset>
@@ -289,7 +298,8 @@ if (quantity ==0) {
 </form>
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="acquisitions-menu.inc" -->
+</div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tmpl
index 705841198f..4bab39171b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tmpl
@@ -1,16 +1,18 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Add order from suggestion: <!-- TMPL_VAR name="bookselname" --></title>
+<title>Koha &rsaquo; Acquisitions &rsaquo; Add order from a suggestion</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
+<!-- TMPL_INCLUDE NAME="suggestions-add-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; Add order from a suggestion</div>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 	
 <h1>Suggestions</h1>
 <div id="acqui_suggestion_select">
@@ -22,24 +24,7 @@
             <th>Accepted by</th>
             <th>&nbsp;</th>
         </tr>
-        <tr>
-            <th>
-                 Filter on :
-                <p>
-                title: <input type="text" name="title" value="<!-- TMPL_VAR NAME="title"-->" />
-                author: <input type="text" name="author" value="<!-- TMPL_VAR NAME="author" -->" />
-                publisher: <input type="text" name="publishercode" value="<!-- TMPL_VAR NAME="publishercode"-->" /></p>
-            </th>
-            <th>
-                &nbsp;
-            </th>
-            <th>
-                &nbsp;
-            </th>
-            <th>
-                <input type="submit" class="button" value="Set Filter" />
-            </th>
-        </tr>
+        
         <!-- TMPL_LOOP NAME="suggestions_loop" -->
             <tr>
                 <td>
@@ -74,7 +59,8 @@
 </div>
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="acquisitions-menu.inc" -->
+</div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl
index 7dc299914c..8c483f4d3d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl
@@ -1,16 +1,18 @@
 <!-- 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>
+<title>Koha &rsaquo; Acquisitions &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" -->
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
+<!-- TMPL_INCLUDE NAME="cat-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>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 <h1>Receipt order for : <!-- TMPL_VAR NAME="name" --> <!-- TMPL_IF NAME="invoice" -->Parcel <!-- TMPL_VAR NAME="invoice" --><!-- /TMPL_IF --> (order #<!-- TMPL_VAR NAME="ordernumber" -->)</h1>
 
@@ -20,32 +22,20 @@
     <form action="/cgi-bin/koha/acqui/finishreceive.pl" method="post">
     <fieldset>
     <legend>Catalogue Details</legend>
-    <p><label>Title</label><!-- TMPL_VAR NAME="title" --></p>
-    <p>
-        <label>Author</label>
-        <!-- TMPL_VAR NAME="author" -->
-    </p>
-    <p>
-        <label>Copyright Date</label>
-        <!-- TMPL_VAR NAME="copyrightdate" -->
-    </p>
+    <p>Title<!-- TMPL_VAR NAME="title" --></p>
+    <p> Author
+        <!-- TMPL_VAR NAME="author" --></p>
+    <p> Copyright Date
+        <!-- TMPL_VAR NAME="copyrightdate" --></p>
     
-    <p>
-        <label>ISBN</label>
-        <!-- TMPL_VAR NAME="isbn" -->
-    </p>
-    <p>
-        <label>Series</label>
-        <!-- TMPL_VAR NAME="seriestitle" -->
-    </p>
-    <p>
-        <label>Item Barcode</label>
-        <input type="text" size="20" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->" />
-    </p>
-    <p>
-        <label>Volume Info (for serials)</label>
-        <input type="text" size="20" name="volinf" />
-    </p>
+    <p> ISBN
+        <!-- TMPL_VAR NAME="isbn" --></p>
+    <p> Series
+        <!-- TMPL_VAR NAME="seriestitle" --></p>
+    <p> <label>Item Barcode</label>
+        <input type="text" size="20" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->" /></p>
+    <p> <label>Volume Info (for serials)</label>
+        <input type="text" size="20" name="volinf" /></p>
     <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
     <input type="hidden" name="ordnum" value="<!-- TMPL_VAR NAME="ordernumber" -->" />
     <input type="hidden" name="biblioitemnumber" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->" />
@@ -102,7 +92,8 @@
 
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="acquisitions-menu.inc" -->
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+</div>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
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 ed5a749dd1..63eddaf856 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl
@@ -1,22 +1,29 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Recieve <!-- TMPL_VAR name="bookselname" --></title>
+<title>Koha &rsaquo; Acquisitions &rsaquo; <!-- TMPL_IF name="date" -->
+            Receipt Summary for <!-- TMPL_VAR NAME="name" --> <!--TMPL_IF Name="invoice"-->Parcel <!-- TMPL_VAR NAME="invoice" --><!--/TMPL_IF --> on <!-- TMPL_VAR NAME="date" --><!-- TMPL_ELSE -->Orders not yet Received for <!-- TMPL_VAR NAME="name" --><!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
+<!-- TMPL_INCLUDE NAME="cat-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>
+        <!-- TMPL_ELSE -->
+            Orders not yet Received for <!-- TMPL_VAR NAME="name" -->
+        <!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 	
     <h1>
         <!-- 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>
         <!-- TMPL_ELSE -->
-            orders not yet recieved for <!-- TMPL_VAR NAME="name" -->
+            Orders not yet Received for <!-- TMPL_VAR NAME="name" -->
         <!-- /TMPL_IF -->
     </h1>
 <div id="acqui_recieve_summary">
@@ -25,8 +32,8 @@
     <p>On: <!-- TMPL_VAR NAME="datereceived" --></p>
 </div>
 <div id="acqui_recieve_recievelist">
-    <h2>Recieve list</h2>
-    <form action="" method="get" name="orderform">
+    <h2>Receive list</h2>
+    <form action="/cgi-bin/koha/acqui/parcel.pl" method="get" name="orderform">
     <table>
         <tr>
             <th>BASKET</th>
@@ -49,13 +56,13 @@
                 <td><!-- TMPL_VAR NAME="quantity" --></td>
                 <td><!-- TMPL_VAR NAME="ecost" --></td>
                 <td><!-- TMPL_VAR NAME="unitprice" --></td>
-                <td></td>
+                <td>&nbsp;</td>
                 <td><!-- TMPL_VAR NAME="quantityreceived" --></td>
                 <td><!-- TMPL_VAR NAME="total" --></td>
             </tr>
         <!-- /TMPL_LOOP -->
         <tr>
-            <th colspan="3"></th>
+            <th colspan="3">&nbsp;</th>
             <th>SUBTOTALS</th>
             <th><!-- TMPL_VAR NAME="totalprice" --></th>
             <th><!-- TMPL_VAR NAME="totalfreight" --></th>
@@ -117,7 +124,8 @@
 </div>
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="acquisitions-menu.inc" -->
+</div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" --> 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl
index 7e92ab3ebb..bbf1089d98 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl
@@ -1,15 +1,18 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><title>Koha &rsaquo; Recieve <!-- TMPL_VAR name="bookselname" --></title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>Koha &rsaquo; Acquisitions &rsaquo; Receive parcel from supplier <!-- TMPL_VAR NAME="name" --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
+<!-- TMPL_INCLUDE NAME="cat-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>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 	
 <h1>Receive parcel from supplier <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->"><!-- TMPL_VAR NAME="name" --></a></h1>
 
@@ -17,21 +20,17 @@
 <div id="resultnumber">
 <!-- Row of numbers corresponding to search result pages -->
 <!-- TMPL_IF NAME="displayprev" -->
-    <a href="parcels.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->&amp;startfrom=<!-- TMPL_VAR NAME="prevstartfrom" --><!--TMPL_IF Name="datefrom"-->&amp;datefrom=<!--TMPL_VAR Name="datefrom"--><!--/TMPL_IF--><!--TMPL_IF Name="dateto"-->&amp;dateto=<!--TMPL_VAR Name="dateto"--><!--/TMPL_IF--><!--TMPL_IF Name="code"-->&amp;filter=<!--TMPL_VAR Name="code"--><!--/TMPL_IF--><!--TMPL_IF Name="orderby"-->&amp;orderby=<!--TMPL_VAR Name="orderby"--><!--/TMPL_IF--><!--TMPL_IF Name="resultsperpage"-->&amp;resultsperpage=<!--TMPL_VAR Name="resultsperpage"--><!--/TMPL_IF-->&amp;type=intra"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/prev.gif" border="0" /></a>
-<!-- TMPL_ELSE -->
-    <img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/placeholder.gif" border="0" />
+    <a href="parcels.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->&amp;startfrom=<!-- TMPL_VAR NAME="prevstartfrom" --><!--TMPL_IF Name="datefrom"-->&amp;datefrom=<!--TMPL_VAR Name="datefrom"--><!--/TMPL_IF--><!--TMPL_IF Name="dateto"-->&amp;dateto=<!--TMPL_VAR Name="dateto"--><!--/TMPL_IF--><!--TMPL_IF Name="code"-->&amp;filter=<!--TMPL_VAR Name="code"--><!--/TMPL_IF--><!--TMPL_IF Name="orderby"-->&amp;orderby=<!--TMPL_VAR Name="orderby"--><!--/TMPL_IF--><!--TMPL_IF Name="resultsperpage"-->&amp;resultsperpage=<!--TMPL_VAR Name="resultsperpage"--><!--/TMPL_IF-->&amp;type=intra">&lt;&lt; Previous</a>
 <!-- /TMPL_IF -->
 <!-- TMPL_LOOP NAME="numbers" -->
     <!-- TMPL_IF NAME="highlight" -->
-    <img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
+    <span class="current"><!-- TMPL_VAR NAME="number" --></span>
     <!-- TMPL_ELSE -->
-    <a href="parcels.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->&amp;startfrom=<!-- TMPL_VAR NAME="startfrom" --><!--TMPL_IF Name="datefrom"-->&amp;datefrom=<!--TMPL_VAR Name="datefrom"--><!--/TMPL_IF--><!--TMPL_IF Name="dateto"-->&amp;dateto=<!--TMPL_VAR Name="dateto"--><!--/TMPL_IF--><!--TMPL_IF Name="code"-->&amp;filter=<!--TMPL_VAR Name="code"--><!--/TMPL_IF--><!--TMPL_IF Name="orderby"-->&amp;orderby=<!--TMPL_VAR Name="orderby"--><!--/TMPL_IF--><!--TMPL_IF Name="resultsperpage"-->&amp;resultsperpage=<!--TMPL_VAR Name="resultsperpage"--><!--/TMPL_IF-->&amp;type=intra"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0" /></a>
+    <a href="parcels.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->&amp;startfrom=<!-- TMPL_VAR NAME="startfrom" --><!--TMPL_IF Name="datefrom"-->&amp;datefrom=<!--TMPL_VAR Name="datefrom"--><!--/TMPL_IF--><!--TMPL_IF Name="dateto"-->&amp;dateto=<!--TMPL_VAR Name="dateto"--><!--/TMPL_IF--><!--TMPL_IF Name="code"-->&amp;filter=<!--TMPL_VAR Name="code"--><!--/TMPL_IF--><!--TMPL_IF Name="orderby"-->&amp;orderby=<!--TMPL_VAR Name="orderby"--><!--/TMPL_IF--><!--TMPL_IF Name="resultsperpage"-->&amp;resultsperpage=<!--TMPL_VAR Name="resultsperpage"--><!--/TMPL_IF-->&amp;type=intra"><!-- TMPL_VAR NAME="number" --></a>
     <!-- /TMPL_IF -->
 <!-- /TMPL_LOOP -->
 <!-- TMPL_IF NAME="displaynext" -->
-    <a href="parcels.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->&amp;startfrom=<!-- TMPL_VAR NAME="nextstartfrom" --><!--TMPL_IF Name="datefrom"-->&amp;datefrom=<!--TMPL_VAR Name="datefrom"--><!--/TMPL_IF--><!--TMPL_IF Name="dateto"-->&amp;dateto=<!--TMPL_VAR Name="dateto"--><!--/TMPL_IF--><!--TMPL_IF Name="code"-->&amp;filter=<!--TMPL_VAR Name="code"--><!--/TMPL_IF--><!--TMPL_IF Name="orderby"-->&amp;orderby=<!--TMPL_VAR Name="orderby"--><!--/TMPL_IF--><!--TMPL_IF Name="resultsperpage"-->&amp;resultsperpage=<!--TMPL_VAR Name="resultsperpage"--><!--/TMPL_IF-->&amp;type=intra"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/next.gif" border="0" /></a>
-<!-- TMPL_ELSE -->
-    <img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/placeholder.gif" border="0" />
+    <a href="parcels.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->&amp;startfrom=<!-- TMPL_VAR NAME="nextstartfrom" --><!--TMPL_IF Name="datefrom"-->&amp;datefrom=<!--TMPL_VAR Name="datefrom"--><!--/TMPL_IF--><!--TMPL_IF Name="dateto"-->&amp;dateto=<!--TMPL_VAR Name="dateto"--><!--/TMPL_IF--><!--TMPL_IF Name="code"-->&amp;filter=<!--TMPL_VAR Name="code"--><!--/TMPL_IF--><!--TMPL_IF Name="orderby"-->&amp;orderby=<!--TMPL_VAR Name="orderby"--><!--/TMPL_IF--><!--TMPL_IF Name="resultsperpage"-->&amp;resultsperpage=<!--TMPL_VAR Name="resultsperpage"--><!--/TMPL_IF-->&amp;type=intra">Next &gt;&gt;</a>
 <!-- /TMPL_IF -->
 </div>
 
@@ -49,37 +48,24 @@
             <th>Items expected</th>
         </tr>
         <tr>
-            <th>
-                &nbsp;
-                <input type="hidden" name="supplierid" value="<!-- TMPL_VAR NAME="supplierid" -->">
-            </th>
-            <th>
-                <input type="text" size="20" name="filter" value="<!-- TMPL_VAR NAME="filter" -->">
-            </th>
-            <th>
-                From :<input type="text" size="9" name="datefrom" value="<!-- TMPL_VAR NAME="datefrom" -->"> 
-                <p>To :<input type="text" size="9" name="dateto" value="<!-- TMPL_VAR NAME="dateto" -->">
-            </th>
-            <th>
-                &nbsp;
-            </th>
-            <th>
-                Sort by :<select name="orderby" size="1">
+            <th> <input type="hidden" name="supplierid" value="<!-- TMPL_VAR NAME="supplierid" -->" /></th>
+            <th><input type="text" size="20" name="filter" value="<!-- TMPL_VAR NAME="filter" -->" /></th>
+            <th><label for="datefrom">From:</label><input type="text" size="9" id="datefrom" name="datefrom" value="<!-- TMPL_VAR NAME="datefrom" -->" /> 
+                <p><label for="dateto">To:</label><input type="text" size="9" id="dateto" name="dateto" value="<!-- TMPL_VAR NAME="dateto" -->" /></th>
+            <th>&nbsp;</th>
+            <th><label for="orderby">Sort by :</label><select name="orderby" id="orderby">
                 <option value="aqorders.booksellerinvoicenumber"> Code</option>
                 <option value="datereceived"> Date Received</option>
                 <option value="datereceived desc"> Date Received reverse</option>
                 <option value="aqorders.booksellerinvoicenumber desc"> Code reverse</option>
                 </select><br />
-                Results per page :<select name="resultsperpage" value ="<!--TMPL_VAR Name="resultsperpage"-->" size="1">
+                <label for="resultsperpage">Results per page :</label><select name="resultsperpage" value ="<!--TMPL_VAR Name="resultsperpage"-->" id="resultsperpage">
                 <option value="20">20</option>
                 <option value="30">30</option>
                 <option value="50">50</option>
                 <option value="100">100</option>
-                </select>
-            </th>
-            <th>
-                <input type="submit" class="button" value="Filter">
-            </th>
+                </select></th>
+            <th><input type="submit" class="button" value="Filter" /></th>
         </tr>
 <!-- Actual Search Results -->
 <!-- TMPL_LOOP NAME="searchresults" -->
@@ -118,26 +104,27 @@
         <form method="get" action="parcel.pl">
         <p>
             <input type="hidden" name="supplierid" value="<!-- TMPL_VAR NAME="supplierid" -->" />
-            <label>Parcel Code</label>
-            <input type="text" size="20" name="invoice" />
+            <label for="invoice">Parcel Code</label>
+            <input type="text" size="20" id="invoice" name="invoice" />
         </p>
         <p>
-            <label>GST</label>
-            <input type="text" size="20" name="gst" />
+            <label for="gst">GST</label>
+            <input type="text" size="20" id="gst" name="gst" />
         </p>
         <p>
-            <label>Freight</label>
-            <input type="text" size="20" name="freight" />
+            <label for="freight">Freight</label>
+            <input type="text" size="20" id="freight" name="freight" />
         </p>
         <p>
-            <input type="submit" class="button" value="save" />
+            <input type="submit" class="button" value="Save" />
         </p>
         </form>
     </fieldset>
     </div>
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="acquisitions-menu.inc" -->
+</div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tmpl
index 73bf473630..33d74107c5 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tmpl
@@ -1,132 +1,75 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->         
-<title>Koha &rsaquo; Acquisitions</title>                                     
+<title>Koha &rsaquo; Acquisitions &rsaquo; Budgets and Bookfunds: Spent</title>                                     
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->           
 </head>   
 <body>  
 <!-- TMPL_INCLUDE NAME="header.inc" -->                                   
-<!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
+<!-- TMPL_INCLUDE NAME="cat-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>
 
 <div id="doc3" class="yui-t2">
 <div id="bd">            
 <div id="yui-main">                         
 <div class="yui-b">
-<div class="yui-g">
-
-
-
 
-<h1>Budgets &amp; Bookfunds</h1>
+<h1>Budgets and Bookfunds</h1>
 <h2>Spent</h2>
 
 <br /><br />
 
 
-<table cellspacing="0" cellpadding="0" border="0" id="spent" class="collapse">
-<tr valign="top">
-   <td class="cell-header">
-	 	Title
-	</td>
-	<td class="cell-header">
-	 	Order
-	</td>
-	<td class="cell-header">
-	 	Supplier
-	</td>
-	<td class="cell-header">
-		Invoice
-	</td>
-	<td class="cell-header">
-		Itemtype
-	</td>
-	<td class="cell-header">
-		Receieved
-	</td>
-	<td class="cell-header">
-		Unit Price
-	</td>
-	<td class="cell-header">
-		Date Received
-	</td>
-	<td class="cell-header">
-		Subtotal
-	</td>
+<table id="spent">
+<tr>
+   <th>Title</th>
+	<th>Order</th>
+	<th>Supplier</th>
+	<th>Invoice</th>
+	<th>Itemtype</th>
+	<th>Receieved</th>
+	<th>Unit Price</th>
+	<th>Date Received</th>
+	<th>Subtotal</th>
 </tr>
 
 <!--TMPL_LOOP NAME="SPENTLOOP"-->
 	<!--TMPL_IF name="toggle"-->
-		<tr valign="top" class="hilighted">
+		<tr class="hilighted">
 	<!--TMPL_ELSE-->
-		<tr valign="top" class="hilighted2">
+		<tr class="hilighted2">
 	<!--/TMPL_IF-->
 	
-		<td class="cell">
-			<!--TMPL_VAR NAME="title"-->	
-		</td>
-		<td class="cell">
-                  <a href="/cgi-bin/koha/acqui/acquire.pl?recieve=<!--TMPL_VAR NAME="ordnum"-->&biblio=<!--TMPL_VAR NAME="biblionumber"-->&invoice=<!--TMPL_VAR NAME="booksellerinvoicenumber"-->&supplierid=<!--TMPL_VAR NAME="booksellerid"-->&catview=yes"><TMPL_VAR NAME="ordnum"--></a>
-		</td>
-		<td class="cell">
-			<!--TMPL_VAR NAME="booksellerid"-->	
-		</td>
-		<td class="cell">
-				<a href=/cgi-bin/koha/acqui/receive.pl?invoice=<!--TMPL_VAR NAME="booksellerinvoicenumber"-->&supplierid=<!--TMPL_VAR NAME="booksellerid"-->><!--TMPL_VAR NAME="booksellerinvoicenumber"--></a>
-		</td>
-		<td class="cell">
-			<!--TMPL_VAR NAME="itemtype"-->	
-		</td>
-		<td class="cell">
-			<!--TMPL_VAR NAME="qrev"-->	
-		</td>
-		<td class="cell">
-			<!--TMPL_VAR NAME="unitprice"-->		
-		</td>
-		<td class="cell">
-			<!--TMPL_VAR NAME="datereceived"-->		
-		</td>
-		<td class="cell">
-			<!--TMPL_VAR NAME="subtotal"-->		
-		</td>
+		<td><!--TMPL_VAR NAME="title"-->	</td>
+		<td>
+                  <a href="/cgi-bin/koha/acqui/acquire.pl?recieve=<!--TMPL_VAR NAME="ordnum"-->&amp;biblio=<!--TMPL_VAR NAME="biblionumber"-->&amp;invoice=<!--TMPL_VAR NAME="booksellerinvoicenumber"-->&amp;supplierid=<!--TMPL_VAR NAME="booksellerid"-->&amp;catview=yes"><TMPL_VAR NAME="ordnum"--></a></td>
+		<td><!--TMPL_VAR NAME="booksellerid"-->	</td>
+		<td>	<a href=/cgi-bin/koha/acqui/receive.pl?invoice=<!--TMPL_VAR NAME="booksellerinvoicenumber"-->&amp;supplierid=<!--TMPL_VAR NAME="booksellerid"-->><!--TMPL_VAR NAME="booksellerinvoicenumber"--></a></td>
+		<td><!--TMPL_VAR NAME="itemtype"-->	</td>
+		<td><!--TMPL_VAR NAME="qrev"-->	</td>
+		<td><!--TMPL_VAR NAME="unitprice"-->		</td>
+		<td><!--TMPL_VAR NAME="datereceived"-->		</td>
+		<td><!--TMPL_VAR NAME="subtotal"-->		</td>
 </tr>
 <!--/TMPL_LOOP-->
 
-<tr valign="top">
-   <td class="cell-header">
-	 	Total
-	</td>
-	<td class="cell-header">
-	 	
-	</td>
-	<td class="cell-header">
-	 	
-	</td>
-	<td class="cell-header">
-		
-	</td>
-	<td class="cell-header">
-		
-	</td>
-	<td class="cell-header">
-		
-	</td>
-	<td class="cell-header">
-		
-	</td>
-	<td class="cell-header">
-		
-	</td>
-	<td class="cell-header">
-		<!--TMPL_VAR NAME="total"-->
-	</td>
+<tr>
+   <th>Total</th>
+	<th>&nbsp;</th>
+	<th>&nbsp;</th>
+	<th>&nbsp;</th>
+	<th>&nbsp;</th>
+	<th>&nbsp;</th>
+	<th>&nbsp;</th>
+	<th>&nbsp;</th>
+	<th><!--TMPL_VAR NAME="total"--></th>
 </tr>
 
 </table>
 
-
-</div>
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="acquisitions-menu.inc" -->
 </div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->                                     
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl
index a91d709cb0..a4615c3ee1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl
@@ -2,22 +2,28 @@
 <title>Koha &rsaquo; Supplier <!-- TMPL_VAR name="bookselname" --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script type="text/javascript">
+//<![CDATA[
 function confirm_deletion() {
     if (confirm("Confirm deletion of this supplier ?")) {
         window.location="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!--TMPL_VAR Name="id"-->&op=delete";
     }
 }
+//]]>
 </script>
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
+<!-- TMPL_INCLUDE NAME="cat-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" -->Update: <!-- TMPL_VAR NAME="name" --><!-- TMPL_ELSE -->Add supplier<!-- /TMPL_IF --> <!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 	
 <!--TMPL_IF Name="enter"-->
     <form action="updatesupplier.pl" method="post">
@@ -31,134 +37,90 @@ function confirm_deletion() {
     <!-- /TMPL_IF -->
         <fieldset>
             <legend>Company details</legend>
-            <p>
-                <label>Company Name</label>
-                <input type="text" size="40" name="company" value="<!-- TMPL_VAR NAME="name" -->" />
-            </p>
-            <p>
-                <label>Postal Address</label>
-                    <textarea name="company_postal" cols="40" rows="3"><!-- TMPL_VAR NAME="postal" --></textarea>
-            </p>
-            <p>
-                <label>Physical Address</label>
-                <textarea 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>Phone</label>
-                <input type="text" size="20" name="company_phone" value="<!-- TMPL_VAR NAME="phone" -->" />
-            </p>
-            <p>
-                <label>Fax</label>
-                <input type="text" size="20" name="company_fax" value="<!-- TMPL_VAR NAME="fax" -->" />
-            </p>
-            <p>
-                <label>Website</label>
-                <input type="text" size="40" name="website" value="<!-- TMPL_VAR NAME="url" -->" />
-            </p>
+            <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>
         </fieldset>
         <fieldset>
             <legend>Contact details</legend>
-            <p>
-                <label>Contact Name</label>
-                <input type="text" size="40" name="company_contact_name" value="<!-- TMPL_VAR NAME="contact" -->" />
-            </p>
-            <p>
-                <label>Position</label>
-                <input type="text" size="40" name="company_contact_position" value="<!-- TMPL_VAR NAME="contpos" -->" />
-            </p>
-            <p>
-                <label>Phone</label>
-                <input type="text" size="20" name="contact_phone" value="<!-- TMPL_VAR NAME="contphone" -->" /> 
-            </p>
-            <p>
-                <label>Alternative phone</label>
-                <input type="text" size="20" name="contact_phone_2" value="<!-- TMPL_VAR NAME="contaltphone" -->" />
-            </p>
-            <p>
-                <label>Fax</label>
-                <input type="text" size="20" name="contact_fax" value="<!-- TMPL_VAR NAME="contfax" -->" />
-            </p>
-            <p>
-                <label>E-mail</label>
-                <input type="text" size="40" name="company_email" value="<!-- TMPL_VAR NAME="contemail" -->" />
-            </p>
-            <p>
-                <label>Notes</label>
-                <textarea name="contact_notes" cols="40" rows="4"><!-- TMPL_VAR NAME="contnotes" --></textarea>
-            </p>
+            <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>
         </fieldset>
         <fieldset>
             <legend>Ordering information</legend>
-            <p>
-                <label>Supplier is</label>
+            <p><strong>Supplier is</strong>
                     <!-- TMPL_IF name="active" -->
-                        <input type="radio" name="status" value="1" checked="checked" />Active
-                        <input type="radio" name="status" value="0" />Inactive</td>
+                        <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>
                     <!-- TMPL_ELSE -->
-                        <input type="radio" name="status" value="1" />Active
-                        <input type="radio" name="status" value="0" checked="checked" />Inactive</td>
-                    <!-- /TMPL_IF -->
-            </p>
-            <p>
-                <label>Preferred publishers</label>
-                <textarea name="publishers_imprints" cols="40" rows="3"><!-- TMPL_VAR NAME="specialty" --></textarea>
-            </p>
-            <p>
-                <label>List Prices are</label>
-                    <select name="list_currency" size="1">
+                        <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>
+                    <select name="list_currency" id="list_currency">
                     <!-- TMPL_LOOP NAME="loop_pricescurrency" -->
                         <!-- TMPL_VAR NAME="currency" -->
                     <!-- /TMPL_LOOP -->
-                    </select>
-            </p>
-            <p>
-                <label>Invoice Prices are</label>
-                    <select name="invoice_currency" size="1">
+                    </select></p>
+            <p><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>
-                <label>GST Registered</label>
+                    </select></p>
+            <!-- TMPL_IF NAME="GST" --><p><strong>GST Registered</strong>
 				<!-- TMPL_IF name="gstreg" -->
-					<input type="radio" name="gst" value="1" checked="checked" />Yes
-                    <input type="radio" name="gst" value="0" />No
+					<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" value="1" />Yes
-                    <input type="radio" name="gst" value="0" checked="checked" />No
-				<!-- /TMPL_IF -->
-            </p><!-- TMPL_ELSE --><input type="hidden" name="gst" value="0" /><!-- /TMPL_IF -->
+                    <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 NAME="GST" --><p>
-                <label>Ordering prices</label>
+            <!-- TMPL_IF NAME="GST" --><p><strong>Ordering prices</strong>
 				<!-- TMPL_IF name="listincgst" -->
-				<input type="radio" name="list_gst" value="1" checked="checked" />include GST
-                    <input type="radio" name="list_gst" value="0" />don't include GST
+					<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" name="list_gst" value="1" />include GST
-                    <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 -->
+                    <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 NAME="GST" --><p>
-                <label>Invoice prices</label>
+            <!-- TMPL_IF NAME="GST" --><p><strong>Invoice prices</strong>
 				<!-- TMPL_IF name= "invoiceincgst" -->
-                    <input type="radio" name="invoice_gst" value="1" checked="checked" />include GST
-                    <input type="radio" name="invoice_gst" value="0" />don't include GST
+                    <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" 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>
-                <input type="text" size="3" name="discount" value="<!-- TMPL_VAR NAME="discount" -->" /> %
-            </p>
-            <p>
-                <label>Notes</label>
-                <textarea cols="40" rows="4" name="notes" ><!-- TMPL_VAR NAME="notes" --></textarea>
-            </p>
+                    <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>
         </fieldset>
         <p><input type="submit" value="Save" /></p>
     </form>
@@ -171,112 +133,69 @@ function confirm_deletion() {
 	<li>        <a href="parcels.pl?supplierid=<!--TMPL_VAR Name="id"-->">Receive Parcel</a></li>
 </ul>
         </div>
-        <fieldset>
-            <legend>Company details</legend>
-            <p>
-                <label>Company Name</label>
-                <!-- TMPL_VAR NAME="name" -->&nbsp;
-            </p>
-            <p>
-                <label>Postal Address</label>
-                    <!-- TMPL_VAR NAME="postal" -->&nbsp;
-            </p>
-            <p>
-                <label>Physical Address</label>
-                <!-- TMPL_VAR NAME="address1" --><!-- TMPL_VAR NAME="address2" --><!-- TMPL_VAR NAME="address3" --><!-- TMPL_VAR NAME="address4" -->&nbsp;
-            </p>
-            <p>
-                <label>Phone</label>
-                <!-- TMPL_VAR NAME="phone" -->&nbsp;
-            </p>
-            <p>
-                <label>Fax</label>
-                <!-- TMPL_VAR NAME="fax" -->&nbsp;
-            </p>
-            <p>
-                <label>Website</label>
-                <!-- TMPL_VAR NAME="url" -->&nbsp;
-            </p>
-        </fieldset>
-        <fieldset>
-            <legend>Contact details</legend>
-            <p>
-                <label>Contact name</label>
-                <!-- TMPL_VAR NAME="contact" -->&nbsp;
-            </p>
-            <p>
-                <label>Position</label>
-                <!-- TMPL_VAR NAME="contpos" -->&nbsp;
-            </p>
-            <p>
-                <label>Phone</label>
-                <!-- TMPL_VAR NAME="contphone" -->&nbsp;
-            </p>
-            <p>
-                <label>Alternative phone</label>
-                <!-- TMPL_VAR NAME="contaltphone" -->&nbsp;
-            </p>
-            <p>
-                <label>Fax</label>
-                <!-- TMPL_VAR NAME="contfax" -->&nbsp;
-            </p>
-            <p>
-                <label>E-mail</label>
-                <!-- TMPL_VAR NAME="contemail" -->&nbsp;
-            </p>
-            <p>
-                <label>Notes</label>
-                <!-- TMPL_VAR NAME="contnotes" -->&nbsp;
-            </p>
+        <div id="supplier-company-details">
+            <h3>Company details</h3>
+            <p>Company Name
+                <!-- TMPL_VAR NAME="name" --></p>
+            <p>Postal Address
+                    <!-- TMPL_VAR NAME="postal" --></p>
+            <p>Physical Address
+                <!-- TMPL_VAR NAME="address1" --><!-- TMPL_VAR NAME="address2" --><!-- TMPL_VAR NAME="address3" --><!-- TMPL_VAR NAME="address4" --></p>
+            <p>Phone
+                <!-- TMPL_VAR NAME="phone" --></p>
+            <p>Fax
+                <!-- TMPL_VAR NAME="fax" --></p>
+            <p>Website
+                <!-- TMPL_VAR NAME="url" --></p>
+        </div>
+        <div id="supplier-contact-details">
+            <h3>Contact details</h3>
+            <p>Contact name
+                <!-- TMPL_VAR NAME="contact" --></p>
+            <p>Position
+                <!-- TMPL_VAR NAME="contpos" --></p>
+            <p>Phone
+                <!-- TMPL_VAR NAME="contphone" --></p>
+            <p>Alternative phone
+                <!-- TMPL_VAR NAME="contaltphone" --></p>
+            <p>Fax
+                <!-- TMPL_VAR NAME="contfax" --></p>
+            <p>E-mail
+                <!-- TMPL_VAR NAME="contemail" --></p>
+            <p>Notes
+                <!-- TMPL_VAR NAME="contnotes" --></p>
         
-        </fieldset>
-        <fieldset>
-        <legend>Ordering informations</legend>
-            <p>
-                <label>Supplier is</label>
+        </div>
+        <div id="supplier-ordering-information">
+        <h3>Ordering information</h3>
+            <p>Supplier is
                     <!-- TMPL_IF name="active" -->
                         Active
                     <!-- TMPL_ELSE -->
                         Inactive
-                    <!-- /TMPL_IF -->
-            </p>
-            <p>
-                <label>Publishers and Imprints</label>
-                <!-- TMPL_VAR NAME="specialty" -->&nbsp;
-            </p>
-            <p>
-                <label>List Prices are</label><!--TMPL_VAR Name="listprice"-->&nbsp;
-            </p>
-            <p>
-                <label>Invoice Prices are</label><!--TMPL_VAR Name="invoiceprice"-->&nbsp;
-            </p>
-            <p>
-                <label>GST Registered</label>
-                    <!-- TMPL_IF name="gstreg" -->Yes<!--TMPL_ELSE-->No<!-- /TMPL_IF -->
-            </p>
-            <p>
-                <label>List Item Price Includes GST</label>
-                    <!-- TMPL_IF name="listincgst" -->Yes<!--TMPL_ELSE-->No<!-- /TMPL_IF -->
-            </p>
-            <p>
-                <label>Invoice Item Price Includes GST</label>
-                    <!-- TMPL_IF name= "invoiceincgst" -->Yes<!--TMPL_ELSE-->No<!-- /TMPL_IF -->
-            </p>
-            <p>
-                <label>Discount</label>
-                <!-- TMPL_VAR NAME="discount" --> %&nbsp;
-            </p>
-            <p>
-                <label>Notes</label>
-                <!-- TMPL_VAR NAME="notes" -->&nbsp;
-            </p>
-        </fieldset>
+                    <!-- /TMPL_IF --></p>
+            <p>Publishers and Imprints
+                <!-- 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
+                    <!-- TMPL_IF name="gstreg" -->Yes<!--TMPL_ELSE-->No<!-- /TMPL_IF --></p>
+            <p>List Item Price Includes GST
+                    <!-- TMPL_IF name="listincgst" -->Yes<!--TMPL_ELSE-->No<!-- /TMPL_IF --></p>
+            <p>Invoice Item Price Includes GST
+                    <!-- TMPL_IF name= "invoiceincgst" -->Yes<!--TMPL_ELSE-->No<!-- /TMPL_IF --></p>
+            <p>Discount
+                <!-- TMPL_VAR NAME="discount" --> %</p>
+            <p>Notes
+                <!-- TMPL_VAR NAME="notes" --></p>
+        </div>
 
 <!--/TMPL_IF-->
 
 </div>
 </div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="acquisitions-menu.inc" -->
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+</div>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
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 1f96b33bf4..02a8d6b5fc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
@@ -232,7 +232,7 @@ function confirm_deletion(count) {
 </div>
 </div>
 <div class="yui-b">
-<!-- TMPL_INCLUDE NAME="labels-menu.inc" -->
+<!-- TMPL_INCLUDE NAME="cat-menu.inc" -->
 </div>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tmpl
index e76fc7fbe3..a759454c71 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tmpl
@@ -15,8 +15,6 @@
 	<div class="yui-b">
 
 
-<h1>Circulation &rsaquo; Transfers</h1>
-
 <!-- TMPL_IF Name="found" -->
     <h3>Reserve Found</h3>
     <table>
@@ -92,36 +90,33 @@
     </table>
 
 <!-- TMPL_ELSE -->
-    <table>
-        <caption>Messages</caption>
-        <tr>
-            <td>
+
+        <h4>Messages</h4>
+		<ul>
                 <!-- TMPL_IF Name="reqmessage" -->
                     <!-- TMPL_IF Name="cancelled" -->
-                        Reserve Cancelled<br />
+                        <li>Reserve Cancelled</li>
                     <!-- /TMPL_IF -->
                     <!-- TMPL_IF Name="setwaiting" -->
-                        Item should now be waiting at library: <!-- TMPL_VAR Name="reqbrchname" --><br />
+                        <li>Item should now be waiting at library: <!-- TMPL_VAR Name="reqbrchname" --></li>
                     <!-- /TMPL_IF -->
                 <!-- /TMPL_IF -->
                 <!-- TMPL_LOOP Name="errmsgloop" -->
                     <!-- TMPL_IF Name="errbadcode" -->
-                        No Item with barcode: <!-- TMPL_VAR Name="msg" -->
+                        <li>No Item with barcode: <!-- TMPL_VAR Name="msg" --></li>
                     <!-- /TMPL_IF -->
                     <!-- TMPL_IF Name="errispermanent" -->
-                            Please return item to home library: <!-- TMPL_VAR Name="msg" -->
+                            <li>Please return item to home library: <!-- TMPL_VAR Name="msg" --></li>
                     <!-- /TMPL_IF -->
                     <!-- TMPL_IF Name="errdesteqholding" -->
-                        Item is already at destination library.
+                        <li>Item is already at destination library.</li>
                     <!-- /TMPL_IF -->
                     <!-- TMPL_IF Name="errwasreturned" -->
-                        Item was on loan to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR Name="borrowernumber" -->"><!-- TMPL_VAR Name="borrowernumber" --></a>
-<!-- TMPL_VAR Name="name" --> and has been returned.
+                        <li>Item was on loan to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR Name="borrowernumber" -->"><!-- TMPL_VAR Name="borrowernumber" --></a>
+<!-- TMPL_VAR Name="name" --> and has been returned.</li>
                     <!-- /TMPL_IF -->
                 <!-- /TMPL_LOOP -->
-            </td>
-        </tr>
-    </table>
+			</ul>
     <form method="post" name="mainform" id="mainform" action="/cgi-bin/koha/circ/branchtransfers.pl">
         <table>
             <caption>Transfer</caption>
-- 
2.20.1