diff --git a/admin/auth_tag_structure.pl b/admin/auth_tag_structure.pl
index 7e96020b77..d33054d898 100755
--- a/admin/auth_tag_structure.pl
+++ b/admin/auth_tag_structure.pl
@@ -114,6 +114,7 @@ if ($op eq 'add_form') {
 		push @authorised_values, $category;
 	}
 	my $authorised_value  = CGI::scrolling_list(-name=>'authorised_value',
+	        -id=>'authorised_value',
 			-values=> \@authorised_values,
 			-size=>1,
  			-tabindex=>'',
diff --git a/admin/authorised_values.pl b/admin/authorised_values.pl
index fe56aee015..60d8c5738d 100755
--- a/admin/authorised_values.pl
+++ b/admin/authorised_values.pl
@@ -154,6 +154,7 @@ if ($op eq 'add_form') {
 	}
 	# push koha system categories
 	my $tab_list = CGI::scrolling_list(-name=>'searchfield',
+	        -id=>'searchfield',
 			-values=> \@category_list,
 			-default=>"",
 			-size=>1,
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 03804ddc96..6110f1aded 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -792,4 +792,8 @@ div.sysprefs div.hint {
 	float : right;
 	padding : .5em;
 	margin : .7em;
+}
+
+tr.highlight td {
+	background-color : #F6F6F6;
 }
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
similarity index 83%
rename from koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-menu.inc
rename to koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
index 7e85bc9096..dc544a3632 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
@@ -1,13 +1,13 @@
 <!-- Begin Members Resident Search Box -->
 <div id="header_search">
-	<div id="city_search">
+	<div id="city_search" class="residentsearch">
 	<p class="tip">City Search:</p>
 	<form action="<TMPL_VAR NAME="script_name">" method="post">
 		<input type="text" name="city_name" value="<!-- TMPL_VAR NAME="searchfield" -->" size="40" />
 		<input type="submit" name="submit" value="OK" 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">
 			<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" />
@@ -25,7 +25,7 @@
 		</form>
 	</div>
 			<ul>
-			<li><a href="/cgi-bin/koha/admin/roadtype.pl#city_search">Search Cities</a></li>
+			<li><a href="/cgi-bin/koha/admin/cities.pl#city_search">Search Cities</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>	
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
new file mode 100644
index 0000000000..190c885f87
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
@@ -0,0 +1,33 @@
+<!-- Begin Members Resident Search Box -->
+<div id="header_search">
+	<div id="patron_category_search" class="residentsearch">
+	<p class="tip">Search by Patron Category Name:</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" 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="<!-- TMPL_VAR name="branch" -->" type="hidden" />
+    <input name="printer" value="" type="hidden" />
+	<input value="Submit" type="submit" />
+	</form>
+	</div>	
+	<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" />
+				<input type="submit" name="op" id="opac-submit" value="Submit"  class="form-submit" />
+		</form>
+	</div>
+			<ul>
+			<li><a href="/cgi-bin/koha/admin/categorie.pl#patron_category_search">Search Patron Categories</a></li>
+			<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check Out</a></li>
+			<li><a href="/cgi-bin/koha/catalogue/advsearch.pl#catalog_search">Search the Catalog</a></li>
+			</ul>	
+</div>
+<!-- End Members Resident Search Box -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-search.inc
similarity index 88%
rename from koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-menu.inc
rename to koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-search.inc
index a21e24d3a5..128fd00532 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-search.inc
@@ -1,13 +1,13 @@
 <!-- Begin Members Resident Search Box -->
 <div id="header_search">
-	<div id="roadtype_search">
+	<div id="roadtype_search" class="residentsearch">
 	<p class="tip">Road Type Search:</p>
 		<form action="<TMPL_VAR NAME="script_name">" method="post">
 		<input type="text" name="road_type" value="<!-- TMPL_VAR NAME="searchfield" -->" size="40" />
 		<input type="submit" name="submit" value="OK" 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">
 			<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/auth_tag_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl
index 6f947ef265..47c5b68e87 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl
@@ -1,8 +1,8 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Administration &rsaquo; Authority MARC framework <!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="use-heading-flags-p" -->
-    <!-- TMPL_IF NAME="heading-modify-tag-p" -->&rsaquo; Modify tag<!-- /TMPL_IF -->
-    <!-- TMPL_IF NAME="heading-add-tag-p" -->&rsaquo; Add tag<!-- /TMPL_IF -->
-    <!-- TMPL_ELSE -->&rsaquo; <!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirm" -->&rsaquo; Confirm Deletion<!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirmed" -->&rsaquo; Data Deleted<!-- /TMPL_IF --></title>
+    <!-- TMPL_IF NAME="heading-modify-tag-p" -->&rsaquo; <!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR NAME="authtypecode" --> Framework<!-- TMPL_ELSE -->Default Framework<!-- /TMPL_IF --> &rsaquo; Modify tag<!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="heading-add-tag-p" -->&rsaquo; <!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR NAME="authtypecode" --> Framework<!-- TMPL_ELSE -->Default Framework<!-- /TMPL_IF --> &rsaquo; Add tag<!-- /TMPL_IF -->
+    <!-- TMPL_ELSE -->&rsaquo; <!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirm" -->&rsaquo; <!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR NAME="authtypecode" --> Framework<!-- TMPL_ELSE -->Default Framework<!-- /TMPL_IF --> &rsaquo; Confirm Deletion<!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirmed" -->&rsaquo; <!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR NAME="authtypecode" --> Framework<!-- TMPL_ELSE -->Default Framework<!-- /TMPL_IF --> &rsaquo; Data Deleted<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script type="text/javascript">
 //<![CDATA[
@@ -62,9 +62,9 @@ return false;
 <!-- TMPL_INCLUDE NAME="cat-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="use-heading-flags-p" -->
-    <!-- TMPL_IF NAME="heading-modify-tag-p" --><a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Authority MARC Framework</a> &rsaquo; Modify tag<!-- /TMPL_IF -->
-    <!-- TMPL_IF NAME="heading-add-tag-p" --><a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Authority MARC Framework</a> &rsaquo; Add tag<!-- /TMPL_IF -->
-    <!-- TMPL_ELSE --><a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Authority MARC Framework</a> &rsaquo; <!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF --><!-- TMPL_ELSE --><!-- TMPL_IF NAME="delete_confirm" --><a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Authority MARC Framework</a> &rsaquo; Confirm Deletion<!-- TMPL_ELSE --><!-- TMPL_IF NAME="delete_confirmed" --><a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Authority MARC Framework</a> &rsaquo; Data Deleted<!-- TMPL_ELSE -->Authority MARC Framework<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF --></div>
+    <!-- TMPL_IF NAME="heading-modify-tag-p" --><a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Authority MARC Framework</a> &rsaquo; <!-- TMPL_IF NAME="authtypecode" --><a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=<!-- TMPL_VAR NAME="authtypecode" -->"><!-- TMPL_VAR NAME="authtypecode" --> Framework</a><!-- TMPL_ELSE --><a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default Framework</a><!-- /TMPL_IF --> &rsaquo; Modify tag<!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="heading-add-tag-p" --><a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Authority MARC Framework</a> &rsaquo; <!-- TMPL_IF NAME="authtypecode" --><a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=<!-- TMPL_VAR NAME="authtypecode" -->"><!-- TMPL_VAR NAME="authtypecode" --> Framework</a><!-- TMPL_ELSE --><a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default Framework</a><!-- /TMPL_IF --> &rsaquo; Add tag<!-- /TMPL_IF -->
+    <!-- TMPL_ELSE --><a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Authority MARC Framework</a> &rsaquo; <!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF --><!-- TMPL_ELSE --><!-- TMPL_IF NAME="delete_confirm" --><a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Authority MARC Framework</a> &rsaquo; <!-- TMPL_IF NAME="authtypecode" --><a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=<!-- TMPL_VAR NAME="authtypecode" -->"><!-- TMPL_VAR NAME="authtypecode" --> Framework</a><!-- TMPL_ELSE --><a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default Framework</a><!-- /TMPL_IF --> &rsaquo; Confirm Deletion<!-- TMPL_ELSE --><!-- TMPL_IF NAME="delete_confirmed" --><a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Authority MARC Framework</a> &rsaquo; Data Deleted<!-- TMPL_ELSE -->Authority MARC Framework: <!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR NAME="authtypecode" --> Framework<!-- TMPL_ELSE -->Default Framework<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
@@ -86,45 +86,42 @@ return false;
     <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
         <input type="hidden" name="op" value="add_validate" />
         <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
-        <p><label>Tag</label><!-- TMPL_VAR NAME="searchfield" --></p>
-        <p><label>Text for librarians</label><input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" escape="HTML" -->" size="40" maxlength="100" /></p>
-        <p><label>Text for opac</label><input type="text" name="libopac" value="<!-- TMPL_VAR NAME="libopac" escape="HTML" -->" size="40" maxlength="100" /></p>
-        <p><label for="repeatable">Repeatable</label>
+        <fieldset class="rows"><ol>
+		<li><span class="label">Tag</span><!-- TMPL_VAR NAME="searchfield" --></li>
+        <li><label for="liblibrarian">Text for librarians</label><input type="text" name="liblibrarian" id="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" escape="HTML" -->" size="40" maxlength="100" /></li>
+        <li><label for="libopac">Text for opac</label><input type="text" name="libopac" id="libopac" value="<!-- TMPL_VAR NAME="libopac" escape="HTML" -->" size="40" maxlength="100" /></li>
+        <li><label for="repeatable">Repeatable</label>
             <!-- TMPL_IF NAME="repeatable" -->
                 <input type="checkbox" name="repeatable" id="repeatable" value="1" checked="checked" />
             <!-- TMPL_ELSE -->
                 <input type="checkbox" name="repeatable" id="repeatable" value="1" />
             <!-- /TMPL_IF -->
-        </p>
-        <p><label for="mandatory">Mandatory</label>
+        </li>
+        <li><label for="mandatory">Mandatory</label>
             <!-- TMPL_IF NAME="mandatory" -->
                 <input type="checkbox" name="mandatory" id="mandatory" value="1" checked="checked" />
             <!-- TMPL_ELSE -->
                 <input type="checkbox" name="mandatory" id="mandatory" value="1" />
             <!-- /TMPL_IF -->
-            </p>
-        <p><label>Authorised value</label><!-- TMPL_VAR NAME="authorised_value" --> (if you select a value here, the indicators will be limited to the authorised value list)</p>
-        <p><input type="button" value="OK" class="button" onclick="Check(this.form)" /></p>
+            </li>
+        <li><label for="authorised_value">Authorised value</label><!-- TMPL_VAR NAME="authorised_value" --> (if you select a value here, the indicators will be limited to the authorised value list)</li>
+</ol></fieldset>
+        <p><input type="button" value="Submit" class="button" onclick="Check(this.form)" /></p>
     </form>
 <!-- /TMPL_IF -->
 
 
 <!-- TMPL_IF NAME="delete_confirm" -->
 <h3>Confirm Deletion</h3>
-<table>
-    <tr>
-        <td>tag</td>
-        <td><!-- TMPL_VAR NAME="searchfield" --></td>
-    </tr>
-    <tr>
-        <td>&nbsp;</td><td><!-- TMPL_VAR NAME="liblibrarian" --></td>
-    </tr>
-    
-    <tr><td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+
+		<ul>
+			<li><strong>Tag: </strong><!-- TMPL_VAR NAME="searchfield" --> <!-- TMPL_VAR NAME="liblibrarian" --></li>
+		</ul>
+		
+		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
         <input type="hidden" name="op" value="delete_confirmed" />
         <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR name="authtypecode" -->" />
-        <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" /><input type="submit" value="YES"></form></td><td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="NO" class="submit" /></form></td></tr>
-</table>
+        <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" /><input type="submit" value="YES"></form> <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="NO" class="submit" /></form>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="delete_confirmed" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl
index a5f3b65ce9..b86baad15e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl
@@ -3,7 +3,7 @@
 	   <!-- TMPL_IF name="action_add_value" -->Add authorised value<!-- /TMPL_IF -->
 	   <!-- TMPL_IF name="action_add_category" -->Add category<!-- /TMPL_IF --><!-- /TMPL_IF -->
 <!-- TMPL_IF name="delete_confirm" -->Confirm Deletion<!-- /TMPL_IF -->
-<!-- TMPL_IF name="else" -->Authorized values admin<!-- /TMPL_IF --></title>
+<!-- TMPL_IF name="else" -->Authorized values<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
@@ -14,7 +14,7 @@
 	   <!-- TMPL_IF name="action_add_value" -->Add authorised value<!-- /TMPL_IF -->
 	   <!-- TMPL_IF name="action_add_category" -->Add category<!-- /TMPL_IF --><!-- /TMPL_IF -->
 <!-- TMPL_IF name="delete_confirm" --> <a href="/cgi-bin/koha/admin/authorised_values.pl">Authorized Values</a> &rsaquo; Confirm Deletion<!-- /TMPL_IF -->
-<!-- TMPL_IF name="else" -->Authorized values admin<!-- /TMPL_IF --></div>
+<!-- TMPL_IF name="else" -->Authorized values<!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
@@ -30,24 +30,24 @@
 	</h1>
 	<form action="<!-- TMPL_VAR name="script_name" -->" name="Aform" method="post">
 	<input type="hidden" name="op" value="add_validate" />
-        <table>
-        <tr>
-            <th><label for="category">Category</label></th>
-            <td><!-- TMPL_VAR name="category" --></td>
-        </tr>
-        <tr>
-            <th><label for="authorised_value">Authorized value</label></th>
-            <td><input type="text" id="authorised_value" name="authorised_value" value="<!-- TMPL_VAR name="authorised_value" -->" /></td>
-        </tr>
-        <tr>
-            <th><label for="lib">Description</label></th>
-            <td><input type="text" name="lib" id="lib" value="<!-- TMPL_VAR name="lib" -->" /></td>
-        </tr>
-        </table>
+        <fieldset class="rows"><ol>
+        <li>
+			 <!-- TMPL_IF name="action_add_category" --><label for="category">Category</label><!-- TMPL_ELSE --><span class="label">Category</span><!-- /TMPL_IF -->
+            
+            <!-- TMPL_VAR name="category" -->
+        </li>
+        <li>
+            <label for="authorised_value">Authorized value</label>
+            <input type="text" id="authorised_value" name="authorised_value" value="<!-- TMPL_VAR name="authorised_value" -->" />
+        </li>
+        <li>
+            <label for="lib">Description</label>
+            <input type="text" name="lib" id="lib" value="<!-- TMPL_VAR name="lib" -->" />
+        </li>
+        </ol></fieldset>
         <input type="hidden" name="id" value="<!-- TMPL_VAR name="id" -->" />
         <input type="submit" value="Save" />
     </form>
-    <form class="inline" action="/cgi-bin/koha/admin/authorised_values.pl" method="get"><input type="submit" value="Cancel and Return to Authorized Values" /></form>
 <!-- /TMPL_IF -->
 
 
@@ -70,7 +70,7 @@
 
 <!-- TMPL_IF name="else" -->
 
-<h1>Authorized values admin</h1>
+<h1>Authorized values</h1>
 <p>This table is used in MARC definition. You can define as many categories as you want, and as many authorized values as you want in each category.</p>
 <p>When you define the MARC subfield structure, you can link a subfield to a authorized-value category. When the user ask for adding of modifying a biblio,
 the subfield is not entered through a free field, but though a list of authorized values</p>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl
index dc08731917..afaa2c7b20 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl
@@ -74,13 +74,13 @@ function Check(f) {
     <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
         <input type="hidden" name="op" value="add_validate" />
         <input type="hidden" name="checked" value="0" />
-        <!-- TMPL_IF NAME="frameworkcode" -->
-            <p><label for="frameworkcode">Framework Code</label><input type="hidden" id="frameworkcode" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" /><!-- TMPL_VAR NAME="frameworkcode" --></p>
+<fieldset class="rows">	<ol><!-- TMPL_IF NAME="frameworkcode" -->
+            <li><span class="label">Framework Code</span><input type="hidden" id="frameworkcode" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" /><!-- TMPL_VAR NAME="frameworkcode" --></li>
         <!-- TMPL_ELSE -->
-            <p><label for="frameworkcode">Framework Code</label><input type="text" id="frameworkcode" name="frameworkcode" size="4" maxlength="4" onblur="toUC(this)" /></p>
+            <li><label for="frameworkcode">Framework Code</label><input type="text" id="frameworkcode" name="frameworkcode" size="4" maxlength="4" onblur="toUC(this)" /></li>
         <!-- /TMPL_IF -->
-        <p><label for="description">Description</label>
-        <input type="text" name="frameworktext" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="frameworktext" ESCAPE="HTML" -->" /></p>
+        <li><label for="description">Description</label>
+        <input type="text" name="frameworktext" id="description" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="frameworktext" ESCAPE="HTML" -->" /></li></ol></fieldset>
         <p>	<input type="submit" value="Submit" class="submit" onclick="Check(this.form)" /></p>
     </form>
 <!-- /TMPL_IF -->
@@ -109,7 +109,7 @@ function Check(f) {
     <tr>
         <td>&nbsp;</td>
         <td>Default framework</td>
-        <td><a href="marctagstructure.pl?frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">MARC structure</td>
+        <td><a href="marctagstructure.pl?frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">MARC structure</a></td>
         <td>&nbsp;</td>
         <td>&nbsp;</td>
     </tr>
@@ -127,8 +127,7 @@ function Check(f) {
 <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
     <input type="hidden" name="op" value="add_form" />
     <input type="submit" value="Add framework" />
-    <td><!-- TMPL_IF NAME="previous" --><a href="<!-- TMPL_VAR NAME="previous" -->">&lt;&lt; Previous</a><!-- /TMPL_IF --></td>
-    <td><!-- TMPL_IF NAME="next" --><a href="<!-- TMPL_VAR NAME="next" -->">Next &gt;&gt;</a><!-- /TMPL_IF --></td>
+    <!-- TMPL_IF NAME="previous" --><a href="<!-- TMPL_VAR NAME="previous" -->">&lt;&lt; Previous</a><!-- /TMPL_IF --> <!-- TMPL_IF NAME="next" --><a href="<!-- TMPL_VAR NAME="next" -->">Next &gt;&gt;</a><!-- /TMPL_IF -->
 </form>
 
 <!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl
index 542fef08d7..6cb4bf0260 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl
@@ -1,9 +1,8 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Administration &rsaquo; <!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="categorycode" -->Modify category '<!-- TMPL_VAR NAME="categorycode" -->'<!-- TMPL_ELSE -->Add category<!-- /TMPL_IF --><!-- /TMPL_IF -->
+<title>Koha &rsaquo; Administration &rsaquo; Patron Categories &rsaquo; <!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="categorycode" -->Modify category '<!-- TMPL_VAR NAME="categorycode" -->'<!-- TMPL_ELSE -->Add category<!-- /TMPL_IF --><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="add_validate" -->Data recorded<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="delete_confirm" -->Confirm Deletion of Category '<!-- TMPL_VAR NAME="categorycode" -->'<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="delete_confirmed" -->Category Deleted<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="else" -->Patron Categories<!-- /TMPL_IF --></title>
+<!-- TMPL_IF NAME="delete_confirm" --><!-- TMPL_IF NAME="totalgtzero" -->Cannot Delete: Category <!-- TMPL_VAR NAME="categorycode" --> in Use<!-- TMPL_ELSE -->Confirm Deletion of Category '<!-- TMPL_VAR NAME="categorycode" -->'<!-- /TMPL_IF --><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="delete_confirmed" -->Category Deleted<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script type="text/javascript">
 //<![CDATA[
@@ -72,12 +71,12 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
+<!-- TMPL_INCLUDE NAME="patrons-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="categorycode" -->Modify category '<!-- TMPL_VAR NAME="categorycode" -->'<!-- TMPL_ELSE -->Add category<!-- /TMPL_IF --><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="add_validate" -->Data recorded<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="delete_confirm" -->Confirm Deletion of Category '<!-- TMPL_VAR NAME="categorycode" -->'<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="delete_confirmed" -->Category Deleted<!-- /TMPL_IF -->
+<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" --> <a href="/cgi-bin/koha/admin/categorie.pl">Patron Categories</a> &rsaquo; <!-- TMPL_IF NAME="categorycode" -->Modify category '<!-- TMPL_VAR NAME="categorycode" -->'<!-- TMPL_ELSE -->Add category<!-- /TMPL_IF --><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="add_validate" --> <a href="/cgi-bin/koha/admin/categorie.pl">Patron Categories</a> &rsaquo; Data recorded<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="delete_confirm" --> <a href="/cgi-bin/koha/admin/categorie.pl">Patron Categories</a> &rsaquo; <!-- TMPL_IF NAME="totalgtzero" -->Cannot Delete: Category <!-- TMPL_VAR NAME="categorycode" --> in Use<!-- TMPL_ELSE -->Confirm Deletion of Category '<!-- TMPL_VAR NAME="categorycode" -->'<!-- /TMPL_IF --><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="delete_confirmed" --> <a href="/cgi-bin/koha/admin/categorie.pl">Patron Categories</a> &rsaquo; Category Deleted<!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="else" -->Patron Categories<!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
@@ -99,19 +98,19 @@
 	<!-- TMPL_ELSE -->
 		<h1>Add category</h1>
 	<!-- /TMPL_IF -->
-	<table>
-	<!-- TMPL_IF NAME="categorycode" -->
-	<tr><th>Category code</th><td><!-- TMPL_VAR NAME="categorycode" -->
-				<input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->" /><input type="hidden" name="is_a_modif" value="1" /></td></tr>
+	<fieldset class="rows">
+	<ol><!-- TMPL_IF NAME="categorycode" -->
+	<li><span class="label">Category code</span><!-- TMPL_VAR NAME="categorycode" -->
+				<input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->" /><input type="hidden" name="is_a_modif" value="1" /></li>
 	<!-- TMPL_ELSE -->
-	<tr><th>Category code</th><td><input type="text" name="categorycode" size="10" maxlength="10" onblur="toUC(this)" /></td></tr>
+	<li><label for="categorycode">Category code</label><input type="text" name="categorycode" id="categorycode" size="10" maxlength="10" onblur="toUC(this)" /></li>
 	<!-- /TMPL_IF -->
-	<tr><th>Description</th><td>&nbsp; <input type="text" name="description" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="description" -->" /></td></tr>
-	<tr><th>Enrollment period</th><td>&nbsp; <input type="text" name="enrolmentperiod" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="enrolmentperiod" -->" /> months</td></tr>
-	<tr><th>Age required</th><td>&nbsp; <input type="text" name="dateofbirthrequired" value="<!-- TMPL_VAR NAME="dateofbirthrequired" -->" size="3" maxlength="3" /> years</td></tr>
-	<tr><th>Upperage limit</th><td>&nbsp; <input type="text" name="upperagelimit" size="3" maxlength="3" value="<!-- TMPL_VAR NAME="upperagelimit" -->" /> years</td></tr>
-	<tr><th>Enrollment fee</th><td>$ <input type="text" name="enrolmentfee" size="6" value="<!-- TMPL_VAR NAME="enrolmentfee" -->" /></td></tr>
-	<tr><th>Overdue notice required</th><td>&nbsp; <select name="overduenoticerequired" id="overduenoticerequired">
+	<li><label for="description">Description</label>&nbsp; <input type="text" name="description" id="description" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="description" -->" /></li>
+	<li><label for="enrolmentperiod">Enrollment period</label>&nbsp; <input type="text" name="enrolmentperiod" id="enrolmentperiod" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="enrolmentperiod" -->" /> months</li>
+	<li><label for="dateofbirthrequired">Age required</label>&nbsp; <input type="text" name="dateofbirthrequired" id="dateofbirthrequired" value="<!-- TMPL_VAR NAME="dateofbirthrequired" -->" size="3" maxlength="3" /> years</li>
+	<li><label for="upperagelimit">Upperage limit</label>&nbsp; <input type="text" name="upperagelimit" id="upperagelimit" size="3" maxlength="3" value="<!-- TMPL_VAR NAME="upperagelimit" -->" /> years</li>
+	<li><label for="enrolmentfee">Enrollment fee</label>$ <input type="text" name="enrolmentfee" id="enrolmentfee" size="6" value="<!-- TMPL_VAR NAME="enrolmentfee" -->" /></li>
+	<li><label for="overduenoticerequired">Overdue notice required</label>&nbsp; <select name="overduenoticerequired" id="overduenoticerequired">
 			<!-- TMPL_IF NAME="overduenoticerequired" -->
 						<option value="0">No</option>
 						<option value="1" selected="selected">Yes</option>
@@ -119,19 +118,19 @@
 						<option value="0" selected="selected">No</option>
 						<option value="1">Yes</option>
 			<!-- /TMPL_IF -->
-					</select></td></tr>
-	<tr><th>Reserve fee</th><td>$ <input type="text" name="reservefee" size="6" value="<!-- TMPL_VAR NAME="reservefee" -->" /></td></tr>
-	<tr><th>Category type</th><td><select name="category_type" >
+					</select></li>
+	<li><label for="reservefee">Reserve fee</label>$ <input type="text" name="reservefee" id="reservefee" size="6" value="<!-- TMPL_VAR NAME="reservefee" -->" /></li>
+	<li><label for="category_type">Category type</label><select name="category_type" id="category_type">
 						<!-- TMPL_IF NAME="type_n" --><option value="" selected="selected">Select a Category type</option><!-- TMPL_ELSE --><option value="">Select a Category type</option><!-- /TMPL_IF -->
 					<!-- TMPL_IF NAME="type_A" --><option value="A" selected="selected">Adult</option><!-- TMPL_ELSE --><option value="A">Adult</option><!-- /TMPL_IF -->
 					<!-- TMPL_IF NAME="type_C" --><option value="C" selected="selected">Children</option><!-- TMPL_ELSE --><option value="C">Children</option><!-- /TMPL_IF -->
 					<!-- TMPL_IF NAME="type_I" --><option value="I" selected="selected">Organisation</option><!-- TMPL_ELSE --><option value="I">Organisation</option><!-- /TMPL_IF -->
 					<!-- TMPL_IF NAME="type_P" --><option value="P" selected="selected">Professional</option><!-- TMPL_ELSE --><option value="P">Professional</option><!-- /TMPL_IF -->
-					</select></td>
-	</tr>
-</table>
+					</select>
+	</li></ol>
+</fieldset>
 
-	<p>				<input type="button" value="<!-- TMPL_IF NAME="categorycode" -->Update Category<!-- TMPL_ELSE -->Add Category<!-- /TMPL_IF -->" onclick="Check(this.form);" /> <input type="button" value="Cancel" onclick="location.href='<!-- TMPL_VAR NAME="script_name" -->'; return false;" /></p>
+	<p>				<input type="submit" value="<!-- TMPL_IF NAME="categorycode" -->Update Category<!-- TMPL_ELSE -->Add Category<!-- /TMPL_IF -->" onclick="Check(this.form);" /> </p>
 	</form>
 
 <!-- /TMPL_IF -->
@@ -149,23 +148,23 @@
         	
 	<!-- TMPL_IF NAME="totalgtzero" --><h3>Cagegory <!-- TMPL_VAR NAME="categorycode" --> is in use.  Deletion not possible!</h3><!-- TMPL_ELSE --><h2>Confirm Deletion of Category <!-- TMPL_VAR NAME="categorycode" --></h2><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="totalgtzero" --><div class="error">This category is used <!-- TMPL_VAR NAME="total" --> times. Deletion not possible<!-- /TMPL_IF -->
-	<div class="compact"><table>
-	<tr><th>Category code</th><td><!-- TMPL_VAR NAME="categorycode" --></td></tr>
-	<tr><th>Description</th><td><!-- TMPL_VAR NAME="description" --></td></tr>
-	<tr><th>Enrolment period</th><td><!-- TMPL_VAR NAME="enrolmentperiod" --> months</td></tr>
-	<tr><th>Age Required</th><td><!-- TMPL_VAR NAME="dateofbirthrequired" --> years</td></tr>
-	<tr><th>Upperage limit</th><td><!-- TMPL_VAR NAME="upperagelimit" --> years</td></tr>
-	<tr><th>Enrolment fee</th><td>$<!-- TMPL_VAR NAME="enrolmentfee" --></td></tr>
-	<tr><th>Overdue notice required</th><td><!-- TMPL_IF NAME="overduenoticerequired" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td></tr>
-	<tr><th>Reserve fee</th><td>$<!-- TMPL_VAR NAME="reservefee" --></td></tr>
-</table>
+	<ul>
+	<li><strong>Category code: </strong><!-- TMPL_VAR NAME="categorycode" --></li>
+	<li><strong>Description: </strong><!-- TMPL_VAR NAME="description" --></li>
+	<li><strong>Enrolment period: </strong><!-- TMPL_VAR NAME="enrolmentperiod" --> months</li>
+	<li><strong>Age Required: </strong><!-- TMPL_VAR NAME="dateofbirthrequired" --> years</li>
+	<li><strong>Upperage limit: </strong><!-- TMPL_VAR NAME="upperagelimit" --> years</li>
+	<li><strong>Enrolment fee: </strong>$<!-- TMPL_VAR NAME="enrolmentfee" --></li>
+	<li><strong>Overdue notice required: </strong><!-- TMPL_IF NAME="overduenoticerequired" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></li>
+	<li><strong>Reserve fee: </strong>$<!-- TMPL_VAR NAME="reservefee" --></li>
+</ul>
 		<!-- TMPL_IF NAME="totalgtzero" -->
 <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="OK" /></form>
 		<!-- TMPL_ELSE -->
 <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
 			<input type="hidden" name="op" value="delete_confirmed" />
 			<input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->" /> <input type="submit" value="Delete this Category" /></form> <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="Do Not Delete" /></form>
-		<!-- /TMPL_IF -->
+		<!-- /TMPL_IF --></div>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="delete_confirmed" -->
@@ -181,10 +180,7 @@
 <!-- TMPL_IF NAME="searchfield" -->
 		You Searched for <!-- TMPL_VAR NAME="searchfield" --></span>
 	<!-- /TMPL_IF -->
-	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-		<input type="text" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->" />
-		<input type="submit" name="search" value="Find" />
-	</form>	
+
         <table>
 		<tr>
 			<th scope="col">Code</th>
@@ -216,8 +212,8 @@
                         <td><!-- TMPL_VAR NAME="enrolmentfee" --></td>
                         <td><!-- TMPL_IF NAME="overduenoticerequired" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
                         <td><!-- TMPL_VAR NAME="reservefee" --></td>
-                        <td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="get"><input type="hidden" name="op" value="add_form" /><input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->" /><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="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->" /><input type="submit" value="Delete" /></form></td>
+                        <td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->">Edit</a></td>
+						<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->">Delete</a></td>
 		</tr>
 		<!-- /TMPL_LOOP -->
 	</table><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl
index 3c6e3f9e5b..e673f9128a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl
@@ -52,7 +52,7 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="cities-admin-menu.inc" -->
+<!-- TMPL_INCLUDE NAME="cities-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" --><a href="/cgi-bin/koha/admin/cities.pl">Cities</a> &rsaquo; <!-- TMPL_IF NAME="cityid" --> Modify City<!-- TMPL_ELSE --> Add City<!-- /TMPL_IF --><!-- TMPL_ELSE --><!-- TMPL_IF NAME="delete_confirm" --><a href="/cgi-bin/koha/admin/cities.pl">Cities</a> &rsaquo; Confirm Deletion of City<!-- TMPL_ELSE --> Cities<!-- /TMPL_IF --><!-- /TMPL_IF --></div>
 
@@ -74,24 +74,21 @@
 	<input type="hidden" name="checked" value="0" />
 	<input type="hidden" name="cityid" value="<!-- TMPL_VAR NAME="cityid" -->" />
 
-	<!-- TMPL_IF NAME="cityid" -->
-		<p class="p_borrowers">
-	
-		<label>City id</label>
-		<label><b><!-- TMPL_VAR NAME="cityid" --></b></label>
-		</p>
+<fieldset class="rows"><ol>	<!-- TMPL_IF NAME="cityid" -->
+		<li>
+		<span class="label">City ID</span><!-- TMPL_VAR NAME="cityid" --></li>
 	<!-- /TMPL_IF -->
-	<p>
-	<label>City name</label>
-	<input  type="text" name="city_name" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="city_name" ESCAPE="HTML" -->" />
-	</p>
-	<p>				
-	<label>City zipcode</label>
-	<input type="text" name="city_zipcode" size="10" maxlength="10" value="<!-- TMPL_VAR NAME="city_zipcode" -->" />
-	</p>
+	<li>
+	<label for="city_name">City name</label>
+	<input  type="text" name="city_name" id="city_name" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="city_name" ESCAPE="HTML" -->" />
+	</li>
+	<li>				
+	<label for="city_zipcode">City zipcode</label>
+	<input type="text" name="city_zipcode" id="city_zipcode" size="10" maxlength="10" value="<!-- TMPL_VAR NAME="city_zipcode" -->" />
+	</li></ol></fieldset>
 	
 	<p>
-		<input class="button" type="button" onclick="Check(this.form)" value="OK" />
+		<input class="button" type="button" onclick="Check(this.form)" value="Submit" />
 	</p>
 	</form>
 
@@ -140,18 +137,18 @@
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="else" -->
-	<h2>Cities management</h2>
+	<h2>Cities</h2>
 	<!-- TMPL_IF NAME="searchfield" -->
 		Searching: <!-- TMPL_VAR NAME="searchfield" -->
 	<!-- /TMPL_IF -->
 
-	<table>
+<!-- TMPL_IF NAME="loop" -->	<table>
 		<tr>
-			<th>City id</th>
+			<th>City ID</th>
 			<th>City name</th>
 			<th>City zipcode</th>
-			<th> </th>
-			<th> </th>
+			<th>&nbsp;</th>
+			<th>&nbsp;</th>
 			
 		</tr>
 		<!-- TMPL_LOOP NAME="loop" -->
@@ -164,12 +161,12 @@
 			<td><!-- TMPL_VAR NAME="city_name" --></td>
 			<td><!-- TMPL_VAR NAME="city_zipcode" --></td>
 			
-			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;cityid=<!-- TMPL_VAR NAME="cityid" -->">edit</a></td>
-			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;cityid=<!-- TMPL_VAR NAME="cityid" -->">delete</a></td>
+			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;cityid=<!-- TMPL_VAR NAME="cityid" -->">Edit</a></td>
+			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;cityid=<!-- TMPL_VAR NAME="cityid" -->">Delete</a></td>
 		</tr>
 		<!-- /TMPL_LOOP -->
-
-	</table>
+	</table><!-- /TMPL_IF -->
+	
 	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
 		<input type="hidden" name="op" value="add_form" />
 		<p><input type="submit" class="button" value="Add a city"  alt="Add city" /></p>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/finesrules.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/finesrules.tmpl
index 818c7521eb..c559b3a88e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/finesrules.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/finesrules.tmpl
@@ -8,11 +8,11 @@
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; Fines</div>
 
-<div id="doc3" class="yui-t2">
+<div id="doc" class="yui-t7">
 
 <div id="bd">
     <div id="yui-main">
-    <div class="yui-b">
+    <div class="yui-g">
     
     <h1>Defining <!-- TMPL_IF NAME="branch" -->fining rules for <!-- TMPL_VAR NAME="branch" --><!-- TMPL_ELSE -->default fining rules<!-- /TMPL_IF --></h1>
             
@@ -54,7 +54,7 @@
             </tr>
             <!-- TMPL_LOOP NAME="row" -->
                 <tr>
-                    <th><!-- TMPL_IF name="total" -->Total <!-- TMPL_ELSE --><!-- TMPL_VAR NAME="categorycode" --><!-- /TMPL_IF --></th>
+                    <th scope="row"><!-- TMPL_IF name="total" -->Total <!-- TMPL_ELSE --><!-- TMPL_VAR NAME="categorycode" --><!-- /TMPL_IF --></th>
                     <!-- TMPL_LOOP NAME="cell" -->
                         <!-- TMPL_IF NAME="toggle" -->
                             <td class="highlight">
@@ -72,8 +72,5 @@
 
 </div>
 </div>
-<div class="yui-b">
-<!-- TMPL_INCLUDE NAME="admin-menu.inc" -->
-</div>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/issuingrules.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/issuingrules.tmpl
index 7b852ffc64..af6a6dbdf9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/issuingrules.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/issuingrules.tmpl
@@ -8,17 +8,16 @@
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo;  Issuing Rules</div>
 
-<div id="doc3" class="yui-t2">
+<div id="doc" class="yui-t7">
 
 <div id="bd">
     <div id="yui-main">
-    <div class="yui-b">
+    <div class="yui-g">
 
     <h1>Defining <!-- TMPL_IF NAME="branch" -->issuing rules for <!-- TMPL_VAR NAME="branch" --><!-- TMPL_ELSE -->default issuing rules<!-- /TMPL_IF --></h1>
     <div class="help">
         <h3>HINT for issues</h3>
-        <p>Each box needs to be filled in with issuelength,maxissues</p>
-        <p>eq 21,5 enables 5 issues for 21 days</p>
+        <p>Each box needs to be filled in with issuelength,maxissues. For example: 21,5 enables 5 issues for 21 days</p>
     </div>
 
     <div class="help">
@@ -27,6 +26,7 @@
             <li>If a cell is not filled, the value in the default column (top right) is used</li>
             <li>If a total is filled (last line), the patron must fit both itemtype and total rule</li>
             <li>If a rule is filled for a given branch, it is used, otherwise, it's the rule of the "default" branch</li>
+		</ul>
     </div>
         <form method="post" action="/cgi-bin/koha/admin/issuingrules.pl">
         <label for="branch">Select a library :</label>
@@ -53,7 +53,7 @@
                 </tr>
                 <!-- TMPL_LOOP NAME="row" -->
                     <tr>
-                        <th><!-- TMPL_IF name="total" -->Total <!-- TMPL_ELSE --><!-- TMPL_VAR NAME="categorycode" --><!-- /TMPL_IF --></th>
+                        <th scope="row"><!-- TMPL_IF name="total" -->Total <!-- TMPL_ELSE --><!-- TMPL_VAR NAME="categorycode" --><!-- /TMPL_IF --></th>
                         <!-- TMPL_LOOP NAME="cell" -->
                             <!-- TMPL_IF NAME="toggle" -->
                                 <td class="highlight">
@@ -71,8 +71,5 @@
 
 </div>
 </div>
-<div class="yui-b">
-<!-- TMPL_INCLUDE NAME="admin-menu.inc" -->
-</div>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl
index 6e4971c906..950ff6c788 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl
@@ -1,7 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Administration &rsaquo;
-<!-- TMPL_IF name="add_form" --><!-- TMPL_VAR name="action" --><!-- /TMPL_IF -->
-<!-- TMPL_IF name="else" -->MARC links <!-- TMPL_VAR name="tagfield" --><!-- /TMPL_IF --></title>
+<!-- TMPL_IF name="add_form" -->MARC Links &rsaquo; <!-- TMPL_VAR name="action" --><!-- /TMPL_IF -->
+<!-- TMPL_IF name="else" -->MARC Links <!-- TMPL_VAR name="tagfield" --><!-- /TMPL_IF --></title>
 
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
@@ -9,17 +9,23 @@
 <!-- TMPL_INCLUDE NAME="header.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/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF name="add_form" --><!-- TMPL_VAR name="action" --><!-- /TMPL_IF -->
-<!-- TMPL_IF name="else" -->MARC links <!-- TMPL_VAR name="tagfield" --><!-- /TMPL_IF --></div>
-
+<div id="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" --> <a href="/cgi-bin/koha/admin/koha2marclinks.pl">MARC Links</a> &rsaquo; <!-- TMPL_VAR name="action" --><!-- /TMPL_IF -->
+<!-- TMPL_IF name="else" -->MARC Links <!-- TMPL_VAR name="tagfield" --><!-- /TMPL_IF --></div>
+<!-- TMPL_IF name="add_form" -->
+<div id="doc" class="yui-t7">
+   
+   <div id="bd">
+	<div id="yui-main">
+	<div class="yui-g">
+<!-- TMPL_ELSE -->
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
 	<div class="yui-b">
+<!-- /TMPL_IF -->
 
 <!-- TMPL_IF name="add_form" -->
-<!-- -->
 <h1><!-- TMPL_VAR name="action" --></h1>
 	<p>Choose and validate 1 of the following for <!-- TMPL_VAR name="tablename" -->.<!-- TMPL_VAR name="kohafield" --></p><table>
 <tr><td><form action="<!-- TMPL_VAR name="script_name" -->" method="post">	<input type="hidden" name="op" value="add_validate" />
@@ -123,7 +129,7 @@
 	</table>
 <!-- /TMPL_IF -->
 
-<!-- -->
+
 <!-- TMPL_IF name="else" -->
 
 <h1>MARC links <!-- TMPL_VAR name="tagfield" --></h1>
@@ -152,8 +158,10 @@
 
 </div>
 </div>
+<!-- TMPL_UNLESS name="add_form" -->
 <div class="yui-b">
 <!-- TMPL_INCLUDE NAME="admin-menu.inc" -->
 </div>
+<!-- /TMPL_UNLESS -->
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl
index f4a1d06ada..e0a1b4f703 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl
@@ -91,32 +91,32 @@
 	<!-- /TMPL_IF -->
         <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
         <input type="hidden" name="op" value="add_validate" />
-	<table>
-	<!-- TMPL_IF NAME="searchfield" -->
-		<tr>
-			<th scope="row">Printer Name</th>
-			<td>
-				<input type="hidden" name="printername" value="<!-- TMPL_VAR NAME="searchfield" -->" /><!-- TMPL_VAR NAME="searchfield" -->
-			</td>
-		</tr>
+	<fieldset class="rows">
+<ol>	<!-- TMPL_IF NAME="searchfield" -->
+		<li>
+			<span class="label">Printer Name: </span>
+			
+				<input type="hidden" name="printername" id="" value="<!-- TMPL_VAR NAME="searchfield" -->" /><!-- TMPL_VAR NAME="searchfield" -->
+			
+		</li>
 	<!-- TMPL_ELSE -->
-		<tr>
-			<th scope="row">Printer Name</th>
-			<td>
-				<input type="text" name="printername" size="50" maxlength="50" />
-			</td>
-		</tr>
+		<li>
+			<label for="printername">Printer Name: </label>
+			
+				<input type="text" name="printername" id="printername" size="50" maxlength="50" />
+			
+		</li>
 	<!-- /TMPL_IF -->
 
-        	<tr>
-			<th scope="row">Queue</th>
-			<td><input type="text" name="printqueue" size="50" maxlength="50" value="<!-- TMPL_VAR NAME="printqueue" -->" /> </td>
-		</tr>
-        	<tr>
-			<th scope="row">Type</th>
-			<td><input type="text" name="printtype" size="50" maxlength="50" value="<!-- TMPL_VAR NAME="printtype" -->" /> </td>
-		</tr>
-        </table><p><input type="button" value="OK" onclick="Check(this.form);" /> <input type="button" value="Cancel" onclick="location.href='<!-- TMPL_VAR NAME="script_name" -->';" /></p>
+        	<li>
+			<label for="printqueue">Queue: </label>
+			<input type="text" name="printqueue" id="printqueue" size="50" maxlength="50" value="<!-- TMPL_VAR NAME="printqueue" -->" /> 
+		</li>
+        	<li>
+			<label for="printtype">Type: </label>
+			<input type="text" name="printtype" id="printtype" size="50" maxlength="50" value="<!-- TMPL_VAR NAME="printtype" -->" /> 
+		</li></ol>
+        </fieldset><p><input type="submit" value="Submit" onclick="Check(this.form);" /> </p>
         </form>
 
 <!-- /TMPL_IF -->
@@ -130,28 +130,20 @@
 
 <!-- TMPL_IF NAME="delete_confirm" -->
 <h3>Confirm Deletion of Printer <em><!-- TMPL_VAR NAME="searchfield" --></em></h3>
-<table>
-		<tr>
-			<td>Printer</td>
-			<td><!-- TMPL_VAR NAME="searchfield" --></td>
-		</tr>
-		<tr>
-			<td>Queue</td>
-			<td><!-- TMPL_VAR NAME="printqueue" --></td>
-		</tr>
-        	<tr>
-			<td>Type</td>
-			<td><!-- TMPL_VAR NAME="printtype" --></td>
-		</tr>
-        	<tr>
-			<td>
-
-			</td>
-			<td>
-
-			</td>
-		</tr>
-	</table>
+<ul>
+		<li>
+			<strong>Printer: </strong>
+			<!-- TMPL_VAR NAME="searchfield" -->
+		</li>
+		<li>
+			<strong>Queue: </strong>
+			<!-- TMPL_VAR NAME="printqueue" -->
+		</li>
+        	<li>
+			<strong>Type: </strong>
+			<!-- TMPL_VAR NAME="printtype" -->
+		</li>
+	</ul>
     	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
 			<input type="hidden" name="op" value="delete_confirmed" />
 			<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
@@ -186,8 +178,7 @@
 			<td><!-- TMPL_VAR NAME="printername" --></td>
 			<td><!-- TMPL_VAR NAME="printqueue" --></td>
 			<td><!-- TMPL_VAR NAME="printtype" --></td>
-			<td><form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="get"><input type="hidden" name="op" value="add_form" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="printername" -->" /><input type="submit" value="Edit" /></form> <form class="inline" action="" method="get"><input type="hidden" name=
-"op" value="delete_confirm" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="printername" -->" /><input type="submit" value="Delete" /></form></td>
+			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="printername" -->">Edit</a> <a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="printername" -->">Delete</a></td>
 		</tr>
 		<!-- /TMPL_LOOP -->
 	</table><!-- TMPL_ELSE --><div class="notice">No printers defined.</div><!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl
index 55560ec5d5..d2099f6383 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl
@@ -52,7 +52,7 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="roadtype-admin-menu.inc" -->
+<!-- TMPL_INCLUDE NAME="roadtype-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" --><a href="/cgi-bin/koha/admin/roadtype.pl">Road Types</a> &rsaquo; <!-- TMPL_IF NAME="roadtypeid" --> Modify Road Type<!-- TMPL_ELSE --> Add Road Type<!-- /TMPL_IF --><!-- TMPL_ELSE --><!-- TMPL_IF NAME="delete_confirm" --><a href="/cgi-bin/koha/admin/roadtype.pl">Road Types</a> &rsaquo; Confirm Deletion of Road Type<!-- TMPL_ELSE --> Road Type<!-- /TMPL_IF --><!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
@@ -73,20 +73,16 @@
 	<input type="hidden" name="checked" value="0" />
 	<input type="hidden" name="roadtypeid" value="<!-- TMPL_VAR NAME="roadtypeid" -->" />
 
+<fieldset class="rows"><ol>
 <!-- TMPL_IF NAME="roadtypeid" -->
-
-	<p>
-	<label>Road type</label>
-	<label><b><!-- TMPL_VAR NAME="roadtypeid" --></b></label>
-	</p>
-	
+<li>
+	<span class="label">Road type: </span><!-- TMPL_VAR NAME="roadtypeid" -->
+	</li>
 <!-- /TMPL_IF -->
-	<p>			
-	<label>Road type</label>
-		
-	<input  type="text" name="road_type" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="road_type" ESCAPE="HTML" -->" />
-				
-	</p>
+	<li>			
+		<label for="road_type">Road type: </label>
+	<input  type="text" name="road_type" id="road_type" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="road_type" ESCAPE="HTML" -->" />
+	</li></ol></fieldset>
 	
 	<p>					  
 	<input class="button" type="button" onclick="Check(this.form)" value="OK" />	
@@ -96,23 +92,20 @@
 
 <!-- TMPL_IF NAME="delete_confirm" -->
 	<h3>Confirm Deletion of Road Type</h3>
-	<table>
-		<tr>
-			<th>Road type id </th>
-			<td><!-- TMPL_VAR NAME="roadtypeid" --></td>
-		</tr>
-		<tr>
-			<th>Road type</th>
-			<td><!-- TMPL_VAR NAME="road_type" --></td>
-		</tr>
-		<tr>
-			<td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+	<ul>
+		<li>
+			<strong>Road type id : </strong>
+			<!-- TMPL_VAR NAME="roadtypeid" --></td>
+		</li>
+		<li>
+			<strong>Road type: </strong>
+			<!-- TMPL_VAR NAME="road_type" -->
+		</li>
+
+	</ul><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
 			<input type="hidden" name="op" value="delete_confirmed" />
-			<input type="hidden" name="roadtypeid" value="<!-- TMPL_VAR NAME="roadtypeid" -->" /><input type="submit" value="YES" /></form></td>
-			<td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-			<input type="submit" value="NO" /></form></td>
-		</tr>	
-	</table>
+			<input type="hidden" name="roadtypeid" value="<!-- TMPL_VAR NAME="roadtypeid" -->" /><input type="submit" value="Yes, Delete" /></form> <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+			<input type="submit" value="No, Do Not Delete" /></form>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="else" -->
@@ -121,8 +114,7 @@
 		Search on  <!-- TMPL_VAR NAME="searchfield" -->
 	<!-- /TMPL_IF -->
 
-
-	<table>
+<!-- TMPL_IF NAME="loop" -->	<table>
 		<tr>
 			<th>Road type</th>
 			<th colspan="2">&nbsp;</th>
@@ -138,8 +130,8 @@
 			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;roadtypeid=<!-- TMPL_VAR NAME="roadtypeid" -->">Delete</a></td>
 		</tr>
 		<!-- /TMPL_LOOP -->
-
-	</table>
+	</table><!-- /TMPL_IF -->
+	
 	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
 		<input type="hidden" name="op" value="add_form" />
 		<p><input type="submit" class="button" value="Add road type" /></p>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl
index fbf2d2b518..9c8977079a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl
@@ -1,9 +1,9 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Administration &rsaquo; <!-- TMPL_IF NAME="else" -->z39.50 Servers<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="searchfield" -->Modify z39.50 Server <!-- TMPL_VAR NAME="searchfield" --><!-- TMPL_ELSE -->Add z39.50 Server<!-- /TMPL_IF --><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="delete_confirm" -->Confirm Deletion<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="add_validate" -->z39.50 Server Added<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="delete_confirmed" -->z39.50 Server Deleted<!-- /TMPL_IF --></title>
+<!-- TMPL_IF NAME="add_form" --> z39.50 Servers &rsaquo; <!-- TMPL_IF NAME="searchfield" -->Modify z39.50 Server <!-- TMPL_VAR NAME="searchfield" --><!-- TMPL_ELSE -->Add z39.50 Server<!-- /TMPL_IF --><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="delete_confirm" -->z39.50 Servers &rsaquo; Confirm Deletion<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="add_validate" -->z39.50 Servers &rsaquo; z39.50 Server Added<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="delete_confirmed" -->z39.50 Servers &rsaquo; z39.50 Server Deleted<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
 <!-- TMPL_IF NAME="add_form" -->
@@ -84,10 +84,10 @@
 <!-- TMPL_INCLUDE NAME="z3950-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="else" -->z39.50 Servers<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="searchfield" -->Modify z39.50 Server <!-- TMPL_VAR NAME="searchfield" --><!-- TMPL_ELSE -->Add z39.50 Server<!-- /TMPL_IF --><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="delete_confirm" -->Confirm Deletion<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="add_validate" -->z39.50 Server Added<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="delete_confirmed" -->z39.50 Server Deleted<!-- /TMPL_IF --></div>
+<!-- TMPL_IF NAME="add_form" --> <a href="/cgi-bin/koha/admin/z3950servers.pl">z39.50 Servers</a> &rsaquo; <!-- TMPL_IF NAME="searchfield" -->Modify z39.50 Server <!-- TMPL_VAR NAME="searchfield" --><!-- TMPL_ELSE -->Add z39.50 Server<!-- /TMPL_IF --><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="delete_confirm" --> <a href="/cgi-bin/koha/admin/z3950servers.pl">z39.50 Servers</a> &rsaquo; Confirm Deletion<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="add_validate" --> <a href="/cgi-bin/koha/admin/z3950servers.pl">z39.50 Servers</a> &rsaquo; z39.50 Server Added<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="delete_confirmed" --> <a href="/cgi-bin/koha/admin/z3950servers.pl">z39.50 Servers</a> &rsaquo; z39.50 Server Deleted<!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
@@ -106,74 +106,74 @@
         <!-- TMPL_ELSE -->
                 <h1>Add Z39.50 Server</h1>
         <!-- /TMPL_IF -->                
-        <table>
-        <!-- TMPL_IF NAME="searchfield" -->
-                <tr>
-                        <th scope="row">Z39.50 Server</th>
-                        <td>
+        <fieldset class="rows">
+        <ol><!-- TMPL_IF NAME="searchfield" -->
+                <li>
+                        <span class="label">Z39.50 Server: </span>
+                        
                                 <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" /><!-- TMPL_VAR NAME="searchfield" -->
-                        </td>
-                </tr>
+                        
+                </li>
         <!-- TMPL_ELSE -->
-                <tr>
-                        <th scope="row">Z39.50 Server</th>
-                        <td>
-                                <input type="text" name="searchfield" size="65" maxlength="100" onblur="toUC(this)" />
-                        </td>
-                </tr>
+                <li>
+                        <label for="searchfield">Z39.50 Server: </label>
+                        
+                                <input type="text" name="searchfield" id="searchfield" size="65" maxlength="100" onblur="toUC(this)" />
+                        
+                </li>
         <!-- /TMPL_IF -->
 
-		<tr>
-			<th scope="row">Hostname</th>
-			<td>
-				<input type="text" name="host" size="30" value="<!-- TMPL_VAR NAME="host" -->" />
-			</td>
-		</tr>
-		<tr>
-			<th scope="row">Port</th>
-			<td>
-				<input type="text" name="port" size="5" value="<!-- TMPL_VAR NAME="port" -->" onblur="isNum(this)" />
-			</td>
-		</tr>
-		<tr>
-			<th scope="row">Database</th>
-			<td>
-				<input type="text" name="db" value="<!-- TMPL_VAR NAME="db" -->" />
-			</td>
-		</tr>
-		<tr>
-			<th scope="row">Userid</th>
-			<td>
-				<input type="text" name="userid" value="<!-- TMPL_VAR NAME="userid" -->" />
-			</td>
-		</tr>
-		<tr>
-			<th scope="row">Password</th>
-			<td>
-				<input type="text" name="password" value="<!-- TMPL_VAR NAME="password" -->" />
-			</td>
-		</tr>
-		<tr>
-			<th scope="row">Checked (searched by default)</th>
-			<td>
-				<input type="text" size="1" name="checked" value="<!-- TMPL_VAR NAME="checked" -->" onblur="isNum(this)" />  </td></tr>
-		<tr>
-			<th scope="row">Rank (display order)</th>
-			<td>
-				<input type="text" name="rank" size="4" value="<!-- TMPL_VAR NAME="rank" -->" onblur="isNum(this)" />
-			</td>
-		</tr>
-				<tr>
-			<th scope="row">Syntax (z3950 can send<br />
-			 records in various format. Choose one)</th>
-			<td>
-				<select name="syntax">
+		<li>
+			<label for="host">Hostname: </label>
+			
+				<input type="text" name="host" id="host" size="30" value="<!-- TMPL_VAR NAME="host" -->" />
+			
+		</li>
+		<li>
+			<label for="port">Port: </label>
+			
+				<input type="text" name="port" id="port" size="5" value="<!-- TMPL_VAR NAME="port" -->" onblur="isNum(this)" />
+			
+		</li>
+		<li>
+			<label for="db">Database: </label>
+			
+				<input type="text" name="db" id="db" value="<!-- TMPL_VAR NAME="db" -->" />
+			
+		</li>
+		<li>
+			<label for="userid">Userid: </label>
+			
+				<input type="text" name="userid" id="userid" value="<!-- TMPL_VAR NAME="userid" -->" />
+			
+		</li>
+		<li>
+			<label for="password">Password: </label>
+			
+				<input type="text" name="password" id="password" value="<!-- TMPL_VAR NAME="password" -->" />
+			
+		</li>
+		<li>
+			<label for="checked">Checked (searched by default): </label>
+			
+				<input type="text" size="1" name="checked" id="checked" value="<!-- TMPL_VAR NAME="checked" -->" onblur="isNum(this)" />  </li>
+		<li>
+			<label for="rank">Rank (display order): </label>
+			
+				<input type="text" name="rank" id="rank" size="4" value="<!-- TMPL_VAR NAME="rank" -->" onblur="isNum(this)" />
+			
+		</li>
+				<li>
+			<label for="syntax">Syntax (z3950 can send<br />
+			 records in various format. Choose one): </label>
+			
+				<select name="syntax" id="syntax">
 					<option value="USMARC">USMARC</option>
 					<option value="UNIMARC">UNIMARC</option>
 				</select>
-			</td>
-		</tr>
-        </table><input type="button" value="<!-- TMPL_IF NAME="searchfield" -->Update Z39.50 Server<!-- TMPL_ELSE -->Add Z39.50 Server<!-- /TMPL_IF -->" onclick="Check(this.form)" />  <input type="button" value="Cancel" onclick="location.href='<!-- TMPL_VAR NAME="script_name" -->';" />
+			
+		</li></ol>
+        </fieldset><input type="button" value="<!-- TMPL_IF NAME="searchfield" -->Update Z39.50 Server<!-- TMPL_ELSE -->Add Z39.50 Server<!-- /TMPL_IF -->" onclick="Check(this.form)" /> 
         </form>
 <!-- /TMPL_IF -->
 
@@ -187,47 +187,47 @@
 <!-- TMPL_IF NAME="delete_confirm" -->
 	<!-- TMPL_VAR NAME="reqsel" -->
 <h3>Confirm Deletion of Server <!-- TMPL_VAR NAME="searchfield" --></h3>	
-        <table>
-                <tr>
-                        <td>Site</td>
-                        <td>
+        <ul>
+                <li>
+                        <strong>Site: </strong>
+                        
                                 <!-- TMPL_VAR NAME="searchfield" -->
-                        </td>
-                </tr>
-                <tr>
-                        <td>Hostname</td>
-                        <td><!-- TMPL_VAR NAME="host" --></td>
-                </tr>
-                <tr>
-                        <td>Port</td>
-                        <td><!-- TMPL_VAR NAME="port" --></td>
-                </tr>
-                <tr>
-                        <td>Database</td>
-                        <td><!-- TMPL_VAR NAME="db" --></td>
-                </tr>
-                <tr>
-                        <td>Userid</td>
-                        <td><!-- TMPL_VAR NAME="userid" --></td>
-                </tr>
-                <tr>
-                        <td>Password</td>
-                        <td><!-- TMPL_VAR NAME="password" --></td>
-                </tr>
-                <tr>
-                        <td>Checked</td>
-                        <td><!-- TMPL_VAR NAME="checked" --></td>
-                </tr>
-                <tr>
-                        <td>Rank</td>
-                        <td><!-- TMPL_VAR NAME="rank" --></td>
-                </tr>
-                <tr>
-                        <td>                <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+                        
+                </li>
+                <li>
+                        <strong>Hostname: </strong>
+                        <!-- TMPL_VAR NAME="host" -->
+                </li>
+                <li>
+                        <strong>Port: </strong>
+                        <!-- TMPL_VAR NAME="port" -->
+                </li>
+                <li>
+                        <strong>Database: </strong>
+                        <!-- TMPL_VAR NAME="db" -->
+                </li>
+                <li>
+                        <strong>Userid: </strong>
+                        <!-- TMPL_VAR NAME="userid" -->
+                </li>
+                <li>
+                        <strong>Password: </strong>
+                        <!-- TMPL_VAR NAME="password" -->
+                </li>
+                <li>
+                        <strong>Checked: </strong>
+                        <!-- TMPL_VAR NAME="checked" -->
+                </li>
+                <li>
+                        <strong>Rank: </strong>
+                        <!-- TMPL_VAR NAME="rank" -->
+                </li>
+ 	</ul>
+                                        <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
                         <input type="hidden" name="op" value="delete_confirmed" />
-                        <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" /><input type="submit" value="Delete this Server" /></form> <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="Do Not Delete" /></form></td>
-                </tr>
-	</table>
+                        <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" /><input type="submit" value="Delete this Server" /></form>  <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="Do Not Delete" /></form>
+
+
 
 <!-- /TMPL_IF -->
 
@@ -266,8 +266,8 @@
                         <td><!-- TMPL_VAR NAME="checked" --></td>
                         <td><!-- TMPL_VAR NAME="rank" --></td>
 						<td><!-- TMPL_VAR NAME="syntax" --></td>
-                        <td><form action="<!-- TMPL_VAR name="script_name" -->" method="get"><input type="hidden" name="op" value="add_form" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="name" -->" /><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="name" -->" /><input type="submit" value="Delete" /></form></td>                
+                        <td><a href="<!-- TMPL_VAR name="script_name" -->?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="name" -->">Edit</a></td>
+                        <td><a href="<!-- TMPL_VAR name="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="name" -->">Delete</a></td>                
 			</tr>
                 <!-- /TMPL_LOOP -->
 	</table>