From 7aeb88fe2055eff8892fe60e74d3fe39d8f8531b Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Mon, 15 Oct 2007 16:01:56 -0500
Subject: [PATCH] Changing the way resident search form is displayed;
 Reformatting admin-home.tmpl; Updating entry form display on admin pages.

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
---
 .../prog/en/css/staff-global.css              |  20 ++-
 .../prog/en/includes/cat-search.inc           |   4 +-
 .../prog/en/includes/cataloging-search.inc    |   4 +-
 .../prog/en/includes/circ-search.inc          |   6 +-
 .../en/includes/currencies-admin-search.inc   |   6 +-
 .../prog/en/includes/letters-search.inc       |   8 +-
 .../prog/en/includes/members-search.inc       |   6 +-
 .../en/includes/printers-admin-search.inc     |   6 +-
 .../prog/en/includes/serials-search.inc       |   6 +-
 .../en/includes/stopwords-admin-search.inc    |   6 +-
 .../en/includes/suggestions-add-search.inc    |   6 +-
 .../prog/en/includes/z3950-admin-search.inc   |   6 +-
 .../prog/en/modules/admin/admin-home.tmpl     | 150 +++++++----------
 .../prog/en/modules/admin/aqbookfund.tmpl     |  48 +++---
 .../prog/en/modules/admin/aqbudget.tmpl       |  70 ++++----
 .../prog/en/modules/admin/branches.tmpl       | 124 +++++++-------
 .../prog/en/modules/admin/currency.tmpl       |  52 +++---
 .../prog/en/modules/admin/itemtypes.tmpl      | 154 +++++++-----------
 18 files changed, 291 insertions(+), 391 deletions(-)

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 d54748da34..9f82bf5164 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -268,12 +268,6 @@ 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#checkin_search,div#suggestions_search,div#roadtype_search,div#stopword_search {
-	border : 0;
-	border-bottom : 1px solid #FF9900;
-	padding : 0 0 .2em 0;
-}
-
 div#header_search div.residentsearch {
 	border : 0;
 	border-bottom : 1px solid #FF9900;
@@ -781,3 +775,17 @@ ol.bibliodetails span.label {
 	margin-right: 1em;  
 }
 
+div.sysprefs h3 {
+	margin : .2em 0 .2em .4em;
+}
+
+div.sysprefs dl {
+	margin-left : 1.5em;
+}
+
+div.sysprefs div.hint {
+	width : 25%;
+	float : right;
+	padding : .5em;
+	margin : .7em;
+}
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
index e04c650e93..bf83038dce 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
@@ -1,6 +1,6 @@
 <!-- Begin Circulation Resident Search Box -->
 <div id="header_search">
-	<div id="circ_search">
+	<div id="circ_search" class="residentsearch">
 	<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>
@@ -10,7 +10,7 @@
 	<input value="Submit" type="submit" />
 	</form>
 	</div>	
-	<div id="catalog_search">
+	<div id="catalog_search" class="residentsearch">
 	<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" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
index 58651109cc..6a9cddb617 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
@@ -1,13 +1,13 @@
 <!-- Begin Circulation Resident Search Box -->
 <div id="header_search">
-<div id="addbooks_search">
+<div id="addbooks_search" class="residentsearch">
 	<p class="tip">Search the catalog and the reservoir:</p>
 	<form name="search" action="addbooks.pl">
         <input type="text" name="q"  size="40" class="focus" />
         <input type="submit" value="Search" />
 	</form>
 </div>
-	<div id="circ_search">
+	<div id="circ_search" class="residentsearch">
 	<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>
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 08aac7d0ed..c4b827b2fa 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
@@ -1,6 +1,6 @@
 <!-- Begin Circulation Resident Search Box -->
 <div id="header_search">
-	<div id="circ_search">
+	<div id="circ_search" class="residentsearch">
 	<p class="tip">Enter patron card number or partial name:</p>
 	<form action="/cgi-bin/koha/circ/circulation.pl" method="post">
     <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
@@ -9,14 +9,14 @@
 	<input value="Submit" type="submit" />
 	</form>
 	</div>	
-	<div id="checkin_search">
+	<div id="checkin_search" class="residentsearch">
 	<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">
+	<div id="catalog_search" class="residentsearch">
 	<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" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
index 7e4622bea6..d27032eb8c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
@@ -1,13 +1,13 @@
 <!-- Begin Members Resident Search Box -->
 <div id="header_search">
-	<div id="currency_search">
+	<div id="currency_search" class="residentsearch">
 	<p class="tip">Currencies Search:</p>
         <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
                 <input type="text" name="description" size="40" value="<!-- TMPL_VAR NAME="searchfield" -->" />
                 <input type="submit" name="Search" value="Search" />
         </form>	
 	</div>
-	<div id="circ_search">
+	<div id="circ_search" class="residentsearch">
 	<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>
@@ -17,7 +17,7 @@
 	<input value="Submit" type="submit" />
 	</form>
 	</div>	
-	<div id="catalog_search">
+	<div id="catalog_search" class="residentsearch">
 	<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" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
index 6aa1be3bea..6dd994c9b4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
@@ -1,23 +1,23 @@
 <!-- Begin Members Resident Search Box -->
 <div id="header_search">
-	<div id="notices_search">
+	<div id="notices_search" class="residentsearch">
 	<p class="tip">Search Existing Notices:</p>
 <form action="/cgi-bin/koha/tools/letter.pl" method="post">
 		<input type="text" name="searchfield" size="40" value="" />
                 <input type="submit" name="Search" value="Search" />
         </form>	
 	</div>
-	<div id="circ_search">
+	<div id="circ_search" class="residentsearch">
 	<p class="tip">Enter patron card number or partial name:</p>
 	<form action="/cgi-bin/koha/circ/circulation.pl" method="post">
 			<label for="findborrower"> </label>
     <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
-	<input name="branch" value="CPL" type="hidden" />
+	<input name="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">
+	<div id="catalog_search" class="residentsearch">
 	<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" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-search.inc
index f8cfb97c36..6ae46e5d13 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-search.inc
@@ -1,6 +1,6 @@
 <!-- Begin Members Resident Search Box -->
 <div id="header_search">
-	<div id="patron_search">
+	<div id="patron_search" class="residentsearch">
 	<p class="tip">Enter patron card number or partial name:</p>
 	<form action="/cgi-bin/koha/members/member.pl" method="post">
     <input id="searchmember" size="25" name="member" type="text" />
@@ -12,7 +12,7 @@
     <input value="Search" type="submit" />
 </form>
 	</div>
-	<div id="circ_search">
+	<div id="circ_search" class="residentsearch">
 	<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>
@@ -22,7 +22,7 @@
 	<input value="Submit" type="submit" />
 	</form>
 	</div>	
-	<div id="catalog_search">
+	<div id="catalog_search" class="residentsearch">
 	<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" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc
index c7bdfee39b..f18955551b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc
@@ -1,13 +1,13 @@
 <!-- Begin Members Resident Search Box -->
 <div id="header_search">
-	<div id="printer_search">
+	<div id="printer_search" class="residentsearch">
 	<p class="tip">Printer Search:</p>
 <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
                 <input type="text" size="40" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->" />
                 <input type="submit" name="submit" value="Search" />
         </form>
 	</div>
-	<div id="circ_search">
+	<div id="circ_search" class="residentsearch">
 	<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>
@@ -17,7 +17,7 @@
 	<input value="Submit" type="submit" />
 	</form>
 	</div>	
-	<div id="catalog_search">
+	<div id="catalog_search" class="residentsearch">
 	<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" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
index 41202ab82c..eeb8362fcb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
@@ -1,11 +1,11 @@
 <!-- Begin Members Resident Search Box -->
 <div id="header_search">
-	<div id="subscription_search">
+	<div id="subscription_search" class="residentsearch">
 	<p class="tip">Search Subscriptions:</p>
  <form action="/cgi-bin/koha/serials/serials-home.pl" method="get"><!-- TMPL_IF NAME="routing" --><input type="hidden" name="routing" value="<!-- TMPL_VAR NAME="routing" -->" /><!-- /TMPL_IF --><input type="hidden" name="searched" value="1" /> <label for="ISSN_filter">ISSN:</label> <input type="text" size="10" maxlength="11" name="ISSN_filter" id="ISSN_filter" value="<!-- TMPL_VAR name="ISSN_filter" -->" /> <label for="title_filter">Title:</label> <input type="text" size="20" maxlength="40" name="title_filter" id="title_filter" value="<!-- TMPL_VAR name="title_filter" -->" /><input type="submit" value="Search" class="button" />
 </form>
 	</div>
-	<div id="circ_search">
+	<div id="circ_search" class="residentsearch">
 	<p class="tip">Enter patron card number or partial name:</p>
 	<form action="/cgi-bin/koha/circ/circulation.pl" method="post">
     <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
@@ -14,7 +14,7 @@
 	<input value="Submit" type="submit" />
 	</form>
 	</div>	
-	<div id="catalog_search">
+	<div id="catalog_search" class="residentsearch">
 	<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" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc
index b4c1c2b9dc..9a0a8a0fac 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc
@@ -1,14 +1,14 @@
 
 	<!-- Begin Members Resident Search Box -->
 <div id="header_search">
-	<div id="stopword_search">
+	<div id="stopword_search" class="residentsearch">
 	<p class="tip">Stop Word Search:</p>
 	    <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
         <input type="text" size="40" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
         <input type="submit" name="ok" value="Search" />
     </form>
 	</div>
-	<div id="circ_search">
+	<div id="circ_search" class="residentsearch">
 	<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>
@@ -18,7 +18,7 @@
 	<input value="Submit" type="submit" />
 	</form>
 	</div>	
-	<div id="catalog_search">
+	<div id="catalog_search" class="residentsearch">
 	<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" />
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
index d6fcfa446a..a1c3f4b9ef 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
@@ -1,6 +1,6 @@
 <!-- Begin Members Resident Search Box -->
 <div id="header_search">
-	<div id="suggestions_search">
+	<div id="suggestions_search" class="residentsearch">
 	<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"-->" />
@@ -9,7 +9,7 @@
     <input type="submit" class="button" value="Search Suggestions" />
         </form>
 	</div>
-	<div id="circ_search">
+	<div id="circ_search" class="residentsearch">
 	<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>
@@ -19,7 +19,7 @@
 	<input value="Submit" type="submit" />
 	</form>
 	</div>	
-	<div id="catalog_search">
+	<div id="catalog_search" class="residentsearch">
 	<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" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
index 2102c535c4..dfaf653c3d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
@@ -1,13 +1,13 @@
 <!-- Begin Members Resident Search Box -->
 <div id="header_search">
-	<div id="z3950_search">
+	<div id="z3950_search" class="residentsearch">
 	<p class="tip">Z39.50 Server Search:</p>
 	<form action="/cgi-bin/koha/admin/z3950servers.pl" method="post">
                 <input type="text" name="description" size="40" value="<!-- TMPL_VAR NAME="searchfield" -->" />
                 <input type="submit" name="search" value="Search" />
         </form>
 	</div>
-	<div id="circ_search">
+	<div id="circ_search" class="residentsearch">
 	<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>
@@ -17,7 +17,7 @@
 	<input value="Submit" type="submit" />
 	</form>
 	</div>	
-	<div id="catalog_search">
+	<div id="catalog_search" class="residentsearch">
 	<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" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl
index f82c0e3fb2..37e706c5b9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl
@@ -11,101 +11,67 @@
 <div id="doc" class="yui-t7">
    
    <div id="bd">
-	<div id="yui-main">
-	<div class="yui-g"><h1>System Administration</h1>
+	<div id="yui-main" class="sysprefs">
+	<div class="yui-g"><h1>System Preferences</h1>
 
-<table>
-<caption>System Preferences</caption>
-<tr>
-	<td><a href="/cgi-bin/koha/admin/systempreferences.pl">Global system preferences</a></td>
-	<td>Manage global system preferences like MARC flavor, date format, administrator e-mail, and templates.</td>
-</tr>
-</table>
-<table>
-<caption>Configure these parameters in the order they appear</caption>
-<tr>
-<th colspan="2">Basic parameters</th>
-</tr>
-<tr>
-	<td><a href="/cgi-bin/koha/admin/branches.pl">Libraries, branches and agency categories</a></td>
-	<td>Define libraries, branches and agency categories.</td>
-</tr>
-<tr>
-	<td><a href="/cgi-bin/koha/admin/aqbookfund.pl">Accounts and budgets</a></td>
-	<td>Accounts and budgets administration for acquisitions.</td>
-</tr>
-<tr>
-	<td><a href="/cgi-bin/koha/admin/currency.pl">Currencies and exchange rates</a></td>
-	<td>Define currencies and exchange rates used for acquisitions.</td>
-</tr>
-<tr>
-	<td><a href="/cgi-bin/koha/admin/itemtypes.pl">Item types and circulation codes</a></td>
-	<td>Define item types and circulation codes used for circulation rules.</td>
-</tr>
+<dl>
+	<dt><a href="/cgi-bin/koha/admin/systempreferences.pl">Global system preferences</a></dt>
+	<dd>Manage global system preferences like MARC flavor, date format, administrator e-mail, and templates.</dd>
+</dl>
 
-<tr>
-<th colspan="2">Patrons and circulation</th>
-</tr>
-<tr>
-	<td><a href="/cgi-bin/koha/admin/categorie.pl">Patron categories</a></td>
-	<td>Define patron categories.</td>
-</tr>
-<tr>
-	<td><a href="/cgi-bin/koha/admin/cities.pl">Cities and towns</a></td>
-	<td>Define cities and towns that your patrons live in.</td>
-</tr>	
-<tr>
-	<td><a href="/cgi-bin/koha/admin/roadtype.pl" >Road types</a>
-	</td>
-	<td>Define road types (street, avenue, way, etc.). Road types display as authorized values when adding/editing patrons and can be used in geographic statistics.</td>
-</tr>
-<tr>
-	<td><a href="/cgi-bin/koha/admin/issuingrules.pl">Circulation rules</a></td>
-	<td>Define circulation rules in a matrix for libraries / patrons / itemtypes / circ codes (number of checkouts, duration, fee, etc.).</td>
-</tr>
-<tr>
-	<td><a href="/cgi-bin/koha/admin/finesrules.pl">Fines rules</a></td>
-	<td>Define fines in a matrix for libraries / patrons / itemtypes (cost, grace period, etc.).</td>
-</tr>
-<tr>
-<th colspan="2">Catalogue</th>
-</tr>
-<tr>
-	<td><a href="/cgi-bin/koha/admin/authorised_values.pl">Authorised values</a></td>
-	<td>Define categories and authorised values for them.</td>
-</tr>
-<tr>
-	<td><a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC Bibliographic framework</a></td>
-	<td>Create and manage Bibliographic frameworks that define the characteristics of your MARC Records (field and subfield definitions) as well as templates for the MARC editor.</td>
-</tr>
-<tr>
-	<td><a href="/cgi-bin/koha/admin/koha2marclinks.pl">Koha -> MARC mapping</a></td>
-	<td>Define the mappingbetween the Koha transactional database (SQL) and the MARC Bibliographic records. Note that the mapping can be defined through MARC Bibliographic Framework. This tool is just a shortcut to speed up linkage.</td>
-</tr>
-<tr>
-	<td><a href="/cgi-bin/koha/admin/checkmarc.pl">MARC Bibliographic framework test</a></td>
-	<td>Checks the MARC structure. If you change your MARC Bibliographic framework it's recommended that you run this tool to test for errors in your definition.</td></tr>
-<tr>
-    <td><a href="/cgi-bin/koha/admin/authtypes.pl">MARC Authorities framework</a></td>
-    <td>Create and manage Authorities frameworks that define the characteristics of your MARC Records (field and subfield definitions).</td>
-</tr>
 
-<tr>
-<th colspan="2">Additional parameters</th>
-</tr>
-<tr>
-	<td><a href="/cgi-bin/koha/admin/stopwords.pl">Stopwords</a></td>
-	<td>Words ignored during search</td>
-</tr>
-<tr>
-	<td><a href="/cgi-bin/koha/admin/printers.pl">Printers</a></td>
-	<td>Printers (UNIX paths).</td>
-</tr>
-<tr>
-	<td><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 servers</a></td>
-	<td>Define which servers to query for MARC data in the integrated Z39.50 client.</td>
-</tr>
-</table>
+<div class="hint"><h4>Hint:</h4><p>Configure these parameters in the order they appear.</p></div>
+<h3>Basic parameters</h3>
+<dl>
+	<dt><a href="/cgi-bin/koha/admin/branches.pl">Libraries, branches and agency categories</a></dt>
+	<dd>Define libraries, branches and agency categories.</dd>
+	<dt><a href="/cgi-bin/koha/admin/aqbookfund.pl">Accounts and budgets</a></dt>
+	<dd>Accounts and budgets administration for acquisitions.</dd>
+	<dt><a href="/cgi-bin/koha/admin/currency.pl">Currencies and exchange rates</a></dt>
+	<dd>Define currencies and exchange rates used for acquisitions.</dd>
+	<dt><a href="/cgi-bin/koha/admin/itemtypes.pl">Item types and circulation codes</a></dt>
+	<dd>Define item types and circulation codes used for circulation rules.</dd>
+</dl>
+
+<h3>Patrons and circulation</h3>
+<dl>
+	<dt><a href="/cgi-bin/koha/admin/categorie.pl">Patron categories</a></dt>
+	<dd>Define patron categories.</dd>
+	<dt><a href="/cgi-bin/koha/admin/cities.pl">Cities and towns</a></dt>
+	<dd>Define cities and towns that your patrons live in.</dd>
+	<dt><a href="/cgi-bin/koha/admin/roadtype.pl" >Road types</a>
+	</dt>
+	<dd>Define road types (street, avenue, way, etc.). Road types display as authorized values when adding/editing patrons and can be used in geographic statistics.</dd>
+	<dt><a href="/cgi-bin/koha/admin/issuingrules.pl">Circulation rules</a></dt>
+	<dd>Define circulation rules in a matrix for libraries / patrons / itemtypes / circ codes (number of checkouts, duration, fee, etc.).</dd>
+	<dt><a href="/cgi-bin/koha/admin/finesrules.pl">Fines rules</a></dt>
+	<dd>Define fines in a matrix for libraries / patrons / itemtypes (cost, grace period, etc.).</dd>
+</dl>
+
+<h3>Catalogue</h3>
+<dl>
+	<dt><a href="/cgi-bin/koha/admin/authorised_values.pl">Authorised values</a></dt>
+	<dd>Define categories and authorised values for them.</dd>
+	<dt><a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC Bibliographic framework</a></dt>
+	<dd>Create and manage Bibliographic frameworks that define the characteristics of your MARC Records (field and subfield definitions) as well as templates for the MARC editor.</dd>
+	<dt><a href="/cgi-bin/koha/admin/koha2marclinks.pl">Koha to MARC mapping</a></dt>
+	<dd>Define the mappingbetween the Koha transactional database (SQL) and the MARC Bibliographic records. Note that the mapping can be defined through MARC Bibliographic Framework. This tool is just a shortcut to speed up linkage.</dd>
+	<dt><a href="/cgi-bin/koha/admin/checkmarc.pl">MARC Bibliographic framework test</a></dt>
+	<dd>Checks the MARC structure. If you change your MARC Bibliographic framework it's recommended that you run this tool to test for errors in your definition.</dd>
+    <dt><a href="/cgi-bin/koha/admin/authtypes.pl">MARC Authorities framework</a></dt>
+    <dd>Create and manage Authorities frameworks that define the characteristics of your MARC Records (field and subfield definitions).</dd>
+</dl>
+
+<h3>Additional parameters</h3>
+<dl>
+	<dt><a href="/cgi-bin/koha/admin/stopwords.pl">Stopwords</a></dt>
+	<dd>Words ignored during search</dd>
+	<dt><a href="/cgi-bin/koha/admin/printers.pl">Printers</a></dt>
+	<dd>Printers (UNIX paths).</dd>
+	<dt><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 servers</a></dt>
+	<dd>Define which servers to query for MARC data in the integrated Z39.50 client.</dd>
+</dl>
+
 
 </div>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl
index 4621603837..aad0155068 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl
@@ -166,37 +166,30 @@
   <input type="hidden" name="op" value="add_validate" />
   <input type="hidden" name="checked" value="0" />
 
-  <table>
-    <caption><!-- TMPL_VAR name="header" --></caption>
+  <fieldset class="rows">
+    <legend><!-- TMPL_VAR name="header" --></legend>
     
-  <!-- TMPL_IF name="add_or_modify" -->
-    <tr>
-      <th>Book fund</th>
-      <td>
-        <input type="hidden" name="bookfundid" value="<!-- TMPL_VAR name="bookfundid" -->" />
+  <ol><!-- TMPL_IF name="add_or_modify" -->
+    <li>
+      	<span class="label">Book fund: </span>
+        <input type="hidden" name="bookfundid" id="bookfundid" value="<!-- TMPL_VAR name="bookfundid" -->" />
         <!-- TMPL_VAR name="bookfundid" -->
-      </td>
-    </tr>
+    </li>
   <!-- TMPL_ELSE -->
-    <tr>
-      <th>Book fund</th>
-      <td>
-        <input type="text" name="bookfundid" size="5" maxlength="5" onblur="toUC(this)" />
-      </td>
-    </tr>
+    <li>
+      <label for="bookfundid">Book fund: </label>
+      <input type="text" name="bookfundid" id="bookfundid" size="5" maxlength="5" onblur="toUC(this)" />
+    </li>
   <!-- /TMPL_IF --> <!-- add_or_modify -->
     
-    <tr>
-      <th>Name</th>
-      <td>
-        <input type="text" name="bookfundname" size="40" maxlength="80" value="<!-- TMPL_VAR name="bookfundname" escape="HTML" -->" />
-      </td>
-    </tr>
+    <li>
+      <label for="bookfundname">Name: </label>
+	  <input type="text" name="bookfundname" id="bookfundname" size="40" maxlength="80" value="<!-- TMPL_VAR name="bookfundname" escape="HTML" -->" />
+      </li>
 
-    <tr>
-      <th>Branch</th>
-      <td>
-        <select name="branchcode">
+    <li>
+      <label for="branchcode">Branch: </label>
+      <select name="branchcode" id="branchcode">
           <option value="">None</option>
   <!-- TMPL_LOOP NAME="branches" -->
     <!-- TMPL_IF NAME="selected" -->
@@ -206,10 +199,9 @@
     <!-- /TMPL_IF -->
   <!-- /TMPL_LOOP -->
   	</select>
-      </td>
-    </tr>
+    </li></ol>
     
-  </table>
+  </fieldset>
 
   <p>
     <input type="button" value="Submit" onclick="Check(this.form); return false;" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl
index 1827e99a20..e42010c64d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl
@@ -242,26 +242,21 @@
 <!-- TMPL_IF name="add_form" -->
 
 <form action="/cgi-bin/koha/admin/aqbudget.pl" name="Aform" method="post">
-  <fieldset>
+  <fieldset class="rows">
     <legend><!-- TMPL_IF NAME="aqbudgetid" -->Modify<!-- TMPL_ELSE -->Add<!-- /TMPL_IF --> budget</legend>
     <input type="hidden" name="op" value="add_validate" />
     <input type="hidden" name="checked" value="0" />
 
-    <table>
-      <tr>
-        <th>Book fund</th>
-        <td>
-          <input type="hidden" name="bookfundid" value="<!-- TMPL_VAR NAME="bookfundid" -->" />
+    
+     <ol> <li>
+        <span class="label">Book fund: </span>
+        <input type="hidden" name="bookfundid" value="<!-- TMPL_VAR NAME="bookfundid" -->" />
           <!-- TMPL_VAR NAME="bookfundname" -->
-        </td>
-      </tr>
+      </li>
 
-      <tr>
-        <th>
-          <label for="startdate">Start date (<!-- TMPL_VAR NAME="dateformat" -->)</label>
-        </th>
-        <td>
-          <input type="text" size="8" maxlength="10" id="startdate" name="startdate" value="<!-- TMPL_VAR Name="startdate" -->" />
+      <li>
+          <label for="startdate">Start date (<!-- TMPL_VAR NAME="dateformat" -->): </label>
+			<input type="text" size="8" maxlength="10" id="startdate" name="startdate" value="<!-- TMPL_VAR Name="startdate" -->" />
           <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="startdate_button" alt="Show Calendar" />
           <script type="text/javascript">
 //<![CDATA[
@@ -274,13 +269,10 @@
             );
           //]]>
 </script>
-        </td>
-      </tr>
-      <tr>
-        <th>
-          <label for="enddate">End date (<!-- TMPL_VAR NAME="dateformat" -->)</label>
-        </th>
-        <td>
+        
+      </li>
+      <li>
+          <label for="enddate">End date (<!-- TMPL_VAR NAME="dateformat" -->): </label>
           <input type="text" size="8" maxlength="10" id="enddate" name="enddate" value="<!-- TMPL_VAR Name="enddate" -->" />
           <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="enddate_button" alt="Show Calendar" />
           <script type="text/javascript">
@@ -294,28 +286,23 @@
             );
           //]]>
 </script>
-        </td>
-      </tr>
-      <tr>
-        <th>
-          <label for="budgetamount">Budget amount</label>
-        </th>
-        <td>
+        
+      </li>
+      <li>
+          <label for="budgetamount">Budget amount: </label>
           <input type="text" name="budgetamount" id="budgetamount" value="<!-- TMPL_VAR NAME="budgetamount" -->" size="8" />
-        </td>
-      </tr>
-      <tr>
-        <th>
-          <label for="branch">Branch</label>
-        </th>
-        <td>
+        
+      </li>
+      <li>
+          <label for="branch">Branch: </label>
+        
   <!-- TMPL_IF NAME="disable_branchselection" -->
           <!-- Pierrick's note: I've found that a disabled select was not -->
           <!-- giving its value to Perl :-/ So I use a hidden field trick -->
           <input type="hidden" name="branch" id="branch" value="<!-- TMPL_VAR NAME="branch" -->" />
           <select name="branch" disabled="disabled">
   <!-- TMPL_ELSE -->
-          <select name="branch">
+          <select name="branch" id="branch">
   <!-- /TMPL_IF -->
 
             <option value="">----</option>
@@ -327,19 +314,18 @@
     <!-- /TMPL_IF -->
   <!-- /TMPL_LOOP -->
           </select>
-        </td>
-      </tr>
-    </table>
+        
+      </li></ol>
+    
 
   <!-- TMPL_IF NAME="aqbudgetid" -->
     <input type="hidden" name="aqbudgetid" value="<!-- TMPL_VAR NAME="aqbudgetid" -->" />
   <!-- /TMPL_IF -->
 
+  </fieldset>
     <p id="action">
       <input type="button" value="Submit" onclick="Check(this.form)" />
-      <input type="submit" value="Cancel" onclick="location.href='/cgi-bin/koha/admin/aqbudget.pl'; return false;" />
-    </p>
-  </fieldset>
+     </p>
 </form>
 <!-- /TMPL_IF --> <!-- add_form -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
index a1fb793446..034458f282 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
@@ -1,6 +1,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Administration &rsaquo; <!-- TMPL_IF NAME="editcategory" --><!-- TMPL_IF NAME="categorycode" -->Edit Agency Category <!-- TMPL_VAR NAME="categorycode" --><!-- TMPL_ELSE -->Add Agency Category<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_category" -->Confirm Deletion of Agency Category <!-- TMPL_VAR name="categorycode" --><!-- /TMPL_IF --><!-- TMPL_IF name="add" -->
-    <!-- TMPL_IF name="heading-branches-add-branch-p" -->Add library<!-- TMPL_ELSE -->Modify library <!-- TMPL_VAR name="branchcode" --><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF name="delete_confirm" -->Confirm deletion of library '<!-- TMPL_VAR NAME="branchcode" -->'<!-- /TMPL_IF --><!-- TMPL_IF name="else" -->Libraries, branches, agency categories<!-- /TMPL_IF --></title>
+    <!-- TMPL_IF name="heading-branches-add-branch-p" -->Add library<!-- TMPL_ELSE -->Modify library <!-- TMPL_VAR name="branchcode" --><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF name="delete_confirm" -->Confirm deletion of library '<!-- TMPL_VAR NAME="branchcode" -->'<!-- /TMPL_IF --><!-- TMPL_IF name="else" -->Libraries, branches, &amp; Agency categories<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
@@ -9,15 +9,15 @@
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo;  
 
-<!-- TMPL_IF NAME="editcategory" --><a href="/cgi-bin/koha/admin/branches.pl">Libraries, branches, agency categories</a> &rsaquo; <!-- TMPL_IF NAME="categorycode" -->Edit Agency Category <!-- TMPL_VAR NAME="categorycode" --><!-- TMPL_ELSE -->Add Agency Category<!-- /TMPL_IF --><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="delete_category" --><a href="/cgi-bin/koha/admin/branches.pl">Libraries, branches, agency categories</a> &rsaquo; Confirm Deletion of Agency Category <!-- TMPL_VAR name="categorycode" --><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="editcategory" --><a href="/cgi-bin/koha/admin/branches.pl">Libraries, Branches, &amp; Agency Categories</a> &rsaquo; <!-- TMPL_IF NAME="categorycode" -->Edit Agency Category <!-- TMPL_VAR NAME="categorycode" --><!-- TMPL_ELSE -->Add Agency Category<!-- /TMPL_IF --><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="delete_category" --><a href="/cgi-bin/koha/admin/branches.pl">Libraries, Branches, &amp; Agency Categories</a> &rsaquo; Confirm Deletion of Agency Category <!-- TMPL_VAR name="categorycode" --><!-- /TMPL_IF -->
 
-<!-- TMPL_IF name="add" --><a href="/cgi-bin/koha/admin/branches.pl">Libraries, branches, agency categories</a> &rsaquo; 
+<!-- TMPL_IF name="add" --><a href="/cgi-bin/koha/admin/branches.pl">Libraries, Branches, &amp; Agency Categories</a> &rsaquo; 
 <!-- TMPL_IF name="heading-branches-add-branch-p" -->Add library<!-- TMPL_ELSE -->Modify library <!-- TMPL_VAR name="branchcode" --><!-- /TMPL_IF --><!-- /TMPL_IF -->
 
-<!-- TMPL_IF name="delete_confirm" --><a href="/cgi-bin/koha/admin/branches.pl">Libraries, branches, agency categories</a> &rsaquo; Confirm deletion of library '<!-- TMPL_VAR NAME="branchcode" -->'<!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirm" --><a href="/cgi-bin/koha/admin/branches.pl">Libraries, Branches, &amp; Agency Categories</a> &rsaquo; Confirm deletion of library '<!-- TMPL_VAR NAME="branchcode" -->'<!-- /TMPL_IF -->
 
-<!-- TMPL_IF name="else" -->Libraries, branches, agency categories<!-- /TMPL_IF -->
+<!-- TMPL_IF name="else" -->Libraries, Branches, &amp; Agency Categories<!-- /TMPL_IF -->
 
 </div>
 
@@ -28,47 +28,46 @@
 	<div class="yui-b">
 
 <!-- TMPL_IF name="add" -->
-    <!-- TMPL_IF name="heading-branches-add-branch-p" -->
-        <h1>Add library</h1>
-    <!-- TMPL_ELSE -->
-        <h1>Modify library</h1>
-    <!-- /TMPL_IF -->
+  <h3><!-- TMPL_IF name="heading-branches-add-branch-p" -->Add library<!-- TMPL_ELSE -->Modify library<!-- /TMPL_IF --></h3>
     <form action="<!-- TMPL_VAR name="action" -->" name="Aform" method="post">
+	<fieldset class="rows">
         <input type="hidden" name="op" value="add_validate" />
         <!-- TMPL_IF name="heading-branches-add-branch-p" -->
             <input type="hidden" name="add" value="1" />
         <!-- TMPL_ELSE -->
             <input type="hidden" name="add" value="0" />
         <!-- /TMPL_IF -->
-        <p>
-            <label><b>Library code</b></label>
+        <ol><li>
             <!-- TMPL_IF name="branchcode" -->
+			<span class="label">Library code</span>
                 <input type="hidden" name="branchcode" value="<!-- TMPL_VAR name="branchcode" escape="HTML" -->" />
                 <!-- TMPL_VAR name="branchcode" -->
             <!-- TMPL_ELSE -->
-                <input type="text" name="branchcode" size="10" maxlength="10" value="<!-- TMPL_VAR name="branchcode" escape="HTML" -->" />
+            <label for="branchcode">Library code</label>
+                <input type="text" name="branchcode" id="branchcode" size="10" maxlength="10" value="<!-- TMPL_VAR name="branchcode" escape="HTML" -->" />
             <!-- /TMPL_IF -->
-        </p>
-        <p>
-            <label><b>Name</b></label>
-            <input type="text" name="branchname" size="40" maxlength="80" value="<!-- TMPL_VAR name="branch_name" escape="HTML" -->" />&nbsp;
-        </p>
-		Agency Categories:
-        <!-- TMPL_LOOP name="categoryloop" -->
-            <p>
-                <input type="checkbox" name="<!-- TMPL_VAR name="categorycode" -->" <!-- TMPL_VAR name="checked" --> />
-				<label for="<!-- TMPL_VAR name="categorycode" -->"><!-- TMPL_VAR name="categoryname" --></label>
-				: <!-- TMPL_VAR name="codedescription" -->
-            </p>
-        <!-- /TMPL_LOOP -->
-        <p><label>Address</label><input type="text" name="branchaddress1" value="<!-- TMPL_VAR name="branchaddress1" escape="HTML" -->" /></p>
-        <p><label>&nbsp;</label><input type="text" name="branchaddress2" value="<!-- TMPL_VAR name="branchaddress2" escape="HTML" -->" /></p>
-        <p><label>&nbsp;</label><input type="text" name="branchaddress3" value="<!-- TMPL_VAR name="branchaddress3" escape="HTML" -->" /></p>
-        <p><label>Phone</label><input type="text" name="branchphone" value="<!-- TMPL_VAR name="branchphone" escape="HTML" -->" /></p>
-        <p><label>Fax</label><input type="text" name="branchfax" value="<!-- TMPL_VAR name="branchfax" escape="HTML" -->" /></p>
-        <p><label>E-mail</label><input type="text" name="branchemail" value="<!-- TMPL_VAR name="branchemail" escape="HTML" -->" /></p>
-        <p><label>IP</label><input type="text" name="branchip" value="<!-- TMPL_VAR name="branchip" escape="HTML" -->" />can be entered as a single IP, or a subnet such as 192.168.1.*</p>
-        <p><label>Library Printer</label>
+        </li>
+        <li>
+            <label for="branchname">Name</label>
+            <input type="text" name="branchname" id="branchname" size="40" maxlength="80" value="<!-- TMPL_VAR name="branch_name" escape="HTML" -->" />&nbsp;
+        </li>
+		<li><fieldset><legend>Agency Categories:</legend>
+        <ol>
+		<!-- TMPL_LOOP name="categoryloop" -->
+            <li><label for="<!-- TMPL_VAR name="categorycode" -->"><!-- TMPL_VAR name="categoryname" --></label>
+                <input type="checkbox" id="<!-- TMPL_VAR name="categorycode" -->" name="<!-- TMPL_VAR name="categorycode" -->" <!-- TMPL_VAR name="checked" --> /> <span class="hint"><!-- TMPL_VAR name="codedescription" --></span>
+            </li>
+        <!-- /TMPL_LOOP --></fieldset>
+		</ol>
+		</li>
+        <li><label for="branchaddress1">Address Line 1</label><input type="text" name="branchaddress1" id="branchaddress1" value="<!-- TMPL_VAR name="branchaddress1" escape="HTML" -->" /></li>
+        <li><label for="branchaddress2">Address Line 2</label><input type="text" name="branchaddress2" id="branchaddress2" value="<!-- TMPL_VAR name="branchaddress2" escape="HTML" -->" /></li>
+        <li><label for="branchaddress3">Address Line 3</label><input type="text" name="branchaddress3" id="branchaddress3" value="<!-- TMPL_VAR name="branchaddress3" escape="HTML" -->" /></li>
+        <li><label for="branchphone">Phone</label><input type="text" name="branchphone" id="branchphone" value="<!-- TMPL_VAR name="branchphone" escape="HTML" -->" /></li>
+        <li><label for="branchfax">Fax</label><input type="text" name="branchfax" id="branchfax" value="<!-- TMPL_VAR name="branchfax" escape="HTML" -->" /></li>
+        <li><label for="branchemail">E-mail</label><input type="text" name="branchemail" id="branchemail" value="<!-- TMPL_VAR name="branchemail" escape="HTML" -->" /></li>
+        <li><label for="branchip">IP</label><input type="text" name="branchip" id="branchip" value="<!-- TMPL_VAR name="branchip" escape="HTML" -->" /> <span class="hint">Can be entered as a single IP, or a subnet such as 192.168.1.*</span></li>
+        <li><label for="branchprinter">Library Printer</label>
             <select id="branchprinter" name="branchprinter">
                 <option value="">None</option>
             <!-- TMPL_LOOP NAME="printerloop" -->
@@ -78,7 +77,8 @@
 				<option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="branchprinter" --></option>
 				<!-- /TMPL_IF -->
                 <!-- /TMPL_LOOP -->
-            </select></p>
+            </select></li></ol>
+			</fieldset>
         <p><input type="submit" value="Submit" /></p>
     </form>
 <!-- /TMPL_IF -->
@@ -185,25 +185,16 @@
         <td><!-- TMPL_VAR name="categoryname" --></td>
         <td><!-- TMPL_VAR name="categorycode" --></td>
         <td><!-- TMPL_VAR name="codedescription" --></td>
-        <td>
-            <form action="<!-- TMPL_VAR name="action" -->" method="post">
-            <input type="hidden" name="op" value="editcategory" />
-            <input type="hidden" name="categorycode" value="<!-- TMPL_VAR name="categorycode" escape="HTML" -->" />
-            <input type="submit" value="Edit" />
-            </form>
+        <td><a href="<!-- TMPL_VAR name="action" -->?op=editcategory&amp;categorycode=<!-- TMPL_VAR name="categorycode" escape="HTML" -->">Edit</a>
         </td>
-        <td>
-            <form action="<!-- TMPL_VAR name="action" -->" method="post">
-            <input type="hidden" name="categorycode" value="<!-- TMPL_VAR name="categorycode" escape="HTML" -->" />
-            <input type="hidden" name="op" value="delete_category" /><input type="submit" value="Delete" />
-            </form>
+        <td><a href="<!-- TMPL_VAR name="action" -->?op=delete_category&amp;categorycode=<!-- TMPL_VAR name="categorycode" escape="HTML" -->">Delete</a>
         </td>
         </tr>
     <!-- /TMPL_LOOP -->
     </table>
     <!-- TMPL_ELSE -->
         <p>
-            <b>No Agency Categories defined.</b>
+            No Agency Categories defined.
         </p>
     <!-- /TMPL_IF --> <!-- NAME="branchcategories" -->
     <form action="<!-- TMPL_VAR name="action" -->" method="post"><p>
@@ -213,31 +204,30 @@
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF name="editcategory" -->
-    
+    <h3><!-- TMPL_IF NAME="categorycode" -->Edit Agency Category <!-- TMPL_VAR NAME="categorycode" --><!-- TMPL_ELSE -->Add Agency Category<!-- /TMPL_IF --></h3>
     <form action="<!-- TMPL_VAR name="action" -->" name="Aform" method="post">
     <input type="hidden" name="op" value="addcategory_validate" />
-    <table>
-        <caption><!-- TMPL_IF NAME="categorycode" -->Edit Agency Category <!-- TMPL_VAR NAME="categorycode" --><!-- TMPL_ELSE -->Add Agency Category<!-- /TMPL_IF --></caption>
-        <tr>
-            <td>Category code</td>
-            <td>
+    <fieldset class="rows">
+        
+        <ol><li>
                 <!-- TMPL_IF name="categorycode" -->
-                    <input type="hidden" name="categorycode" value="<!-- TMPL_VAR name="categorycode" escape="HTML" -->" />
+				<span class="label">Category code: </span>
+                    <input type="hidden" name="categorycode" id="categorycode" value="<!-- TMPL_VAR name="categorycode" escape="HTML" -->" />
                     <!-- TMPL_VAR name="categorycode" -->
                 <!-- TMPL_ELSE -->
-                    <input type="text" name="categorycode" size="5" maxlength="5" value="<!-- TMPL_VAR name="categorycode" escape="HTML" -->" />
+            <label for="categorycode">Category code:</label>
+                    <input type="text" name="categorycode" id="categorycode" size="5" maxlength="5" value="<!-- TMPL_VAR name="categorycode" escape="HTML" -->" />
                 <!-- /TMPL_IF -->
-            </td>
-        </tr>
-        <tr>
-            <td>Name</td>
-            <td><input type="text" name="categoryname" size="40" maxlength="80" value="<!-- TMPL_VAR name="categoryname" escape="HTML" -->" /></td>
-        </tr>
-        <tr>
-            <td>Description</td>
-            <td><input type="text" name="codedescription" size="40" maxlength="80" value="<!-- TMPL_VAR name="codedescription" escape="HTML" -->" /></td>
-        </tr>
-    </table><input type="submit" value="Update" />
+            </li>
+        <li>
+            <label for="categoryname">Name: </label>
+            <input type="text" name="categoryname" id="categoryname" size="40" maxlength="80" value="<!-- TMPL_VAR name="categoryname" escape="HTML" -->" />
+        </li>
+        <li>
+            <label for="codedescription">Description: </label>
+            <input type="text" name="codedescription" id="codedescription" size="70" maxlength="80" value="<!-- TMPL_VAR name="codedescription" escape="HTML" -->" />
+        </li></ol>
+    </fieldset><input type="submit" value="Update" />
     </form>
 <!-- /TMPL_IF -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl
index c987969d16..3f05396496 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl
@@ -1,6 +1,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Administration &rsaquo;
-<!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="searchfield" -->Modify Currency '<!-- TMPL NAME="searchfield" -->'<!-- TMPL_ELSE -->Add Currency<!-- /TMPL_IF --><!-- /TMPL_IF -->
+<title>Koha &rsaquo; Administration &rsaquo; Currencies &amp; Exchange Rates &rsaquo; 
+<!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="searchfield" -->Modify Currency '<!-- TMPL_VAR NAME="searchfield" -->'<!-- TMPL_ELSE -->Add Currency<!-- /TMPL_IF --><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="add_validate" -->Data Recorded<!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="delete_confirm" -->Confirm Deletion of Currency '<!-- TMPL_VAR NAME="searchfield" -->'<!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="delete_confirmed" -->Currency Deleted<!-- /TMPL_IF -->
@@ -68,7 +68,7 @@
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="currencies-admin-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="searchfield" -->Modify Currency '<!-- TMPL NAME="searchfield" -->'<!-- TMPL_ELSE -->Add Currency<!-- /TMPL_IF --><!-- /TMPL_IF -->
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo;  <a href="/cgi-bin/koha/admin/currency.pl">Currencies &amp; Exchange Rates</a> &rsaquo; <!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="searchfield" -->Modify Currency '<!-- TMPL_VAR NAME="searchfield" -->'<!-- TMPL_ELSE -->Add Currency<!-- /TMPL_IF --><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="add_validate" -->Data Recorded<!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="delete_confirm" -->Confirm Deletion of Currency '<!-- TMPL_VAR NAME="searchfield" -->'<!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="delete_confirmed" -->Currency Deleted<!-- /TMPL_IF -->
@@ -86,37 +86,31 @@
 <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
 <input type="hidden" name="op" value="add_validate" />
 
-	<table>
-	<caption><!-- TMPL_IF NAME="searchfield" -->
+	<fieldset class="rows">
+	<legend><!-- TMPL_IF NAME="searchfield" -->
 		Modify currency
 	<!-- TMPL_ELSE -->
 		Add currency
-	<!-- /TMPL_IF --></caption>
-	<!-- TMPL_IF NAME="searchfield" -->
-		<tr>
-			<th>Currency</th>
-			<td>
-				<input type="hidden" name="currency" value="<!-- TMPL_VAR NAME="searchfield" -->" /><!-- TMPL_VAR NAME="searchfield" -->
-			</td>
-		</tr>
+	<!-- /TMPL_IF --></legend>
+	<ol><!-- TMPL_IF NAME="searchfield" -->
+		<li>
+			<span class="label">Currency: </span>
+			<input type="hidden" name="currency" id="currency" value="<!-- TMPL_VAR NAME="searchfield" -->" /><!-- TMPL_VAR NAME="searchfield" -->
+			</li>
 	<!-- TMPL_ELSE -->
-		<tr>
-			<th>Currency</th>
-			<td>
-				<input type="text" name="currency" size="50" maxlength="50" onblur="toUC(this);" />
-			</td>
-		</tr>
+		<li>
+			<label for="currency">Currency: </label>
+			<input type="text" name="currency" id="currency" size="50" maxlength="50" onblur="toUC(this);" />
+			</li>
 	<!-- /TMPL_IF -->
 
-        	<tr>
-			<th>Rate</th	>
-			<td>
-				<input type="text" name="rate" size="10" maxlength="10" value="<!-- TMPL_VAR NAME="rate" -->" />
-			</td>
-		</tr>
-        </table>
+        	<li>
+			<label for="rate">Rate: </label>
+			<input type="text" name="rate" id="rate" size="10" maxlength="10" value="<!-- TMPL_VAR NAME="rate" -->" />
+			</li></ol>
+        </fieldset>
 		
-		<input type="button" value="OK" onclick="Check(this.form)" /> <input type="button" value="Cancel" onclick="location.href='<!-- TMPL_VAR NAME="script_name" -->'; return false;" />
+		<input type="submit" value="Submit" onclick="Check(this.form)" /> 
         </form>
 
 <!-- /TMPL_IF -->
@@ -184,8 +178,8 @@
 		<tr>
 			<td><!-- TMPL_VAR NAME="currency" --></td>
 			<td><!-- TMPL_VAR NAME="rate" --></td>
-			<td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="op" value="add_form" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="currency" -->" /><input type="submit" value="Edit" /></form></td>
-                        <td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="get"><input type="hidden" name="op" value="delete_confirm" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="currency" -->" /><input type="submit" value="Delete" /></form></td>
+			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="currency" -->">Edit</a></td>
+                        <td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="currency" -->">Delete</a></td>
 		</tr>
 		<!-- /TMPL_LOOP -->
 	</table>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl
index 0789e5eade..904f3f87b5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl
@@ -1,24 +1,21 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Administration &rsaquo;<!-- TMPL_IF name="add_form" -->
+<title>Koha &rsaquo; Administration &rsaquo; Item Types <!-- TMPL_IF name="add_form" -->&rsaquo; 
   <!-- TMPL_IF name="itemtype" -->
 Modify item type '<!-- TMPL_VAR name="itemtype" -->'
   <!-- TMPL_ELSE -->
 Add item type
   <!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
-<!-- TMPL_IF name="delete_confirm" -->
+<!-- TMPL_IF name="delete_confirm" -->&rsaquo; 
   <!-- TMPL_IF name="total" -->
 Cannot Delete Item Type '<!-- TMPL_VAR name="itemtype" -->'
   <!-- TMPL_ELSE -->
 Delete Item Type '<!-- TMPL_VAR name="itemtype" -->'?
   <!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
-<!-- TMPL_IF name="delete_confirmed" -->
+<!-- TMPL_IF name="delete_confirmed" -->&rsaquo; 
 Data Deleted
 <!-- /TMPL_IF -->
-<!-- TMPL_IF name="else" -->
-Item Types Administration
-<!-- /TMPL_IF -->
 </title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" --><script type="text/javascript">
 //<![CDATA[
@@ -85,20 +82,20 @@ function Check(f) {
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF name="add_form" -->
   <!-- TMPL_IF name="itemtype" -->
-Modify item type '<!-- TMPL_VAR name="itemtype" -->'
+<a href="/cgi-bin/koha/admin/itemtypes.pl">Item Types</a> &rsaquo; Modify item type '<!-- TMPL_VAR name="itemtype" -->'
   <!-- TMPL_ELSE -->
-Add item type
+<a href="/cgi-bin/koha/admin/itemtypes.pl">Item Types</a> &rsaquo; Add item type
   <!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
 <!-- TMPL_IF name="delete_confirm" -->
   <!-- TMPL_IF name="total" -->
-Cannot Delete Item Type '<!-- TMPL_VAR name="itemtype" -->'
+<a href="/cgi-bin/koha/admin/itemtypes.pl">Item Types</a> &rsaquo; Cannot Delete Item Type '<!-- TMPL_VAR name="itemtype" -->'
   <!-- TMPL_ELSE -->
-Delete Item Type '<!-- TMPL_VAR name="itemtype" -->'?
+<a href="/cgi-bin/koha/admin/itemtypes.pl">Item Types</a> &rsaquo; Delete Item Type '<!-- TMPL_VAR name="itemtype" -->'?
   <!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
 <!-- TMPL_IF name="delete_confirmed" -->
-Data Deleted
+<a href="/cgi-bin/koha/admin/itemtypes.pl">Item Types</a> &rsaquo;Data Deleted
 <!-- /TMPL_IF -->
 <!-- TMPL_IF name="else" -->
 Item Types Administration
@@ -120,41 +117,30 @@ Item Types Administration
   <input type="hidden" name="op" value="add_validate" />
     <input type="hidden" name="checked" value="0" />
 		
-    <table>
+    <fieldset class="rows">
+	<ol>
   <!-- TMPL_IF name="itemtype" -->
-      <tr>
-        <th>
-          <label>Item type</label>
-        </th>
-        <td>
-          <input type="hidden" name="itemtype" value="<!-- TMPL_VAR name="itemtype" -->" />
+      <li>
+          <span class="label">Item type</span> <input type="hidden" name="itemtype" value="<!-- TMPL_VAR name="itemtype" -->" />
           <!-- TMPL_VAR name="itemtype" -->
-        </td>
-      </tr>
+     </li>
   <!-- TMPL_ELSE -->
-      <tr>
-        <th>
-          <label for="itemtype">Item type</label>
-        </th>
-        <td>
-          <input type="text" id="itemtype" name="itemtype" size="10" maxlength="10" onblur="toUC(this)" />
-        </td>
-      </tr>
+      <li>
+          <label for="itemtype">Item type</label> <input type="text" id="itemtype" name="itemtype" size="10" maxlength="10" onblur="toUC(this)" />
+      </li>
   <!-- /TMPL_IF -->
-      <tr>
-        <th>
-          <label for="description">Description</label>
-        </th>
-	<td>
-          <input type="text" id="description" name="description" size="48" maxlength="80" value="<!-- TMPL_VAR name="description" escape="HTML" -->" />
-        </td>
-      </tr>
-      <tr>
-        <th>Image</th>
-        <td>
-          <p>
+      <li>
+          <label for="description">Description</label><input type="text" id="description" name="description" size="48" maxlength="80" value="<!-- TMPL_VAR name="description" escape="HTML" -->" />      </li>
+      <li><fieldset>
+	  <legend>Image: </legend>
+        
+          <ol>
   <!-- TMPL_LOOP NAME="IMAGESLOOP" -->
-            <label>
+  			<li style="float: none; display: inline; clear : none; width: auto;">
+            <label> <!-- TMPL_IF NAME="KohaImageSrc" -->
+              <img src="<!-- TMPL_VAR name="KohaImageSrc" -->" alt="<!-- TMPL_VAR name="KohaImageSrc" -->" title="<!-- TMPL_VAR name="KohaImageSrc" -->" />
+        <!-- TMPL_ELSE -->
+        <!-- /TMPL_IF -->
     <!-- TMPL_IF name="checked" -->
               <input type="radio" name="image" value="<!-- TMPL_VAR name="KohaImage" -->" checked="checked" />
     <!-- TMPL_ELSE -->
@@ -162,80 +148,58 @@ Item Types Administration
               <input type="radio" name="image" value="<!-- TMPL_VAR name="KohaImage" -->" />
               <!-- /TMPL_IF -->
     <!-- /TMPL_IF -->
-        <!-- TMPL_IF NAME="KohaImageSrc" -->
-              <img src="<!-- TMPL_VAR name="KohaImageSrc" -->" alt="<!-- TMPL_VAR name="KohaImageSrc" -->" title="<!-- TMPL_VAR name="KohaImageSrc" -->" />
-        <!-- TMPL_ELSE -->
-              <br />
-        <!-- /TMPL_IF -->
             </label>
+			</li>
   <!-- /TMPL_LOOP -->
-          </p>
-
-          <p>
-            <label>
+	<li>
+            <label for="remote_image_check"> Remote image:</label>
   <!-- TMPL_IF name="remote_image" -->
             <input type="radio" id="remote_image_check" name="image" value="remoteImage" checked="checked" />
   <!-- TMPL_ELSE -->
             <input type="radio" id="remote_image_check" name="image" value="remoteImage" />
   <!-- /TMPL_IF -->
-            remote image
-            </label>
+           
             <input type="text" name="remoteImage" size="48" maxlength="200" value="<!-- TMPL_VAR name="remote_image" -->" onmousedown="document.getElementById('remote_image_check').checked = true;" />
 
   <!-- TMPL_IF name="remote_image" -->
             <img src="<!-- TMPL_VAR name="remote_image" -->" alt="" />
   <!-- /TMPL_IF -->
-          </p>
-          <hr />
-          <p>
-            <label><input type="radio" name="image" value="removeImage" /> remove image</label>
-          </p>
-        </td>
-      </tr>
-      <tr>
-        <th>
-          <label for="notforloan">Not for loan</label>
-        </th>
-        <td>
-            <!-- TMPL_IF name="notforloan" -->
+          </li>
+          <li>
+            <label for="noimage">No image: </label><input type="radio" name="image" id="noimage" value="removeImage" />
+          </li>
+        
+          </ol>
+		  </fieldset>
+      </li>
+      <li>
+          <label for="notforloan">Not for loan</label>   <!-- TMPL_IF name="notforloan" -->
                 <input type="checkbox" id="notforloan" name="notforloan" checked="checked" value="1" />
             <!-- TMPL_ELSE -->
                 <input type="checkbox" id="notforloan" name="notforloan" value="1" />
             <!-- /TMPL_IF -->
           (if checked, no item of this type can be issued. If not checked, every item of this type can be issued unless notforloan is set for a specific item)
-        </td>
-      </tr>
-      <tr>
-        <th>
-          <label for="renewalsallowed">Renewals</label>
-        </th>
-        <td>
-	          <input type="text" id="renewalsallowed" name="renewalsallowed" size="3" maxlength="3" value="<!-- TMPL_VAR NAME="renewalsallowed" -->" />
-        </td>
-      </tr>
-      <tr>
-        <th>
-          <label for="rentalcharge">Rental charge</label>
-        </th>
-        <td>
-          <input type="text" id="rentalcharge" name="rentalcharge" size="10" value="<!-- TMPL_VAR name="rentalcharge" -->" />
-        </td>
-      </tr>
-      <tr>
-        <th>
-          <label for="rentalcharge">Summary</label>
-        </th>
-        <td><p>Enter a summary that will overwrite the default one in search results lists</p>
-          <p><textarea id="summary" name="summary" cols="40" rows="10"><!-- TMPL_VAR NAME="summary" --></textarea></p>
-          <p>Example, for a website itemtype : </p>
+        
+      </li>
+      <li>
+          <label for="renewalsallowed">Renewals: </label>
+		  <input type="text" id="renewalsallowed" name="renewalsallowed" size="3" maxlength="3" value="<!-- TMPL_VAR NAME="renewalsallowed" -->" />
+        </li>
+      <li>
+          <label for="rentalcharge">Rental charge: </label>
+		  <input type="text" id="rentalcharge" name="rentalcharge" size="10" value="<!-- TMPL_VAR name="rentalcharge" -->" />
+         </li>
+      <li>
+          <label for="summary">Summary: </label>
+         <textarea id="summary" name="summary" cols="55" rows="5"><!-- TMPL_VAR NAME="summary" --></textarea>
+          <p>Enter a summary that will overwrite the default one in search results lists. Example, for a website itemtype : </p>
           <p><b>&lt;a href="[856u]"&gt;open site&lt;/a&gt;</b> will show the link just below the title</p>
-        </td>
-      </tr>
-    </table>
+      </li>
+	  </ol>
+    </fieldset>
 
     <p id="action">
       <input type="button" value="Save Changes" onclick="Check(this.form)" />
-      <input type="button" value="Cancel" onclick="history.back();" />
     </p>
 </form>
 <!-- /TMPL_IF -->
@@ -267,7 +231,7 @@ Item Types Administration
 <h2>Item Types Administration</h2>
 <table>
   <tr>
-    <th>image</th>
+    <th>Image</th>
     <th>Code</th>
     <th>Description</th>
     <th>Not for Loan</th>