diff --git a/admin/auth_subfields_structure.pl b/admin/auth_subfields_structure.pl
index 3d1bea1b73..e59d6b7564 100755
--- a/admin/auth_subfields_structure.pl
+++ b/admin/auth_subfields_structure.pl
@@ -201,7 +201,8 @@ if ($op eq 'add_form') {
 					-size=>1,
 					-multiple=>0,
 					);
-		$row_data{tagsubfield} =$data->{'tagsubfield'}."<input type=\"hidden\" name=\"tagsubfield\" value=\"".$data->{'tagsubfield'}."\" id=\"tagsubfield\" />";
+		$row_data{tagsubfieldinput} = "<input type=\"hidden\" name=\"tagsubfield\" value=\"".$data->{'tagsubfield'}."\" id=\"tagsubfield\" />";
+		$row_data{tagsubfield} = $data->{'tagsubfield'};
 		$row_data{liblibrarian} = CGI::escapeHTML($data->{'liblibrarian'});
 		$row_data{libopac} = CGI::escapeHTML($data->{'libopac'});
 		$row_data{seealso} = CGI::escapeHTML($data->{'seealso'});
@@ -314,7 +315,8 @@ if ($op eq 'add_form') {
 					-size=>1,
 					-multiple=>0,
 					);
-		$row_data{tagsubfield} = "<input type=\"text\" name=\"tagsubfield\" value=\"".$data->{'tagsubfield'}."\" size=\"1\" id=\"tagsubfield\" maxlength=\"1\" />";
+		$row_data{tagsubfieldinput} = "<input type=\"text\" name=\"tagsubfield\" value=\"".$data->{'tagsubfield'}."\" size=\"1\" id=\"tagsubfield\" maxlength=\"1\" />";
+		$row_data{tagsubfield} = $data->{'tagsubfield'};
 		$row_data{liblibrarian} = "";
 		$row_data{libopac} = "";
 		$row_data{seealso} = "";
@@ -371,7 +373,8 @@ if ($op eq 'add_form') {
 	$template->param('use-heading-flags-p' => 1);
 	$template->param('heading-edit-subfields-p' => 1);
 	$template->param(action => "Edit subfields",
-							tagfield => "<input type=\"hidden\" name=\"tagfield\" value=\"$tagfield\" />$tagfield",
+							tagfield => $tagfield,
+							tagfieldinput => "<input type=\"hidden\" name=\"tagfield\" value=\"$tagfield\" />",
 							loop => \@loop_data,
 							more_subfields => $more_subfields,
 							more_tag => $tagfield);
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 d77a1eebf7..2154ca73c3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -555,6 +555,11 @@ fieldset.rows label, fieldset.rows span.label {
 	text-align: right;
 }
 
+fieldset.rows fieldset {
+	border-width : 1px;
+	margin : 0;
+	padding : .3em;
+}
 
 .yui-b fieldset.rows label, .yui-b fieldset.rows span.label {  
 	width: 9em;  
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/bookfund-admin-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/bookfund-admin-toolbar.inc
deleted file mode 100644
index f075bbf8b8..0000000000
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/bookfund-admin-toolbar.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-<div id="toolbar">
-	<script type="text/javascript">
-	//<![CDATA[
-
-	// prepare DOM for YUI Toolbar
-
-	 $(document).ready(function() {
-	    yuiToolbar();
-	 });
-
-	// YUI Toolbar Functions
-
-	function yuiToolbar() {
-	    new YAHOO.widget.Button("newfund");
-	}
-
-	//]]>
-	</script>
-	<ul class="toolbar">
-	<li><a id="newfund" href="/cgi-bin/koha/admin/aqbookfund.pl?op=add_form">New Fund</a></li>
-</ul></div>
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 041c031553..0fc47ad0be 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
@@ -11,7 +11,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
             var city        = oResultItem[3];
             var zip         = oResultItem[4];
             var aMarkup = [
-                "<div class='sample-result'>",
+                "<div class=\"sample-result\">",
                 name,
                 " (",
                 cardnumber,
@@ -53,7 +53,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
             <div id="borrowerautocomplete" class="autocomplete">
                 <input autocomplete="off" id="findborrower" name="findborrower" class="focus" type="text" />
                 <div id="yborrowercontainer"></div>
-                <input id="ysearchsubmit" type="submit" value="Submit">
+                <input id="ysearchsubmit" type="submit" value="Submit" />
                 <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
                 <input name="printer" value="" type="hidden" />
             </div>
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 868936874e..a73f76fb4b 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,5 +1,6 @@
 <!-- Begin Printers Resident Search Box -->
 <!-- TMPL_IF NAME="CircAutocompl" --><script type="text/javascript">
+//<![CDATA[
 YAHOO.util.Event.onContentReady("header_search", function() {
     new function() {
         // Define a custom formatter function
@@ -40,6 +41,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
         this.oAutoComp.formatResult = this.fnCustomFormatter;
 }
 });    
+//]]>
 </script><!-- /TMPL_IF -->
 <div id="header_search">
 	<div id="printer_search" class="residentsearch">
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 9dc4963094..eb3da85711 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,5 +1,6 @@
 <!-- Begin Stopwords Resident Search Box -->
 <!-- TMPL_IF NAME="CircAutocompl" --><script type="text/javascript">
+//<![CDATA[
 YAHOO.util.Event.onContentReady("header_search", function() {
     new function() {
         // Define a custom formatter function
@@ -39,7 +40,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
         //this.oAutoComp.queryDelay = 1;
         this.oAutoComp.formatResult = this.fnCustomFormatter;
 }
-});    
+});     //]]>
 </script><!-- /TMPL_IF -->
 <div id="header_search">
 	<div id="stopword_search" class="residentsearch">
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 cf3fbb17be..1c04c6f2cd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl
@@ -71,7 +71,29 @@
 	<div id="yui-main">
 	<div class="yui-b">
 	
-<!-- TMPL_UNLESS NAME="header-is-add-p" --><!-- TMPL_INCLUDE NAME="bookfund-admin-toolbar.inc" --><!-- /TMPL_UNLESS -->
+<!-- TMPL_IF name="else" -->
+<div id="toolbar">
+	<script type="text/javascript">
+	//<![CDATA[
+
+	// prepare DOM for YUI Toolbar
+
+	 $(document).ready(function() {
+	    yuiToolbar();
+	 });
+
+	// YUI Toolbar Functions
+
+	function yuiToolbar() {
+	    new YAHOO.widget.Button("newfund");
+	}
+
+	//]]>
+	</script>
+	<ul class="toolbar">
+	<li><a id="newfund" href="/cgi-bin/koha/admin/aqbookfund.pl?op=add_form">New Fund</a></li>
+</ul></div>
+<!-- /TMPL_IF -->
 
 <!-- TMPL_IF name="else" -->
 <h1>Funds and budgets administration</h1>
@@ -206,39 +228,33 @@
 
 
 <!-- TMPL_IF name="delete_confirm" -->
-<h3>Confirm Deletion of Fund <em><!-- TMPL_VAR name="bookfundid" --></em></h3>
-<table>
-  <tr>
-    <th>Fund</th>
-    <td><!-- TMPL_VAR name="bookfundid" --></td>
-  </tr>
-  <tr>
-    <th>Branch</th>
-    <td><!-- TMPL_VAR name="branchcode" --></td>
-  </tr>
-  <tr>
-    <th>Name</th>
-    <td><!-- TMPL_VAR name="bookfundname" --></td>
-  </tr>
-  <tr>
-    <th>Group</th>
-    <td><!-- TMPL_VAR name="bookfundgroup" --></td>
-  </tr>
-</table>
 
 <form action="<!-- TMPL_VAR name="action" -->" method="post">
   <input type="hidden" name="op" value="delete_confirmed" />
   <input type="hidden" name="bookfundid" value="<!-- TMPL_VAR name="bookfundid" -->" />
   <input type="hidden" name="branchcode" value="<!-- TMPL_VAR name="branchcode" -->" />
-
-  <div id="action">
-    <input type="submit" value="Delete this Fund" />
-  </div>
+	<fieldset><legend>Confirm Deletion of Fund <em><!-- TMPL_VAR name="bookfundid" --></em></legend>
+	<table>
+		  <tr>
+    <th scope="row">Fund: </th><td>
+    <!-- TMPL_VAR name="bookfundid" --></td></tr>
+  
+  <tr>
+    <th scope="row">Branch: </th><td>
+    <!-- TMPL_VAR name="branchcode" --></td></tr>
+  
+  <tr>
+    <th scope="row">Name: </th><td>
+    <!-- TMPL_VAR name="bookfundname" --></td></tr>
+  
+  <tr>
+    <th scope="row">Group: </th><td>
+    <!-- TMPL_VAR name="bookfundgroup" --></td></tr>
+  	</table>
+   <fieldset class="action"> <input type="submit" value="Yes, Delete this Fund" /> <a class="cancel" href="/cgi-bin/koha/admin/aqbookfund.pl">Cancel</a></fieldset>
+  </fieldset>
 </form>
 
-<form action="<!-- TMPL_VAR name="action" -->" method="post">
-  <input type="submit" value="Do not Delete" />
-</form>
 <!-- /TMPL_IF --> <!-- delete_confirm -->
 
 <!-- TMPL_IF name="delete_confirmed" -->
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 230e816772..9c4b0864d7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl
@@ -332,32 +332,30 @@
 
     <table>
       <tr>
-        <th>Start date</th>
+        <th scope="row">Start date: </th>
         <td><!-- TMPL_VAR NAME="startdate" --></td>
       </tr>
       
       <tr>
-        <th>End date</th>
+        <th scope="row">End date: </th>
         <td><!-- TMPL_VAR NAME="enddate" --></td>
       </tr>
       
       <tr>
-        <th>Budget Amount</th>
+        <th scope="row">Budget Amount: </th>
         <td><!-- TMPL_VAR NAME="budgetamount" --></td>
       </tr>
     </table>
 
   </fieldset>
-   <fieldset class="action">
 <form action="<!-- TMPL_VAR NAME="action" -->" method="post">
+   <fieldset class="action">
     <input type="hidden" name="op" value="delete_confirmed" />
     <input type="hidden" name="aqbudgetid" value="<!-- TMPL_VAR NAME="aqbudgetid" -->" />
       <input type="submit" value="Delete this budget" />
-	  </form>
-	<form action="/cgi-bin/koha/admin/aqbudget.pl" method="get">
-      <input type="submit" value="Do Not Delete" />
-	  </form>
+	<a class="cancel" href="/cgi-bin/koha/admin/aqbudget.pl">Cancel</a>
    </fieldset>
+	  </form>
 
 <!-- /TMPL_IF -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl
index a0baa66294..d7609ffe52 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl
@@ -6,7 +6,7 @@
 <!-- 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; Authority MARC subfield structure</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="else" -->Authority MARC subfield structure<!-- TMPL_ELSE --><a href="/cgi-bin/koha/admin/auth_subfields_structure.pl?tagfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;tagsubfield=<!-- TMPL_VAR NAME="tagsubfield" -->&amp;authtypecode=<!-- TMPL_VAR NAME="authtypecode" -->">Authority MARC subfield structure</a> &rsaquo; <!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirm" -->Confirm Deletion of Subfield <!-- TMPL_VAR NAME="tagsubfield" -->?<!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirmed" -->Data deleted<!-- /TMPL_IF --><!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="use-heading-flags-p" --><!-- TMPL_IF NAME="heading-edit-subfields-p" -->Edit MARC subfields constraints<!-- /TMPL_IF --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF --><!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
 
@@ -24,23 +24,29 @@
         <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
         <!-- TMPL_LOOP NAME="loop" -->
         <div class="data <!-- TMPL_VAR NAME="toggle" -->">
-            <h2>Tag <!-- TMPL_VAR NAME="tagfield" -->, Subfield <!-- TMPL_VAR NAME="tagsubfield" --></h2>
-            <p><label for="repeatable<!-- TMPL_VAR NAME="row" -->">Repeatable:</label><!-- TMPL_VAR NAME="repeatable" -->&nbsp;</p>
-            <p><label for="mandatory<!-- TMPL_VAR NAME="row" -->">Mandatory:</label><!-- TMPL_VAR NAME="mandatory" -->&nbsp;</p>
-            <p><label for="liblibrarian<!-- TMPL_VAR NAME="row" -->">Text for librarian:</label><input id="liblibrarian<!-- TMPL_VAR NAME="row" -->" type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" size="40" maxlength="80" /></p>
-            <p><label for="libopac<!-- TMPL_VAR NAME="row" -->">Text for OPAC:</label><input type="text" id="libopac<!-- TMPL_VAR NAME="row" -->" name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" maxlength="80" /></p>
-            <p><label for="tab<!-- TMPL_VAR NAME="row" -->">Managed in tab</label><!-- TMPL_VAR NAME="tab" --> (ignore means that the subfield is NOT managed by Koha)</p>
-            <p><label for="hidden<!-- TMPL_VAR NAME="row" -->">Hidden</label> Opac:<!-- TMPL_VAR name="ohidden" -->  Intranet:<!-- TMPL_VAR name="ihidden" --> Editor:<!-- TMPL_VAR name="ehidden" --> (see online help)</p>
-            <p><label for="isurl<!-- TMPL_VAR NAME="row" -->">Is a URL </label><!-- TMPL_VAR NAME="isurl" --> (if checked, it means that the subfield is an URL and can be clicked)</p>
-            <p>Help input: </p>	
-            <ul>
-                <li>Authorized Value <!-- TMPL_VAR NAME="authorised_value" --></li>
-                <li>Thesaurus <!-- TMPL_VAR NAME="frameworkcode" --></li>
-                <li>Plugin <!-- TMPL_VAR NAME="value_builder" --></li>
-            </ul> 
+            <fieldset class="rows">
+            <legend>Tag <!-- TMPL_VAR NAME="tagfield" --><!-- TMPL_VAR NAME="tagfieldinput" -->, Subfield <!-- TMPL_VAR NAME="tagsubfield" --><!-- TMPL_VAR NAME="tagsubfieldinput" --></legend>
+			<ol><li><label for="repeatable<!-- TMPL_VAR NAME="row" -->">Repeatable: </label><!-- TMPL_VAR NAME="repeatable" -->&nbsp;</li>
+            <li><label for="mandatory<!-- TMPL_VAR NAME="row" -->">Mandatory: </label><!-- TMPL_VAR NAME="mandatory" -->&nbsp;</li>
+            <li><label for="liblibrarian<!-- TMPL_VAR NAME="row" -->">Text for librarian: </label><input id="liblibrarian<!-- TMPL_VAR NAME="row" -->" type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" size="40" maxlength="80" /></li>
+            <li><label for="libopac<!-- TMPL_VAR NAME="row" -->">Text for OPAC: </label><input type="text" id="libopac<!-- TMPL_VAR NAME="row" -->" name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" maxlength="80" /></li>
+            <li><label for="tab<!-- TMPL_VAR NAME="row" -->">Managed in tab: </label><!-- TMPL_VAR NAME="tab" --> (ignore means that the subfield is NOT managed by Koha)</li>
+            <li><fieldset><legend>Display</legend>
+<ol>
+	<li><label for="ohidden<!-- TMPL_VAR NAME="row" -->">Opac:</label><!-- TMPL_VAR name="ohidden" -->  </li>
+	<li><label for="ihidden<!-- TMPL_VAR NAME="row" -->">Intranet:</label><!-- TMPL_VAR name="ihidden" --> </li>
+	<li><label for="ehidden<!-- TMPL_VAR NAME="row" -->">Editor:</label><!-- TMPL_VAR name="ehidden" --> (see online help)</li>
+</ol></fieldset></li>
+            <li><label for="isurl<!-- TMPL_VAR NAME="row" -->">Is a URL: </label><!-- TMPL_VAR NAME="isurl" --> (if checked, it means that the subfield is an URL and can be clicked)</li>
+            <li><fieldset><legend>Help input</legend>	
+            <ol>
+                <li><label for="authorised_value<!-- TMPL_VAR NAME="row" -->">Authorized Value:</label> <!-- TMPL_VAR NAME="authorised_value" --></li>
+                <li><label for="frameworkcode<!-- TMPL_VAR NAME="row" -->">Thesaurus:</label> <!-- TMPL_VAR NAME="frameworkcode" --></li>
+                <li><label for="value_builder<!-- TMPL_VAR NAME="row" -->">Plugin:</label> <!-- TMPL_VAR NAME="value_builder" --></li>
+            </ol></fieldset></li> </ol></fieldset>
         </div>
         <!-- /TMPL_LOOP -->
-        <input type="submit" class="submit" value="Save Changes" />
+        <fieldset class="action"><input type="submit" class="submit" value="Save Changes" /> <a class="cancel" href="/cgi-bin/koha/admin/auth_subfields_structure.pl?authtypecode=<!-- TMPL_VAR NAME="authtypecode" -->">Cancel</a></fieldset>
         <p>Note: in the last column, you can choose:
             <ul><li>An "authorised value": it refers to a list of authorised values for this subfield. See the corresponding admin table.</li>
             <li>A "thesaurus category": it refers to a thesaurus category. See the corresponding admin table.</li>
@@ -52,22 +58,17 @@
 
 <!-- TMPL_IF NAME="delete_confirm" -->
 
-    <h3>Confirm Deletion of Subfield <span class="ex"><!-- TMPL_VAR NAME="tagsubfield" -->?</span></h3>
-    <p>Subfield: <!-- TMPL_VAR NAME="tagsubfield" --></p>
-    <p>Description: <!-- TMPL_VAR NAME="liblibrarian" --></p>
     <form action="<!-- TMPL_VAR NAME="delete_link" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" />
+	<fieldset>
+    <legend>Confirm Deletion of Subfield <em><!-- TMPL_VAR NAME="tagsubfield" -->?</em></legend>
+    <table><tr><th scope="row">Subfield:</th> <td><!-- TMPL_VAR NAME="tagsubfield" --></td></tr>
+    <tr><th scope="row">Description:</th> <td><!-- TMPL_VAR NAME="liblibrarian" --></td></tr></table>
         <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
         <input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->" />
         <input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->" />
         <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
-        <input type="submit" class="cancel" value="Yes, Delete this Subfield" />
-    </form>
-    <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-        <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
-        <input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->" />
-        <input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->" />
-        <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
-        <input type="submit" class="submit" value="No, Do Not Delete" />
+        <fieldset class="action"><input type="submit" class="cancel" value="Yes, Delete this Subfield" /><a class="cancel" href="/cgi-bin/koha/admin/auth_subfields_structure.pl?searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;tagfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;tagsubfield=<!-- TMPL_VAR NAME="tagsubfield" -->&amp;authtypecode=<!-- TMPL_VAR NAME="authtypecode" -->">Cancel</a></fieldset>
+		</fieldset>
     </form>
 <!-- /TMPL_IF -->
 
@@ -128,10 +129,15 @@
     </tr>
     <!-- /TMPL_LOOP -->
 </table>
-<div id="action">
-    <a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;tagfield=<!-- TMPL_VAR name="edit_tagfield" -->&amp;authtypecode=<!-- TMPL_VAR name="edit_authtypecode" -->">Edit subfields</a>
-    <a href="auth_tag_structure.pl?searchfield=<!-- TMPl_VAR name="tagfield" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode"-->">Return to Auth Structure</a>
-</div>
+
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="get">
+	<fieldset class="action"><input type="hidden" name="op" value="add_form" />
+	<input type="hidden" name="tagfield" value="<!-- TMPL_VAR name="edit_tagfield" -->" />
+	<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR name="edit_authtypecode" -->" />
+	<input type="submit" value="Edit subfields" />
+	<a class="cancel" href="auth_tag_structure.pl?searchfield=<!-- TMPl_VAR name="tagfield" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode"-->">Cancel</a></fieldset>
+	</form>
+
     <!-- TMPL_IF NAME="previous" -->
     <input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="previous" alt="previous" border="0" >
     </a>
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 98e4fd7721..46a2464041 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,7 +1,7 @@
 <!-- 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; <!-- 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_IF NAME="heading-add-tag-p" -->&rsaquo; <!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR NAME="authtypecode" --> Framework<!-- TMPL_ELSE -->Default Framework<!-- /TMPL_IF --> &rsaquo; New 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">
@@ -63,7 +63,7 @@ return false;
 
 <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; <!-- 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_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; New 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">
@@ -80,7 +80,7 @@ return false;
     <h2>
     <!-- TMPL_IF NAME="use-heading-flags-p" -->
     <!-- TMPL_IF NAME="heading-modify-tag-p" -->Modify tag<!-- /TMPL_IF -->
-    <!-- TMPL_IF NAME="heading-add-tag-p" -->Add tag<!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="heading-add-tag-p" -->New tag<!-- /TMPL_IF -->
     <!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF -->
     </h2>
     <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
@@ -113,16 +113,16 @@ return false;
 
 
 <!-- TMPL_IF NAME="delete_confirm" -->
-<h3>Confirm Deletion</h3>
-
-		<ul>
-			<li><strong>Tag: </strong><!-- TMPL_VAR NAME="searchfield" --> <!-- TMPL_VAR NAME="liblibrarian" --></li>
-		</ul>
-		
 		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+<fieldset><legend>Confirm Deletion</legend>
+		<table>
+			<tr><th scope="row">Tag: </th><td><!-- TMPL_VAR NAME="searchfield" --> <!-- TMPL_VAR NAME="liblibrarian" --></td></tr>
+		</table>
         <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> <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="NO" class="submit" /></form>
+        <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
+		<fieldset class="action"><input type="submit" value="YES"> <a class="cancel" href="/cgi-bin/koha/admin/auth_tag_structure.pl">Cancel</a> </fieldset>
+</fieldset></form>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="delete_confirmed" -->
@@ -152,6 +152,23 @@ return false;
 
 
 <!-- TMPL_IF NAME="else" -->
+
+<div id="toolbar">
+	<script type="text/javascript">
+	//<![CDATA[
+	// prepare DOM for YUI Toolbar
+	 $(document).ready(function() {
+	    yuiToolbar();
+	 });
+	// YUI Toolbar Functions
+	function yuiToolbar() {
+	    new YAHOO.widget.Button("newtag");
+	}	//]]>
+	</script>
+	<ul class="toolbar">
+	<li><a id="newtag" href="/cgi-bin/koha/admin/auth_tag_structure.pl?op=add_form?authtypecode=<!-- TMPL_VAR NAME="authtypecode" -->">New Tag</a></li>
+</ul></div>
+
 <h2>Select an authority framework</h2>
 <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
     <select name="authtypecode">
@@ -192,18 +209,13 @@ return false;
     </tr>
     <!-- /TMPL_LOOP -->
     </table>
-    <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-        <input type="hidden" name="op" value="add_form" />
-        <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
-        <input type="hidden" name="op" value="add_form" />
-        <input type="submit" class="submit" value="Add Tag" />
+
         <!-- TMPL_IF NAME="isprevpage" -->
             <a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;authtypecode=<!-- TMPL_VAR NAME="authtypecode" --> ">Previous Page</a>
         <!-- /TMPL_IF -->
         <!-- TMPL_IF NAME="nextpage" -->
             <a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;authtypecode=<!-- TMPL_VAR NAME="authtypecode" --> ">Next Page</a>
         <!-- /TMPL_IF -->
-    </form>
 <!-- /TMPL_IF -->
 
 </div>
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 fce4d23e5f..8523c40c0f 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
@@ -1,8 +1,8 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Administration &rsaquo; Authorized Values <!-- TMPL_IF name="add_form" --> &rsaquo; <!-- TMPL_IF name="action_modify" -->Modify authorised value<!-- /TMPL_IF -->
-	   <!-- 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="action_add_value" --> &rsaquo;  New authorised value<!-- /TMPL_IF -->
+	   <!-- TMPL_IF name="action_add_category" --> &rsaquo; New category<!-- /TMPL_IF --><!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirm" --> &rsaquo; Confirm Deletion<!-- /TMPL_IF -->
 <!-- TMPL_IF name="else" -->Authorized values<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
@@ -11,8 +11,8 @@
 <!-- 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" --> <a href="/cgi-bin/koha/admin/authorised_values.pl">Authorized Values</a> &rsaquo; <!-- TMPL_IF name="action_modify" -->Modify authorised value<!-- /TMPL_IF -->
-	   <!-- 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="action_add_value" -->New authorised value<!-- /TMPL_IF -->
+	   <!-- TMPL_IF name="action_add_category" -->New 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<!-- /TMPL_IF --></div>
 
@@ -25,8 +25,8 @@
 <!-- TMPL_IF name="add_form" -->
 	<h1>
 	   <!-- TMPL_IF name="action_modify" -->Modify authorised value<!-- /TMPL_IF -->
-	   <!-- TMPL_IF name="action_add_value" -->Add authorised value<!-- /TMPL_IF -->
-	   <!-- TMPL_IF name="action_add_category" -->Add category<!-- /TMPL_IF -->
+	   <!-- TMPL_IF name="action_add_value" -->New authorised value<!-- /TMPL_IF -->
+	   <!-- TMPL_IF name="action_add_category" -->New category<!-- /TMPL_IF -->
 	</h1>
 	<form action="<!-- TMPL_VAR name="script_name" -->" name="Aform" method="post">
 	<input type="hidden" name="op" value="add_validate" />
@@ -54,27 +54,51 @@
 
 
 <!-- TMPL_IF name="delete_confirm" -->
-<!-- -->
-<h3>Confirm Deletion</h3>
+	<form action="<!-- TMPL_VAR name=" script_name " -->" method="post">
+<fieldset>
+<legend>Confirm Deletion</legend>
 <table>
 	<tr>
-		<td>Category</td>
-		<td>Variable</td>
-		<td>Value</td>
+		<th>Category</th>
+		<th>Variable</th>
+		<th>Value</th>
 	</tr>
 	<tr>
 		<td><!-- TMPL_VAR name="searchfield" --></td>
 	<td><!-- TMPL_VAR name="Tvalue" --></td>
 	<td><!-- TMPL_VAR name="Tlib" --></td></tr>
 	</table>
-	<form action="<!-- TMPL_VAR name=" script_name " -->" method="post">
 		<input type="hidden" name="op" value="delete_confirmed" />
 		<input type="hidden" name="id" value="<!-- TMPL_VAR name="id" -->" />
-		<input type="hidden" name="searchfield" value="<!-- TMPL_VAR name="searchfield" -->" /><input type="submit" value="Confirm Deletion" /></form> <form class="inline" action="<!-- TMPL_VAR name="script_name" -->" method="post"><input type="submit" value="Do Not Delete" /></form>
+		<input type="hidden" name="searchfield" value="<!-- TMPL_VAR name="searchfield" -->" /><fieldset class="action"><input type="submit" value="Yes, Delete" /> <a class="cancel" href="/cgi-bin/koha/admin/authorised_values.pl">Cancel</a></fieldset></fieldset></form>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF name="else" -->
 
+<div id="toolbar">
+	<script type="text/javascript">
+	//<![CDATA[
+
+	// prepare DOM for YUI Toolbar
+
+	 $(document).ready(function() {
+	    yuiToolbar();
+	 });
+
+	// YUI Toolbar Functions
+
+	function yuiToolbar() {
+	    new YAHOO.widget.Button("addauth");
+	    new YAHOO.widget.Button("addcat");
+	}
+
+	//]]>
+	</script>
+	<ul class="toolbar">
+	 <li><a id="addauth" href= "/cgi-bin/koha/admin/authorised_values.pl?op=add_form&amp;category=<!-- TMPL_VAR NAME="category" -->">New Authorized value for <!-- TMPL_VAR name="category" --></a></li>
+    <li><a id="addcat" href= "/cgi-bin/koha/admin/authorised_values.pl?op=add_form">New Category</a></li>
+</ul></div>
+
 <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,
@@ -105,11 +129,6 @@ the subfield is not entered through a free field, but though a list of authorize
 	<input type="submit" value="&lt;&lt; Previous Page" /></form>
 <!-- /TMPL_IF --> 
 
-<div id="action">
-    <a href= "/cgi-bin/koha/admin/authorised_values.pl?op=add_form&amp;category=<!-- TMPL_VAR NAME="category" -->">Add Authorized value for <!-- TMPL_VAR name="category" --></a>
-    <a href= "/cgi-bin/koha/admin/authorised_values.pl?op=add_form">Add New Category</a>
-</div>
-
 <!-- TMPL_IF NAME="nextpage" -->
 <form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
 <input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="nextpage" -->" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl
index ffc3aae8b6..0ff6e43f33 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Administration &rsaquo; <!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="authtypecode" --> Authority Types &rsaquo; Modify authority type<!-- TMPL_ELSE --> Authority Types &rsaquo; Add authority type<!-- /TMPL_IF --><!-- TMPL_ELSE --><!-- TMPL_IF NAME="delete_confirm" -->Authority Types &rsaquo; Confirm Deletion of Authority Type<!-- TMPL_ELSE -->Authority Types<!-- /TMPL_IF --><!-- /TMPL_IF --></title>
+<title>Koha &rsaquo; Administration &rsaquo; <!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="authtypecode" --> Authority Types &rsaquo; Modify authority type<!-- TMPL_ELSE --> Authority Types &rsaquo; New authority type<!-- /TMPL_IF --><!-- TMPL_ELSE --><!-- TMPL_IF NAME="delete_confirm" -->Authority Types &rsaquo; Confirm Deletion of Authority Type<!-- TMPL_ELSE -->Authority Types<!-- /TMPL_IF --><!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script type="text/javascript">
 //<![CDATA[
@@ -61,7 +61,7 @@ function Check(f) {
 <!-- 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_IF NAME="authtypecode" --> <a href="/cgi-bin/koha/admin/authtypes.pl">Authority Types</a> &rsaquo; Modify authority type<!-- TMPL_ELSE --> <a href="/cgi-bin/koha/admin/authtypes.pl">Authority Types</a> &rsaquo; Add authority type<!-- /TMPL_IF --><!-- TMPL_ELSE --><!-- TMPL_IF NAME="delete_confirm" --><a href="/cgi-bin/koha/admin/authtypes.pl">Authority Types</a> &rsaquo; Confirm Deletion of Authority Type<!-- TMPL_ELSE -->Authority Types<!-- /TMPL_IF --><!-- /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" --><!-- TMPL_IF NAME="authtypecode" --> <a href="/cgi-bin/koha/admin/authtypes.pl">Authority Types</a> &rsaquo; Modify authority type<!-- TMPL_ELSE --> <a href="/cgi-bin/koha/admin/authtypes.pl">Authority Types</a> &rsaquo; New authority type<!-- /TMPL_IF --><!-- TMPL_ELSE --><!-- TMPL_IF NAME="delete_confirm" --><a href="/cgi-bin/koha/admin/authtypes.pl">Authority Types</a> &rsaquo; Confirm Deletion of Authority Type<!-- TMPL_ELSE -->Authority Types<!-- /TMPL_IF --><!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
@@ -72,48 +72,59 @@ function Check(f) {
 <!-- TMPL_IF NAME="add_form" -->
 
 	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
-	<table>
-		<!-- TMPL_IF NAME="authtypecode" -->
-		<caption>Modify authority type</caption>
+		<fieldset class="rows"><!-- TMPL_IF NAME="authtypecode" -->
+		<legend>Modify authority type</legend>
 	<!-- TMPL_ELSE -->
-		<caption>Add authority type</caption>
+		<legend>New authority type</legend>
 	<!-- /TMPL_IF -->
+	<ol>
 			<!-- TMPL_IF NAME="authtypecode" -->
-				<tr><td><label for="authtypecode">Authority type<label></td><td><input type="hidden" name="op" value="add_validate" />
-		<input type="hidden" name="modif" value="1" /><input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" /><!-- TMPL_VAR NAME="authtypecode" --></td></tr>
+				<li><label for="authtypecode">Authority type<label><input type="hidden" name="op" value="add_validate" />
+		<input type="hidden" name="checked" value="0" /><input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" /><!-- TMPL_VAR NAME="authtypecode" --></li>
 			<!-- TMPL_ELSE -->
-				<tr><td><label for="authtypecode">Authority type</label></td><td><input id="authtypecode" type="text" name="authtypecode" size="10" maxlength="10" onblur="toUC(this)" /></td></tr>
+				<li><label for="authtypecode">Authority type: </label><input id="authtypecode" type="text" name="authtypecode" size="10" maxlength="10" onblur="toUC(this)" /></li>
 			<!-- /TMPL_IF -->
-		<tr><td><label for="authtypetext">Description</label></td><td><input type="text" id="authtypetext" name="authtypetext" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="authtypetext" ESCAPE="HTML" -->" /></td></tr>
-		<tr><td><label for="summary">Summary</label></td><td><textarea id="summary" name="summary" cols="40" rows="10"><!-- TMPL_VAR NAME="summary" --></textarea></td></tr>
-		<tr><td><label for="auth_tag_to_report">Report tag</label></td><td><input type="text" id="auth_tag_to_report" name="auth_tag_to_report" size="5" maxlength="3" value="<!-- TMPL_VAR NAME="auth_tag_to_report">" />Enter here the number of the tag that will be reported in the biblio (subfield by subfield). For example, in UNIMARC, enter 200 to report every 200 subfield in the 70x biblio</td></tr></table>
-	<input type="hidden" name="op" value="add_validate" />
-	<p><input type="submit" value="OK" onclick="Check(this.form); return false;" />
-			</p>
+		<li><label for="authtypetext">Description: </label><input type="text" id="authtypetext" name="authtypetext" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="authtypetext" ESCAPE="HTML" -->" /></li>
+		<li><label for="summary">Summary: </label><textarea id="summary" name="summary" cols="55" rows="7"><!-- TMPL_VAR NAME="summary" --></textarea></li>
+		<li>
+		<p>Enter here the number of the tag that will be reported in the biblio (subfield by subfield). For example, in UNIMARC, enter 200 to report every 200 subfield in the 70x biblio</p>
+		<label for="auth_tag_to_report">Report tag: </label><input type="text" id="auth_tag_to_report" name="auth_tag_to_report" size="5" maxlength="3" value="<!-- TMPL_VAR NAME="auth_tag_to_report">" /></li></ol>
+	<input type="hidden" name="op" value="add_validate" /></fieldset>
+	<fieldset class="action"><input type="submit" value="Submit" onclick="Check(this.form); return false;" /><a class="cancel" href="/cgi-bin/koha/admin/authtypes.pl">Cancel</a></fieldset>
 	</form>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="delete_confirm" -->
-	<h2>Confirm Deletion of authority structure definition for <!-- TMPL_VAR NAME="authtypetext" --> (<!-- TMPL_VAR NAME="authtypecode" -->)</h2>
-	<!-- TMPL_IF NAME="total" -->
-		<p>
-			This record is used <!-- TMPL_VAR NAME="total" --> times
-		</p>
-	<!-- /TMPL_IF -->
-
 		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+		<fieldset>
+		<legend>Confirm Deletion of authority structure definition for <!-- TMPL_VAR NAME="authtypetext" --> (<!-- TMPL_VAR NAME="authtypecode" -->)</legend>
+	<!-- TMPL_IF NAME="total" -->
+		<p>This record is used <strong><!-- TMPL_VAR NAME="total" --></strong> times</p>
+	<!-- /TMPL_IF -->		
 			<input type="hidden" name="op" value="delete_confirmed" />
 			<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
-			<input type="submit" value="YES" />
+			<fieldset class="action"><input type="submit" value="Yes, Delete" /> <a class="cancel" href="/cgi-bin/koha/admin/authtypes.pl">Cancel</a></fieldset></fieldset>
 		</form>
-		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-			<input type="submit" value="NO" />
-		</form>
-
-
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="else" -->
+
+<div id="toolbar">
+	<script type="text/javascript">
+	//<![CDATA[
+	// prepare DOM for YUI Toolbar
+	 $(document).ready(function() {
+	    yuiToolbar();
+	 });
+	// YUI Toolbar Functions
+	function yuiToolbar() {
+	    new YAHOO.widget.Button("authtype");
+	} //]]>
+	</script>
+	<ul class="toolbar">
+	<li><a id="authtype" href="/cgi-bin/koha/admin/authtypes.pl?op=add_form">New Authority Type</a></li>
+</ul></div>
+
 <h1>Authority Types</h1>
 <p>Define authority types, then authority MARC structure in the same way you define itemtypes and biblio MARC tag structure. Authority values are managed through plugins</p>
 <table>
@@ -139,12 +150,9 @@ function Check(f) {
 		</tr>
 	<!-- /TMPL_LOOP -->
 </table>
-<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-	<input type="hidden" name="op" value="add_form" />
-	<input type="submit" value="Add authority type" />
+
 	<!-- TMPL_IF NAME="previous" --><p><a href="<!-- TMPL_VAR NAME="previous" -->">&lt;&lt; Previous</a></p><!-- /TMPL_IF -->
 	<!-- TMPL_IF NAME="next" --><p><a href="<!-- TMPL_VAR NAME="next" -->">Next &gt;&gt;</a></p><!-- /TMPL_IF -->
-</form>
 
 <!-- /TMPL_IF -->
 </div>
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 6cda08edf6..5bbd5bb3eb 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
@@ -68,6 +68,28 @@ function Check(f) {
    <div id="bd">
 	<div id="yui-main">
 	<div class="yui-b">
+	
+<!-- TMPL_IF NAME="else" --><div id="toolbar">
+	<script type="text/javascript">
+	//<![CDATA[
+
+	// prepare DOM for YUI Toolbar
+
+	 $(document).ready(function() {
+	    yuiToolbar();
+	 });
+
+	// YUI Toolbar Functions
+
+	function yuiToolbar() {
+	    new YAHOO.widget.Button("newframework");
+	}
+
+	//]]>
+	</script>
+	<ul class="toolbar">
+	<li><a id="newframework" href="/cgi-bin/koha/admin/biblio_framework.pl?op=add_form">New Framework</a></li>
+</ul></div><!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="add_form" -->
     <h1><!-- TMPL_IF NAME="frameworkcode" -->Modify framework text<!-- TMPL_ELSE -->Add framework<!-- /TMPL_IF --></h1>
@@ -81,7 +103,7 @@ function Check(f) {
         <!-- /TMPL_IF -->
         <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>
+        <fieldset class="action">	<input type="submit" value="Submit" class="submit" onclick="Check(this.form)" /></fieldset>
     </form>
 <!-- /TMPL_IF -->
 
@@ -124,11 +146,7 @@ function Check(f) {
         </tr>
     <!-- /TMPL_LOOP -->
 </table>
-<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-    <input type="hidden" name="op" value="add_form" />
-    <input type="submit" value="Add framework" />
     <!-- 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 -->
 </div>
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 b4852aff1d..1597843469 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, &amp; Agency categories<!-- /TMPL_IF --></title>
+<title>Koha &rsaquo; Administration &rsaquo; <!-- TMPL_IF NAME="editcategory" --><!-- TMPL_IF NAME="categorycode" -->Edit Agency Category <!-- TMPL_VAR NAME="categorycode" --><!-- TMPL_ELSE -->New 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" -->New 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,11 +9,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;  
 
-<!-- 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="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 -->New 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, &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="heading-branches-add-branch-p" -->New 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, &amp; Agency Categories</a> &rsaquo; Confirm deletion of library '<!-- TMPL_VAR NAME="branchcode" -->'<!-- /TMPL_IF -->
 
@@ -26,7 +26,7 @@
    <div id="bd">
 	<div id="yui-main">
 	<div class="yui-b">
-	
+	<!-- TMPL_IF name="else" -->
 	<div id="toolbar">
 	<script type="text/javascript">
 	//<![CDATA[
@@ -50,9 +50,10 @@
 	<li><a id="newbranch" href="/cgi-bin/koha/admin/branches.pl?op=add">New Library</a></li>
 	<li><a id="newcategory" href="/cgi-bin/koha/admin/branches.pl?op=editcategory">New Agency Category</a></li>
 </ul></div>
+<!-- /TMPL_IF -->
 
 <!-- TMPL_IF name="add" -->
-  <h3><!-- TMPL_IF name="heading-branches-add-branch-p" -->Add library<!-- TMPL_ELSE -->Modify library<!-- /TMPL_IF --></h3>
+  <h3><!-- TMPL_IF name="heading-branches-add-branch-p" -->New 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" />
@@ -108,16 +109,12 @@
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF name="delete_confirm" -->
-    <h3>Confirm deletion of <!-- TMPL_VAR NAME="branchname" --> (<!-- TMPL_VAR NAME="branchcode" -->)?</h3>
-    <span class="form"><form action="<!-- TMPL_VAR name="action" -->" method="post">
-        <input type="hidden" name="op" value="delete_confirmed" />
+    <form action="<!-- TMPL_VAR name="action" -->" method="post">
+<fieldset><legend>Confirm deletion of <!-- TMPL_VAR NAME="branchname" --> (<!-- TMPL_VAR NAME="branchcode" -->)?</legend><input type="hidden" name="op" value="delete_confirmed" />
         <input type="hidden" name="branchcode" value="<!-- TMPL_VAR name="branchcode" escape="HTML" -->" />
-            <input type="hidden" name="branchname" value="<!-- TMPL_VAR NAME="branchname" escape="HTML" -->">
-        <input type="submit" value="Delete Library" />
-    </form> 
-    <form action="<!-- TMPL_VAR name="action" -->" method="post"><input type="hidden" name="op" value="">
-        <input type="submit" value="Do Not Delete" />
-    </form></span>
+        <input type="hidden" name="branchname" value="<!-- TMPL_VAR NAME="branchname" escape="HTML" -->">
+        <fieldset class="action"><input type="submit" value="Delete Library" /> <a class="cancel" href="/cgi-bin/koha/admin/branches.pl">Cancel</a></fieldset>
+</fieldset>    </form>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF name="else" -->
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 6cb4bf0260..a39b06ba2e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<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 -->
+<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 -->New category<!-- /TMPL_IF --><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="add_validate" -->Data recorded<!-- /TMPL_IF -->
 <!-- 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>
@@ -73,7 +73,7 @@
 <!-- TMPL_INCLUDE NAME="header.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" --> <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 -->
+<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 -->New 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 -->
@@ -96,21 +96,21 @@
 <!-- TMPL_IF NAME="categorycode" -->
 		<h1>Modify category <!-- TMPL_VAR NAME="categorycode" --></h1>
 	<!-- TMPL_ELSE -->
-		<h1>Add category</h1>
+		<h1>New category</h1>
 	<!-- /TMPL_IF -->
 	<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 -->
-	<li><label for="categorycode">Category code</label><input type="text" name="categorycode" id="categorycode" size="10" maxlength="10" onblur="toUC(this)" /></li>
+	<li><label for="categorycode">Category code: </label> &nbsp; <input type="text" name="categorycode" id="categorycode" size="10" maxlength="10" onblur="toUC(this)" /></li>
 	<!-- /TMPL_IF -->
-	<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">
+	<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,8 +119,8 @@
 						<option value="1">Yes</option>
 			<!-- /TMPL_IF -->
 					</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">
+	<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> &nbsp; <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 -->
@@ -130,7 +130,7 @@
 	</li></ol>
 </fieldset>
 
-	<p>				<input type="submit" value="<!-- TMPL_IF NAME="categorycode" -->Update Category<!-- TMPL_ELSE -->Add Category<!-- /TMPL_IF -->" onclick="Check(this.form);" /> </p>
+	<fieldset class="action"><input type="submit" value="Save" onclick="Check(this.form);" /> </fieldset>
 	</form>
 
 <!-- /TMPL_IF -->
@@ -145,26 +145,28 @@
 
 <!-- TMPL_IF NAME="delete_confirm" -->
 	
-        	
-	<!-- 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 -->
-	<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>
+    	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+	<fieldset><legend>    	
+	<!-- TMPL_IF NAME="totalgtzero" -->
+	Cagegory <!-- TMPL_VAR NAME="categorycode" --> is in use.  Deletion not possible!<!-- TMPL_ELSE -->
+Confirm Deletion of Category <!-- TMPL_VAR NAME="categorycode" --><!-- /TMPL_IF --></legend>
+<!-- TMPL_IF NAME="totalgtzero" --><div class="error">This category is used <!-- TMPL_VAR NAME="total" --> times. Deletion not possible</div><!-- /TMPL_IF -->
+	<table>
+	<tr><th scope="row">Category code: </th><td><!-- TMPL_VAR NAME="categorycode" --></td></tr>
+	<tr><th scope="row">Description: </th><td><!-- TMPL_VAR NAME="description" --></td></tr>
+	<tr><th scope="row">Enrolment period: </th><td><!-- TMPL_VAR NAME="enrolmentperiod" --> months</td></tr>
+	<tr><th scope="row">Age Required: </th><td><!-- TMPL_VAR NAME="dateofbirthrequired" --> years</td></tr>
+	<tr><th scope="row">Upperage limit: </th><td><!-- TMPL_VAR NAME="upperagelimit" --> years</td></tr>
+	<tr><th scope="row">Enrolment fee: </th><td>$<!-- TMPL_VAR NAME="enrolmentfee" --></td></tr>
+	<tr><th scope="row">Overdue notice required: </th><td><!-- TMPL_IF NAME="overduenoticerequired" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td></tr>
+	<tr><th scope="row">Reserve fee: </th><td>$<!-- TMPL_VAR NAME="reservefee" --></td></tr>
+</table>
+		<fieldset class="action"><!-- TMPL_IF NAME="totalgtzero" -->
+<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 --></div>
+			<input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->" /> <input type="submit" value="Delete this Category" /> <a class="cancel" href="/cgi-bin/koha/admin/categorie.pl">Cancel</a> 
+		<!-- /TMPL_IF --></fieldset></fieldset></form>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="delete_confirmed" -->
@@ -176,6 +178,29 @@
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="else" -->
+
+<div id="toolbar">
+	<script type="text/javascript">
+	//<![CDATA[
+
+	// prepare DOM for YUI Toolbar
+
+	 $(document).ready(function() {
+	    yuiToolbar();
+	 });
+
+	// YUI Toolbar Functions
+
+	function yuiToolbar() {
+	    new YAHOO.widget.Button("newcategory");
+	}
+
+	//]]>
+	</script>
+	<ul class="toolbar">
+	<li><a id="newcategory" href="/cgi-bin/koha/admin/categorie.pl?op=add_form">New Category</a></li>
+</ul></div>
+
 <h2>Patron Category Administration</h2>
 <!-- TMPL_IF NAME="searchfield" -->
 		You Searched for <!-- TMPL_VAR NAME="searchfield" --></span>
@@ -216,10 +241,7 @@
 						<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">
-		<input type="hidden" name="op" value="add_form" />
-		<input type="submit" value="Add Category" />
-	</form>
+	</table>
 <!-- /TMPL_IF -->
 
 </div>
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 e673f9128a..040b999fce 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Administration &rsaquo; <!-- TMPL_IF NAME="add_form" -->Cities &rsaquo; <!-- TMPL_IF NAME="cityid" --> Modify City<!-- TMPL_ELSE --> Add City<!-- /TMPL_IF --><!-- TMPL_ELSE --><!-- TMPL_IF NAME="delete_confirm" -->Cities &rsaquo; Confirm Deletion of City<!-- TMPL_ELSE --> Cities<!-- /TMPL_IF --><!-- /TMPL_IF --></title>
+<title>Koha &rsaquo; Administration &rsaquo; <!-- TMPL_IF NAME="add_form" -->Cities &rsaquo; <!-- TMPL_IF NAME="cityid" --> Modify City<!-- TMPL_ELSE --> New City<!-- /TMPL_IF --><!-- TMPL_ELSE --><!-- TMPL_IF NAME="delete_confirm" -->Cities &rsaquo; Confirm Deletion of City<!-- TMPL_ELSE --> Cities<!-- /TMPL_IF --><!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script type="text/javascript">
 //<![CDATA[
@@ -54,7 +54,7 @@
 <!-- TMPL_INCLUDE NAME="header.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>
+<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 --> New 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>
 
 <div id="doc3" class="yui-t2">
    
@@ -66,7 +66,7 @@
 	<!-- TMPL_IF NAME="cityid" -->
 		<h1>Modify a city</h1>
 	<!-- TMPL_ELSE -->
-		<h1>Add a city</h1>
+		<h1>New city</h1>
 	<!-- /TMPL_IF -->
 
 	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
@@ -76,20 +76,20 @@
 
 <fieldset class="rows"><ol>	<!-- TMPL_IF NAME="cityid" -->
 		<li>
-		<span class="label">City ID</span><!-- TMPL_VAR NAME="cityid" --></li>
+		<span class="label">City ID: </span><!-- TMPL_VAR NAME="cityid" --></li>
 	<!-- /TMPL_IF -->
 	<li>
-	<label for="city_name">City name</label>
+	<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>
+	<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="Submit" />
-	</p>
+	<fieldset class="action">
+		<input class="button" type="button" onclick="Check(this.form)" value="Submit" /> <a class="cancel" href="/cgi-bin/koha/admin/cities.pl">Cancel</a>
+	</fieldset>
 	</form>
 
 <!-- /TMPL_IF -->
@@ -137,6 +137,29 @@
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="else" -->
+
+<div id="toolbar">
+	<script type="text/javascript">
+	//<![CDATA[
+
+	// prepare DOM for YUI Toolbar
+
+	 $(document).ready(function() {
+	    yuiToolbar();
+	 });
+
+	// YUI Toolbar Functions
+
+	function yuiToolbar() {
+	    new YAHOO.widget.Button("newcity");
+	}
+
+	//]]>
+	</script>
+	<ul class="toolbar">
+	<li><a id="newcity" href="/cgi-bin/koha/admin/cities.pl?op=add_form">New City</a></li>
+</ul></div>
+
 	<h2>Cities</h2>
 	<!-- TMPL_IF NAME="searchfield" -->
 		Searching: <!-- TMPL_VAR NAME="searchfield" -->
@@ -166,11 +189,6 @@
 		</tr>
 		<!-- /TMPL_LOOP -->
 	</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>
-	</form>
 <!-- /TMPL_IF -->
 
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tmpl
index 5a6b1bcfd2..457175d47e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tmpl
@@ -82,12 +82,12 @@ function CheckRuleForm(f) {
 
 //]]>
 </script>
-
+</head>
 <body>
 <!-- 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; Classification Sources
+<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="display_lists" -->Classification Sources<!-- TMPL_ELSE --><a href="/cgi-bin/koha/admin/classsources.pl">Classification Sources</a><!-- /TMPL_IF -->
 <!-- TMPL_IF name="class_source_form" -->
   <!-- TMPL_IF name="edit_class_source" -->
     &rsaquo; Modify classification source
@@ -129,23 +129,25 @@ function CheckRuleForm(f) {
   <input type="hidden" name="op" value="<!-- TMPL_VAR name="confirm_op"-->" />
   <fieldset class="rows">
     <ol>
-      <li><span class="label">Classification source code</span>
+      <li>
           <!-- TMPL_IF name="edit_class_source" -->
+		  <span class="label">Classification source code: </span>
             <input type="hidden" name="class_source" value="<!-- TMPL_VAR name="class_source" -->" />
             <!-- TMPL_VAR name="class_source" -->
           <!-- TMPL_ELSE -->
+		  <label for="class_source">Classification source code: </label>
             <input type="text" id="class_source" name="class_source"  size="10" maxlength="10" />
           <!-- /TMPL_IF -->
        </li>
-       <li><span class="label">Description</span>
+       <li><label for="description">Description: </label>
            <input type="text" id="description" name="description" size="50" maxlength="250" 
                   value="<!-- TMPL_VAR name="description" escape="HTML" -->" />
        </li>
-       <li><span class="label">Source in use?</span>
-           <input type="checkbox" id="used" name="used" value="used" 
-                  <!-- TMPL_IF name="used" -->checked="yes"<!-- /TMPL_IF--> />
+       <li><label for="used">Source in use?</label>
+           <!-- TMPL_IF NAME="used" --><input type="checkbox" id="used" name="used" value="used" checked="checked" /><!-- TMPL_ELSE -->
+		  <input type="checkbox" id="used" name="used" value="used" /><!-- /TMPL_IF -->
        </li>
-       <li><span class="label">Filing Rule</span>
+       <li><label for="sort_rule">Filing Rule: </label>
            <select id="sort_rule" name="sort_rule">
            <!-- TMPL_LOOP name="rules_dropdown" -->
              <!-- TMPL_IF name="selected" -->
@@ -158,16 +160,16 @@ function CheckRuleForm(f) {
        </li>    
     </ol>
   </fieldset>
-  <p id="action">
+  <fieldset class="action">
     <!-- TMPL_IF name="edit_class_source" -->
-    <input type="button" value="Save Changes"
+    <input type="button" value="Save"
            onclick="CheckSourceForm(this.form)" />
     <!-- TMPL_ELSE -->
-    <input type="button" value="Add Classification Source"
+    <input type="button" value="Save"
            onclick="CheckSourceForm(this.form)" />
     <!-- /TMPL_IF-->
-    <input type="button" value="Cancel" onclick="DoCancel(this.form)" />
-  </p>
+    <a class="cancel" href="/cgi-bin/koha/admin/classsources.pl">Cancel</a>
+  </fieldset>
 </form>
 <!-- /TMPL_IF -->
 
@@ -181,19 +183,21 @@ function CheckRuleForm(f) {
   <input type="hidden" name="op" value="<!-- TMPL_VAR name="confirm_op"-->" />
   <fieldset class="rows">
     <ol>
-      <li><span class="label">Filing rule code</span>
+      <li>
           <!-- TMPL_IF name="edit_sort_rule" -->
+		  <span class="label">Filing rule code: </span>
             <input type="hidden" name="sort_rule" value="<!-- TMPL_VAR name="sort_rule" -->" />
             <!-- TMPL_VAR name="sort_rule" -->
           <!-- TMPL_ELSE -->
+		  <label for="sort_rule">Filing rule code: </label>
             <input type="text" id="sort_rule" name="sort_rule"  size="10" maxlength="10" />
           <!-- /TMPL_IF -->
        </li>
-       <li><span class="label">Description</span>
+       <li><label for="description">Description: </label>
            <input type="text" id="description" name="description" size="50" maxlength="250" 
                   value="<!-- TMPL_VAR name="description" escape="HTML" -->" />
        </li>
-       <li><span class="label">Filing Routine</span>
+       <li><label for="sort_routine">Filing Routine: </label>
            <select id="sort_routine" name="sort_routine">
            <!-- TMPL_LOOP name="routines_dropdown" -->
              <!-- TMPL_IF name="selected" -->
@@ -206,15 +210,15 @@ function CheckRuleForm(f) {
        </li>
     </ol>
   </fieldset>
-  <p id="action">
+  <fieldset class="action">
   <!-- TMPL_IF name="edit_sort_rule" -->
-        <input type="button" value="Save Changes"
+        <input type="button" value="Save"
            onclick="CheckRuleForm(this.form)" />
     <!-- TMPL_ELSE -->
-        <input type="button" value="Add Filing Rule"
+        <input type="button" value="Save"
            onclick="CheckRuleForm(this.form)" />    <!-- /TMPL_IF-->
-    <input type="button" value="Cancel" onclick="DoCancel(this.form)" />
-  </p>
+    	<a class="cancel" href="/cgi-bin/koha/admin/classsources.pl">Cancel</a>
+  </fieldset>
 </form>
 <!-- /TMPL_IF -->
 
@@ -256,6 +260,25 @@ remove it from all classification source definitions before trying again.
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF name="display_lists" -->
+
+<div id="toolbar">
+	<script type="text/javascript">
+	//<![CDATA[
+	// prepare DOM for YUI Toolbar
+	 $(document).ready(function() {
+	    yuiToolbar();
+	 });
+	// YUI Toolbar Functions
+	function yuiToolbar() {
+	    new YAHOO.widget.Button("newsource");
+	    new YAHOO.widget.Button("newrule");
+	}	//]]>
+	</script>
+	<ul class="toolbar">
+	<li><a id="newsource" href="<!-- TMPL_VAR name="script_name" -->?op=add_source">New Classification Source</a></li>
+	<li><a id="newrule" href="<!-- TMPL_VAR name="script_name" -->?op=add_sort_rule">New Filing Rules</a></li>
+</ul></div>
+
 <h2>Classification Sources</h2>
 <!-- TMPL_IF name="added_source" -->
 <span class="problem">Added classification source <!-- TMPL_VAR name="added_source" --></span>
@@ -291,8 +314,6 @@ Delete</a>
 
 <div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
 
-<p><a href="<!-- TMPL_VAR name="script_name" -->?op=add_source">Add Classification Source</a></p>
-
 <div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
 <h2>Classification Filing Rules</h2>
 <!-- TMPL_IF name="added_rule" -->
@@ -326,10 +347,6 @@ Delete</a>
 </table>
 <div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
 
-<p><a href="<!-- TMPL_VAR name="script_name" -->?op=add_sort_rule">Add Filing Rule</a></p>
-
-
-
 <!-- /TMPL_IF -->
 
 </div>
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 7dab37cbbe..a61390f688 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; 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_form" --><!-- TMPL_IF NAME="searchfield" -->Modify Currency '<!-- TMPL_VAR NAME="searchfield" -->'<!-- TMPL_ELSE -->New 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;  <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 -->
+<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 -->New 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 -->
@@ -84,20 +84,14 @@
 <div id="toolbar">
 	<script type="text/javascript">
 	//<![CDATA[
-
 	// prepare DOM for YUI Toolbar
-
 	 $(document).ready(function() {
 	    yuiToolbar();
 	 });
-
 	// YUI Toolbar Functions
-
 	function yuiToolbar() {
 	    new YAHOO.widget.Button("newcurrency");
-	}
-
-	//]]>
+	}	//]]>
 	</script>
 	<ul class="toolbar">
 	<li><a id="newcurrency" href="/cgi-bin/koha/admin/currency.pl?op=add_form">New Currency</a></li>
@@ -114,7 +108,7 @@
 	<legend><!-- TMPL_IF NAME="searchfield" -->
 		Modify currency
 	<!-- TMPL_ELSE -->
-		Add currency
+		New currency
 	<!-- /TMPL_IF --></legend>
 	<ol><!-- TMPL_IF NAME="searchfield" -->
 		<li>
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 c559b3a88e..09b3192385 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/finesrules.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/finesrules.tmpl
@@ -8,7 +8,7 @@
 
 <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="doc" class="yui-t7">
+<div id="doc3">
 
 <div id="bd">
     <div id="yui-main">
@@ -67,7 +67,7 @@
                 </tr>
             <!-- /TMPL_LOOP -->
         </table>
-        <input type="submit" value="Save Changes" />
+        <fieldset class="action"><input type="submit" value="Save Changes" /> <a class="cancel" href="/cgi-bin/koha/admin/admin-home.pl">Cancel</a></fieldset>
     </form>
 
 </div>
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 af6a6dbdf9..659169a8dd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/issuingrules.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/issuingrules.tmpl
@@ -8,7 +8,7 @@
 
 <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="doc" class="yui-t7">
+<div id="doc3">
 
 <div id="bd">
     <div id="yui-main">
@@ -66,7 +66,7 @@
                     </tr>
                 <!-- /TMPL_LOOP -->
             </table>
-            <input type="submit" value="Save Changes" />
+            <fieldset class="action"><input type="submit" value="Save Changes" /> <a class="cancel" href="/cgi-bin/koha/admin/admin-home.pl">Cancel</a></fieldset>
         </form>
 
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl
index 0b7ce2c80e..a71b26dc1f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl
@@ -185,17 +185,16 @@ function displayMoreConstraint(numlayer){
 </tr>
 <!-- /TMPL_LOOP -->
 </table>
+
 <form action="<!-- TMPL_VAR NAME="script_name" -->" method="get">
-    <input type="hidden" name="op" value="add_form" />
+    <fieldset class="action"><input type="hidden" name="op" value="add_form" />
     <input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="edit_tagfield" -->" />
     <input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="edit_frameworkcode" -->" />
     <input type="submit" value="Edit Subfields" />
+	<a class="cancel" href="marctagstructure.pl?searchfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">Cancel</a>
+	</fieldset>
 </form>
-<form action="marctagstructure.pl" method="get">
-    <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="tagfield" -->" />
-    <input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
-    <input type="submit" value="Return to Marc Structure" />
-</form>
+
 <!-- TMPL_IF NAME="previous" -->
     <input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="previous" alt="previous" border="0" />
 <!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl
index 69ae11bacb..bc40a56f5b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl
@@ -73,8 +73,29 @@
 	<div id="yui-main">
 	<div class="yui-b">
 
-<h1>MARC Framework for <!-- TMPL_IF NAME="frameworkcode" --><!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)<!-- TMPL_ELSE -->default MARC framework<!-- /TMPL_IF --></h1>
+<!-- TMPL_IF NAME="else" --><div id="toolbar">
+	<script type="text/javascript">
+	//<![CDATA[
 
+	// prepare DOM for YUI Toolbar
+
+	 $(document).ready(function() {
+	    yuiToolbar();
+	 });
+
+	// YUI Toolbar Functions
+
+	function yuiToolbar() {
+	    new YAHOO.widget.Button("addtag");
+	}
+
+	//]]>
+	</script>
+	<ul class="toolbar">
+	<li><a id="addtag" href="/cgi-bin/koha/admin/marctagstructure.pl?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="searchfield"-->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">New Tag</a></li>
+</ul></div><!-- /TMPL_IF -->
+
+<h1>MARC Framework for <!-- TMPL_IF NAME="frameworkcode" --><!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)<!-- TMPL_ELSE -->default MARC framework<!-- /TMPL_IF --></h1>
 
 <!-- TMPL_IF NAME="add_form" -->
 
@@ -83,16 +104,17 @@
       <fieldset class="rows"><legend><!-- TMPL_IF NAME="use-heading-flags-p" --><!-- TMPL_IF NAME="heading-modify-tag-p" -->Modify tag <input type="hidden" name="modif" value="1" /><!-- TMPL_VAR NAME="searchfield" --><!-- /TMPL_IF --><!-- TMPL_IF NAME="heading-add-tag-p" -->Add tag<!-- /TMPL_IF --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF --></legend>  <input type="hidden" name="op" value="add_validate" />
 	<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
 
-	<ol> <li><label for="tagfield">Tag</label><input id="tagfield" type="text" name="tagfield" value="<!-- TMPL_VAR NAME="searchfield" -->" maxlength="3" size="3" /></li>    
-    <li><label for="liblibrarian">Label for lib</label><input type="text" id="liblibrarian" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" ESCAPE="HTML" -->" size="40" maxlength="100" /></li>
-    <li><label for="libopac">Label for opac</label><input type="text" id="libopac" name="libopac" value="<!-- TMPL_VAR NAME="libopac" ESCAPE="HTML" -->" size="40" maxlength="100" /></li>
-    <li><label for="repeatable">Repeatable</label><!-- TMPL_VAR NAME="repeatable" -->&nbsp;</li>
-    <li><label for="mandatory">Mandatory</label><!-- TMPL_VAR NAME="mandatory" -->&nbsp;</li>
-    <li><label for="authorised_value">Authorized value</label><!-- TMPL_VAR NAME="authorised_value" --> (if you select a value here, the indicators will be limited to the authorised value list)</li>
-        <li>
+	<ol> <li><label for="tagfield">Tag: </label><input id="tagfield" type="text" name="tagfield" value="<!-- TMPL_VAR NAME="searchfield" -->" maxlength="3" size="3" /></li>    
+    <li><label for="liblibrarian">Label for lib: </label><input type="text" id="liblibrarian" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" ESCAPE="HTML" -->" size="40" maxlength="100" /></li>
+    <li><label for="libopac">Label for opac: </label><input type="text" id="libopac" name="libopac" value="<!-- TMPL_VAR NAME="libopac" ESCAPE="HTML" -->" size="40" maxlength="100" /></li>
+    <li><label for="repeatable">Repeatable: </label><!-- TMPL_VAR NAME="repeatable" --></li>
+    <li><label for="mandatory">Mandatory: </label><!-- TMPL_VAR NAME="mandatory" --></li>
+    <li><label for="authorised_value">Authorized 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> 
+	<fieldset class="action">
             <input type="submit" value="Save Changes" onclick="Check(this.form)" />
-            <input type="submit" value="Cancel and Return to MARC Frameworks" onclick="location.href='<!-- TMPL_VAR NAME="script_name" -->?frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->'; return false;" />
-        </li></ol></fieldset>
+            <a class="cancel" href="<!-- TMPL_VAR NAME="script_name" -->?frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">Cancel</a>
+	</fieldset>
     </form>
 <!-- /TMPL_IF -->
 
@@ -219,12 +241,7 @@
     <!-- TMPL_IF NAME="isprevpage" -->
             <a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" --><!--TMPL_IF Name="select_display"-->&amp;select_display=True<!--/TMPL_IF -->">&lt;&lt; Previous</a>
         <!-- /TMPL_IF -->
-    <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="searchfield"-->" />
-    	<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
-        <input type="submit" value="Add Tag" />
-    </form>
+
         <!-- TMPL_IF NAME="nextpage" -->
             <a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" --><!--TMPL_IF Name="select_display"-->&amp;select_display=True<!--/TMPL_IF -->">Next &gt;&gt;</a>
         <!-- /TMPL_IF -->
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 e0a1b4f703..dc75a84a20 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.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" --> Printers &rsaquo; Modify printer '<!-- TMPL_VAR NAME="searchfield" -->'<!-- TMPL_ELSE --> Printers &rsaquo; Add printer<!-- /TMPL_IF --><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="searchfield" --> Printers &rsaquo; Modify printer '<!-- TMPL_VAR NAME="searchfield" -->'<!-- TMPL_ELSE --> Printers &rsaquo; New printer<!-- /TMPL_IF --><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="add_validate" --> Printers &rsaquo; Printer Added<!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="delete_confirm" --> Printers &rsaquo; Confirm Deletion of Printer '<!-- TMPL_VAR NAME="searchfield" -->'<!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="delete_confirmed" --> Printers &rsaquo; Printer Deleted<!-- /TMPL_IF -->
@@ -67,7 +67,7 @@
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="printers-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" --> <a href="/cgi-bin/koha/admin/printers.pl">Printers</a> &rsaquo; Modify printer '<!-- TMPL_VAR NAME="searchfield" -->'<!-- TMPL_ELSE --> <a href="/cgi-bin/koha/admin/printers.pl">Printers</a> &rsaquo; Add printer<!-- /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; <!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="searchfield" --> <a href="/cgi-bin/koha/admin/printers.pl">Printers</a> &rsaquo; Modify printer '<!-- TMPL_VAR NAME="searchfield" -->'<!-- TMPL_ELSE --> <a href="/cgi-bin/koha/admin/printers.pl">Printers</a> &rsaquo; New printer<!-- /TMPL_IF --><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="add_validate" --> <a href="/cgi-bin/koha/admin/printers.pl">Printers</a> &rsaquo; Printer Added<!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="delete_confirm" --> <a href="/cgi-bin/koha/admin/printers.pl">Printers</a> &rsaquo; Confirm Deletion of Printer '<!-- TMPL_VAR NAME="searchfield" -->'<!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="delete_confirmed" --> <a href="/cgi-bin/koha/admin/printers.pl">Printers</a> &rsaquo; Printer Deleted<!-- /TMPL_IF -->
@@ -87,7 +87,7 @@
 <!-- TMPL_IF NAME="searchfield" -->
 		<h1>Modify printer</h1>
 	<!-- TMPL_ELSE -->
-		<h1>Add printer</h1>
+		<h1>New printer</h1>
 	<!-- /TMPL_IF -->
         <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
         <input type="hidden" name="op" value="add_validate" />
@@ -116,7 +116,8 @@
 			<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>
+        </fieldset>
+		<fieldset class="action"><input type="submit" value="Submit" onclick="Check(this.form);" /> <a class="cancel" href="/cgi-bin/koha/admin/printers.pl">Cancel</a></fieldset>
         </form>
 
 <!-- /TMPL_IF -->
@@ -124,7 +125,7 @@
 <!-- TMPL_IF NAME="add_validate" -->
 <h3>Printer Added</h3>
 <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-        <input type="submit" value="OK" />
+       <fieldset class="action"> <input type="submit" value="OK" /></fieldset>
 </form>
 <!-- /TMPL_IF -->
 
@@ -156,12 +157,29 @@
 <!-- TMPL_IF NAME="delete_confirmed" -->
 <h3>Printer Deleted</h3>
 <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-		<input type="submit" value="Ok" />
+		<fieldset class="action"><input type="submit" value="Ok" /></fieldset>
 </form>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="else" -->
-<h2>Printer Administration</h2>
+
+<div id="toolbar">
+	<script type="text/javascript">
+	//<![CDATA[
+	// prepare DOM for YUI Toolbar
+	 $(document).ready(function() {
+	    yuiToolbar();
+	 });
+	// YUI Toolbar Functions
+	function yuiToolbar() {
+	    new YAHOO.widget.Button("newprinter");
+	}	//]]>
+	</script>
+	<ul class="toolbar">
+	<li><a id="newprinter" href="/cgi-bin/koha/admin/printers.pl?op=add_form">New Printer</a></li>
+</ul></div>
+
+<h2>Printers</h2>
 	<!-- TMPL_IF NAME="searchfield" -->
 		You searched for <!-- TMPL_VAR NAME="searchfield" --></span>
 	<!-- /TMPL_IF -->
@@ -182,8 +200,7 @@
 		</tr>
 		<!-- /TMPL_LOOP -->
 	</table><!-- TMPL_ELSE --><div class="notice">No printers defined.</div><!-- /TMPL_IF -->
-<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-       <p> <input type="hidden" name="op" value="add_form" /><input type="submit" value="Add Printer" /></p></form>
+
 	<!-- TMPL_IF NAME="offsetgtzero" -->
 		<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->">&lt;&lt; Prev</a>
 	<!-- /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 d2099f6383..04deafeb93 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Administration &rsaquo; <!-- TMPL_IF NAME="add_form" -->Road Types &rsaquo; <!-- TMPL_IF NAME="roadtypeid" --> Modify Road Type<!-- TMPL_ELSE --> Add Road Type<!-- /TMPL_IF --><!-- TMPL_ELSE --><!-- TMPL_IF NAME="delete_confirm" -->Road Types &rsaquo; Confirm Deletion of Road Type<!-- TMPL_ELSE --> Road Type<!-- /TMPL_IF --><!-- /TMPL_IF --></title>
+<title>Koha &rsaquo; Administration &rsaquo; <!-- TMPL_IF NAME="add_form" -->Road Types &rsaquo; <!-- TMPL_IF NAME="roadtypeid" --> Modify Road Type<!-- TMPL_ELSE --> New Road Type<!-- /TMPL_IF --><!-- TMPL_ELSE --><!-- TMPL_IF NAME="delete_confirm" -->Road Types &rsaquo; Confirm Deletion of Road Type<!-- TMPL_ELSE --> Road Type<!-- /TMPL_IF --><!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script type="text/javascript">
 //<![CDATA[
@@ -53,7 +53,7 @@
 <body>
 <!-- TMPL_INCLUDE NAME="header.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="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 --> New 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">
    
@@ -65,7 +65,7 @@
 	<!-- TMPL_IF NAME="roadtypeid" -->
 		<h1>Modify road type</h1>
 	<!-- TMPL_ELSE -->
-		<h1>Add road type</h1>
+		<h1>New road type</h1>
 	<!-- /TMPL_IF -->
 
 	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
@@ -84,9 +84,9 @@
 	<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" />	
-	</p>
+	<fieldset class="action">					  
+	<input class="button" type="button" onclick="Check(this.form)" value="Submit" />	<a class="cancel" href="/cgi-bin/koha/admin/roadtype.pl">Cancel</a>
+	</fieldset>
 	</form>
 <!-- /TMPL_IF -->
 
@@ -109,6 +109,29 @@
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="else" -->
+
+<div id="toolbar">
+	<script type="text/javascript">
+	//<![CDATA[
+
+	// prepare DOM for YUI Toolbar
+
+	 $(document).ready(function() {
+	    yuiToolbar();
+	 });
+
+	// YUI Toolbar Functions
+
+	function yuiToolbar() {
+	    new YAHOO.widget.Button("addroad");
+	}
+
+	//]]>
+	</script>
+	<ul class="toolbar">
+	<li><a id="addroad" href="/cgi-bin/koha/admin/roadtype.pl?op=add_form">New Road Type</a></li>
+</ul></div>
+
 	<h2>Road type</h2>
 	<!-- TMPL_IF NAME="searchfield" -->
 		Search on  <!-- TMPL_VAR NAME="searchfield" -->
@@ -131,11 +154,6 @@
 		</tr>
 		<!-- /TMPL_LOOP -->
 	</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>
-	</form>
 <!-- /TMPL_IF -->
 
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tmpl
index f0e574308f..642aa7b8d5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tmpl
@@ -1,8 +1,9 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; System Administration &rsaquo; <!-- TMPL_IF NAME="else" -->Stop Words<!-- /TMPL_IF --><!-- TMPL_IF NAME="add_form" --> Stop Words &rsaquo; <!-- TMPL_IF NAME="searchfield" -->Modify Stop Word<!-- TMPL_ELSE -->Add Stop Word<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF NAME="add_validate" --> Stop Words &rsaquo; Data recorded<!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirm" --> Stop Words &rsaquo; Delete Stop Word '<!-- TMPL_VAR NAME="searchfield" -->' ?<!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirmed" --> Stop Words &rsaquo; Data deleted<!-- /TMPL_IF --></title>
+<title>Koha &rsaquo; System Administration &rsaquo; <!-- TMPL_IF NAME="else" -->Stop Words<!-- /TMPL_IF --><!-- TMPL_IF NAME="add_form" --> Stop Words &rsaquo; <!-- TMPL_IF NAME="searchfield" -->Modify Stop Word<!-- TMPL_ELSE -->New Stop Word<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF NAME="add_validate" --> Stop Words &rsaquo; Data recorded<!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirm" --> Stop Words &rsaquo; Delete Stop Word '<!-- TMPL_VAR NAME="searchfield" -->' ?<!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirmed" --> Stop Words &rsaquo; Data deleted<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_IF NAME="add_form" -->
         <script language="javascript" type="text/javascript">
+		//<![CDATA[
             /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             function isNotNull(f,noalert) {
                 if (f.value.length ==0) {
@@ -50,7 +51,7 @@
                     alertString2 += _alertString;
                     alert(alertString2);
                 }
-            }
+            }  //]]>
         </script>
 	<!-- /TMPL_IF -->
 </head>
@@ -58,7 +59,7 @@
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="stopwords-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" -->Stop Words<!-- /TMPL_IF --><!-- TMPL_IF NAME="add_form" --><a href="/cgi-bin/koha/admin/stopwords.pl">Stop Words</a> &rsaquo; <!-- TMPL_IF NAME="searchfield" -->Modify Stop Word<!-- TMPL_ELSE -->Add Stop Word<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF NAME="add_validate" --> <a href="/cgi-bin/koha/admin/stopwords.pl">Stop Words</a> &rsaquo; Data recorded<!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirm" --> <a href="/cgi-bin/koha/admin/stopwords.pl">Stop Words</a> &rsaquo; Delete Stop Word '<!-- TMPL_VAR NAME="searchfield" -->' ?<!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirmed" --> <a href="/cgi-bin/koha/admin/stopwords.pl">Stop Words</a> &rsaquo; Data deleted<!-- /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="else" -->Stop Words<!-- /TMPL_IF --><!-- TMPL_IF NAME="add_form" --><a href="/cgi-bin/koha/admin/stopwords.pl">Stop Words</a> &rsaquo; <!-- TMPL_IF NAME="searchfield" -->Modify Stop Word<!-- TMPL_ELSE -->New Stop Word<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF NAME="add_validate" --> <a href="/cgi-bin/koha/admin/stopwords.pl">Stop Words</a> &rsaquo; Data recorded<!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirm" --> <a href="/cgi-bin/koha/admin/stopwords.pl">Stop Words</a> &rsaquo; Delete Stop Word '<!-- TMPL_VAR NAME="searchfield" -->' ?<!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirmed" --> <a href="/cgi-bin/koha/admin/stopwords.pl">Stop Words</a> &rsaquo; Data deleted<!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
@@ -71,26 +72,24 @@
         <!-- TMPL_IF NAME="searchfield" -->
             <h1>Modify word</h1>
         <!-- TMPL_ELSE -->
-            <h1>Add word</h1>
+            <h1>New word</h1>
         <!-- /TMPL_IF -->
         <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
-            <input type="hidden" name="op" value="add_validate">
-            <!-- TMPL_IF NAME="searchfield" -->
-                <p>
-                    <label>Word</label>
-                    <label>
-                        <input type="hidden" name="word" value="<!-- TMPL_VAR NAME="searchfield" -->"><!-- TMPL_VAR NAME="searchfield" -->
-                    </label>
-                </p>
+            <input type="hidden" name="op" value="add_validate" />
+         <fieldset class="rows">  <ol> <!-- TMPL_IF NAME="searchfield" -->
+                <li>
+                    <span class="label">Word</span>
+                        <input type="hidden" name="word" value="<!-- TMPL_VAR NAME="searchfield" -->" /><!-- TMPL_VAR NAME="searchfield" -->
+                </li>
             <!-- TMPL_ELSE -->
-                <p>
-                    <label>Word</label>
-                    <input type="text" name="word" size="80" maxlength="250" onblur="toUC(this)">
-                </p>
-            <!-- /TMPL_IF -->
-            <p>
-                <td><input type="button" value="OK" onclick="Check(this.form)" /></td>
-            </p>
+                <li>
+                    <label for="word">Word</label>
+                    <input type="text" name="word" id="word" size="50" maxlength="250" onblur="toUC(this)" />
+                </li>
+            <!-- /TMPL_IF --></ol></fieldset>
+            <fieldset class="action">
+                <input type="button" value="Save" onclick="Check(this.form)" /> <a class="cancel" href="/cgi-bin/koha/admin/stopwords.pl">Cancel</a>
+            </fieldset>
         </form>
 <!-- /TMPL_IF -->
 
@@ -102,14 +101,13 @@
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="delete_confirm" -->
-    <p>CONFIRM DELETION of <!-- TMPL_VAR NAME="searchfield" --></p>
     <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="YES">
-    </form>
-    <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-            <input type="submit" value="NO" />
+	<fieldset>
+        <input type="hidden" name="op" value="delete_confirmed" />
+        <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
+		<legend>Confirm Deletion of Stop word <em><!-- TMPL_VAR NAME="searchfield" --></em></legend>
+        <input type="submit" value="Yes, Delete" /> <a class="cancel" href="/cgi-bin/koha/admin/stopwords.pl">Cancel</a>
+	</fieldset>
     </form>
 <!-- /TMPL_IF -->
 
@@ -121,6 +119,23 @@
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="else" -->
+
+<div id="toolbar">
+	<script type="text/javascript">
+	//<![CDATA[
+	// prepare DOM for YUI Toolbar
+	 $(document).ready(function() {
+	    yuiToolbar();
+	 });
+	// YUI Toolbar Functions
+	function yuiToolbar() {
+	    new YAHOO.widget.Button("newstopword");
+	}	//]]>
+	</script>
+	<ul class="toolbar">
+	<li><a id="newstopword" href="/cgi-bin/koha/admin/stopwords.pl?op=add_form">New Stop Word</a></li>
+</ul></div>
+
     <h1>Stop Words</h1>
     <p class="message">NOTE : if you change something in this table, ask your administrator to run misc/rebuildnonmarc.pl script.</p>
 
@@ -141,16 +156,12 @@
                 </tr>
             <!-- /TMPL_LOOP -->
     </table>
-    <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-            <input type="hidden" name="op" value="add_form">
             <!-- TMPL_IF NAME="offsetgtzero" -->
                 <a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->">&lt;&lt; Prev</a>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF NAME="ltcount" -->
                 <a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->">Next &gt;&gt;</a>
             <!-- /TMPL_iF -->
-            <input type="submit" value="Add Stop word" alt="Add Stop word" />
-    </form>
 <!-- /TMPL_IF -->
 
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tmpl
index a8e9662bda..8e1a413a37 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tmpl
@@ -111,7 +111,7 @@
                     <input type="radio" name="value" value="0" checked="checked" /><!-- TMPL_ELSE --><input type="radio" name="value" value="0" /><!-- /TMPL_IF -->OFF<!-- /TMPL_IF -->
                 </li>
         </ol></fieldset>
-        <fieldset class="action"><input type="submit" value="<!-- TMPL_IF NAME="modify" -->Save Changes<!-- TMPL_ELSE -->Add this Preference<!-- /TMPL_IF -->"> <input type="button"  value="Cancel" onclick="location.href='<!-- TMPL_VAR name="script_name" -->'; return false;" /></fieldset>
+        <fieldset class="action"><input type="submit" value="<!-- TMPL_IF NAME="modify" -->Save Changes<!-- TMPL_ELSE -->Add this Preference<!-- /TMPL_IF -->"> <a class="cancel" href="/cgi-bin/koha/admin/systempreferences.pl">Cancel</a></fieldset>
         
         <fieldset class="brief">
 		<legend>Koha internal</legend>
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 9c8977079a..d5f982a11d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl
@@ -1,6 +1,6 @@
 <!-- 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" --> 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="add_form" --> z39.50 Servers &rsaquo; <!-- TMPL_IF NAME="searchfield" -->Modify z39.50 Server <!-- TMPL_VAR NAME="searchfield" --><!-- TMPL_ELSE -->New 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>
@@ -45,34 +45,22 @@
                 var ok=1;
                 var _alertString="";
                 var alertString2;
-                if (f.searchfield.value.length==0) {
-                        _alertString += "- site name missing\n";
+                if (f.searchfield.value.length==0) {_alertString += "- site name missing\n";
                 }
-                if (f.host.value.length==0) {
-                        _alertString += "- host missing\n";
+                if (f.host.value.length==0) {_alertString += "- host missing\n";
                 }
-                if (f.port.value.length==0) {
-                        _alertString += "- port missing\n";
+                if (f.port.value.length==0) {_alertString += "- port missing\n";
                 }
-                if (f.db.value.length==0) {
-                        _alertString += "- database missing\n";
+                if (f.db.value.length==0) {_alertString += "- database missing\n";
                 }
-                if (isNaN(f.port.value)) {
-                        _alertString += "- port must be a number\n";
+                if (isNaN(f.port.value)) {_alertString += "- port must be a number\n";
                 }
-                if (isNaN(f.rank.value)) {
-                        _alertString += "- rank must be a number\n";
+                if (isNaN(f.rank.value)) {_alertString += "- rank must be a number\n";
                 }
-                if (isNaN(f.checked.value) || f.checked.value<0 || f.checked.value>1) {
-                        _alertString += "- checked must be 0 or 1\n";
+                if (isNaN(f.checked.value) || f.checked.value<0 || f.checked.value>1) {_alertString += "- checked must be 0 or 1\n";
                 }
-                if (_alertString.length==0) {
-                        document.Aform.submit();
-                } else {
-                        alertString2 = "Form not submitted because of the following problem(s)\n";
-                        alertString2 += "------------------------------------------------------------------------------------\n\n";
-                        alertString2 += _alertString;
-                        alert(alertString2);
+                if (_alertString.length==0) {document.Aform.submit();
+                } else {alertString2 = "Form not submitted because of the following problem(s)\n";alertString2 += "------------------------------------------------------------------------------------\n\n";alertString2 += _alertString;alert(alertString2);
                 }
         }
         //]]>
@@ -84,7 +72,7 @@
 <!-- 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" --> <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="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 -->New 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>
@@ -96,84 +84,38 @@
 	<div class="yui-b">
 
 <!-- TMPL_IF NAME="add_form" -->
-        
-
        
         <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
         <input type="hidden" name="op" value="add_validate" />
 <!-- TMPL_IF NAME="searchfield" -->
                 <h1>Modify Z39.50 Server</h1>
         <!-- TMPL_ELSE -->
-                <h1>Add Z39.50 Server</h1>
+                <h1>New Z39.50 Server</h1>
         <!-- /TMPL_IF -->                
         <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" -->
-                        
-                </li>
+                <li><span class="label">Z39.50 Server: </span>        <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" /><!-- TMPL_VAR NAME="searchfield" --></li>
         <!-- TMPL_ELSE -->
-                <li>
-                        <label for="searchfield">Z39.50 Server: </label>
-                        
-                                <input type="text" name="searchfield" id="searchfield" size="65" maxlength="100" onblur="toUC(this)" />
-                        
-                </li>
+                <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 -->
 
-		<li>
-			<label for="host">Hostname: </label>
-			
-				<input type="text" name="host" id="host" size="30" value="<!-- TMPL_VAR NAME="host" -->" />
-			
+		<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><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><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><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><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>
-			
+		<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>
 		</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)" /> 
+        </fieldset>
+		
+		<fieldset class="action"><input type="button" value="Save" onclick="Check(this.form)" /> <a class="cancel" href="/cgi-bin/koha/admin/z3950servers.pl">Cancel</a></fieldset>
         </form>
 <!-- /TMPL_IF -->
 
@@ -188,44 +130,15 @@
 	<!-- TMPL_VAR NAME="reqsel" -->
 <h3>Confirm Deletion of Server <!-- TMPL_VAR NAME="searchfield" --></h3>	
         <ul>
-                <li>
-                        <strong>Site: </strong>
-                        
-                                <!-- TMPL_VAR NAME="searchfield" -->
-                        
-                </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>
+                <li><strong>Site: </strong>        <!-- TMPL_VAR NAME="searchfield" --></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>
 
 
 
@@ -239,36 +152,33 @@
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="else" -->
+
+<div id="toolbar">
+	<script type="text/javascript">
+	//<![CDATA[
+	// prepare DOM for YUI Toolbar
+	 $(document).ready(function() {
+	    yuiToolbar();
+	 });
+	// YUI Toolbar Functions
+	function yuiToolbar() {
+	    new YAHOO.widget.Button("newserver");
+	}	//]]>
+	</script>
+	<ul class="toolbar">
+	<li><a id="newserver" href="/cgi-bin/koha/admin/z3950servers.pl?op=add_form">New z39.50 Server</a></li>
+</ul></div>
+
 <h3>Z39.50 Servers Admininistration</h3>
 
         <!-- TMPL_IF NAME="searchfield" -->
                 You searched for <!-- TMPL_VAR NAME="searchfield" -->
         <!-- /TMPL_IF -->		
 <table>
-                <tr>
-                        <th>Site</th>
-                        <th>Hostname/Port</th>
-                        <th>Database</th>
-                        <th>Userid</th>
-                        <th>Password</th>
-                        <th>Checked</th>
-                        <th>Rank</th>       
-						<th>Syntax</th>
-                        <th colspan="2">&nbsp;</th>
+                <tr><th>Site</th><th>Hostname/Port</th><th>Database</th><th>Userid</th><th>Password</th><th>Checked</th><th>Rank</th>       			<th>Syntax</th><th colspan="2">&nbsp;</th>
                 </tr>
                 <!-- TMPL_LOOP NAME="loop" -->
-               <!-- TMPL_IF NAME="toggle" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
-                        <td><!-- TMPL_VAR NAME="name" --></td>
-                        <td><!-- TMPL_VAR NAME="host" -->:<!-- TMPL_VAR NAME="port" --></td>
-                        <td><!-- TMPL_VAR NAME="db" --></td>
-                        <td><!-- TMPL_VAR NAME="userid" --></td>
-                        <td><!-- TMPL_VAR NAME="password" --></td>
-                        <td><!-- TMPL_VAR NAME="checked" --></td>
-                        <td><!-- TMPL_VAR NAME="rank" --></td>
-						<td><!-- TMPL_VAR NAME="syntax" --></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_IF NAME="toggle" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF --><td><!-- TMPL_VAR NAME="name" --></td><td><!-- TMPL_VAR NAME="host" -->:<!-- TMPL_VAR NAME="port" --></td><td><!-- TMPL_VAR NAME="db" --></td><td><!-- TMPL_VAR NAME="userid" --></td><td><!-- TMPL_VAR NAME="password" --></td><td><!-- TMPL_VAR NAME="checked" --></td><td><!-- TMPL_VAR NAME="rank" --></td>			<td><!-- TMPL_VAR NAME="syntax" --></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>
 
@@ -276,10 +186,7 @@
 	<input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="prevpage" -->" />
 	<input type="submit" value="&lt;&lt; Prev">
 </form><!-- /TMPL_IF -->
-<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-        <input type="hidden" name="op" value="add_form" />
-		<input type="submit" value="Add z39.50 Server" />
-</form>
+
 <!-- TMPL_IF NAME="ltcount" --><form action="<!-- TMPL_VAR NAME="script_name" -->" method="get">
 	<input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="nextpage" -->" />
 	<input type="submit" value="Next &gt;&gt;" />