From a453c166320be75df13061c7eed9bb527b4732fc Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Fri, 14 Sep 2007 15:24:14 -0500
Subject: [PATCH] Finishing cleanup of Admin templates: - Corrected markup
 generated by scripts. - Added standard or custom resident search form on all
 pages. - Add breadcrumb navigation to all pages

Signed-off-by: Chris Cormack <crc@liblime.com>
---
 admin/auth_subfields_structure.pl             |   6 +-
 admin/auth_tag_structure.pl                   |   6 +-
 admin/authorised_values.pl                    |  16 +-
 admin/categoryitem.pl                         | 199 -----------
 admin/marc_subfields_structure.pl             |   8 +-
 admin/marctagstructure.pl                     |  12 +-
 admin/roadtype.pl                             |   2 +-
 admin/thesaurus.pl                            | 267 --------------
 .../prog/en/includes/cities-admin-menu.inc    |  33 ++
 .../prog/en/includes/roadtype-admin-menu.inc  |  33 ++
 .../prog/en/modules/admin/aqbookfund.tmpl     | 115 +++---
 .../prog/en/modules/admin/aqbudget.tmpl       |  42 +--
 .../admin/auth_subfields_structure.tmpl       |  45 ++-
 .../en/modules/admin/auth_tag_structure.tmpl  |  30 +-
 .../en/modules/admin/authorised_values.tmpl   |  36 +-
 .../prog/en/modules/admin/authtypes.tmpl      |  21 +-
 .../en/modules/admin/biblio_framework.tmpl    |   9 +-
 .../prog/en/modules/admin/branches.tmpl       |   1 +
 .../prog/en/modules/admin/categorie.tmpl      |   1 +
 .../prog/en/modules/admin/categoryitem.tmpl   | 327 ------------------
 .../prog/en/modules/admin/charges.tmpl        |  47 ---
 .../prog/en/modules/admin/checkmarc.tmpl      |   7 +-
 .../prog/en/modules/admin/cities.tmpl         |  50 ++-
 .../prog/en/modules/admin/finesrules.tmpl     |   1 +
 .../prog/en/modules/admin/issuingrules.tmpl   |   1 +
 .../prog/en/modules/admin/itemtypes.tmpl      |   1 +
 .../prog/en/modules/admin/koha2marclinks.tmpl |   1 +
 .../admin/marc_subfields_structure.tmpl       |  57 +--
 .../en/modules/admin/marctagstructure.tmpl    |  48 +--
 .../prog/en/modules/admin/printers.tmpl       |   1 +
 .../prog/en/modules/admin/roadtype.tmpl       |  42 +--
 .../en/modules/admin/systempreferences.tmpl   |   1 +
 .../prog/en/modules/admin/thesaurus.tmpl      | 171 ---------
 33 files changed, 350 insertions(+), 1287 deletions(-)
 delete mode 100755 admin/categoryitem.pl
 delete mode 100755 admin/thesaurus.pl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-menu.inc
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-menu.inc
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/admin/categoryitem.tmpl
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/admin/charges.tmpl
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/admin/thesaurus.tmpl

diff --git a/admin/auth_subfields_structure.pl b/admin/auth_subfields_structure.pl
index b1e8b63914..295c7ae261 100755
--- a/admin/auth_subfields_structure.pl
+++ b/admin/auth_subfields_structure.pl
@@ -189,7 +189,7 @@ 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{tagsubfield} =$data->{'tagsubfield'}."<input type=\"hidden\" name=\"tagsubfield\" value=\"".$data->{'tagsubfield'}."\" id=\"tagsubfield\" />";
 		$row_data{liblibrarian} = CGI::escapeHTML($data->{'liblibrarian'});
 		$row_data{libopac} = CGI::escapeHTML($data->{'libopac'});
 		$row_data{seealso} = CGI::escapeHTML($data->{'seealso'});
@@ -290,7 +290,7 @@ 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{tagsubfield} = "<input type=\"text\" name=\"tagsubfield\" value=\"".$data->{'tagsubfield'}."\" size=\"1\" id=\"tagsubfield\" maxlength=\"1\" />";
 		$row_data{liblibrarian} = "";
 		$row_data{libopac} = "";
 		$row_data{seealso} = "";
@@ -471,7 +471,7 @@ if ($op eq 'add_form') {
 		$row_data{value_builder}	= $results->[$i]{'value_builder'};
 		$row_data{hidden}	= $results->[$i]{'hidden'} if($results->[$i]{'hidden'} gt "000") ;
 		$row_data{isurl}	= $results->[$i]{'isurl'};
-		$row_data{delete} = "$script_name?op=delete_confirm&amp;tagfield=$tagfield&amp;tagsubfield=".$results->[$i]{'tagsubfield'}."&authtypecode=$authtypecode";
+		$row_data{delete} = "$script_name?op=delete_confirm&amp;tagfield=$tagfield&amp;tagsubfield=".$results->[$i]{'tagsubfield'}."&amp;authtypecode=$authtypecode";
 		$row_data{toggle} = $toggle;
 		if ($row_data{tab} eq -1) {
 			$row_data{subfield_ignored} = 1;
diff --git a/admin/auth_tag_structure.pl b/admin/auth_tag_structure.pl
index b7f5ba878a..7e96020b77 100755
--- a/admin/auth_tag_structure.pl
+++ b/admin/auth_tag_structure.pl
@@ -222,9 +222,9 @@ if ($op eq 'add_form') {
 		$row_data{repeatable} = $results->[$i]{'repeatable'};
 		$row_data{mandatory} = $results->[$i]{'mandatory'};
 		$row_data{authorised_value} = $results->[$i]{'authorised_value'};
-		$row_data{subfield_link} ="auth_subfields_structure.pl?tagfield=".$results->[$i]{'tagfield'}."&authtypecode=".$authtypecode;
-		$row_data{edit} = "$script_name?op=add_form&amp;searchfield=".$results->[$i]{'tagfield'}."&authtypecode=".$authtypecode;
-		$row_data{delete} = "$script_name?op=delete_confirm&amp;searchfield=".$results->[$i]{'tagfield'}."&authtypecode=".$authtypecode;
+		$row_data{subfield_link} ="auth_subfields_structure.pl?tagfield=".$results->[$i]{'tagfield'}."&amp;authtypecode=".$authtypecode;
+		$row_data{edit} = "$script_name?op=add_form&amp;searchfield=".$results->[$i]{'tagfield'}."&amp;authtypecode=".$authtypecode;
+		$row_data{delete} = "$script_name?op=delete_confirm&amp;searchfield=".$results->[$i]{'tagfield'}."&amp;authtypecode=".$authtypecode;
 		$row_data{toggle} = $toggle;
 		push(@loop_data, \%row_data);
 	}
diff --git a/admin/authorised_values.pl b/admin/authorised_values.pl
index 1c2f03e9b9..fe56aee015 100755
--- a/admin/authorised_values.pl
+++ b/admin/authorised_values.pl
@@ -100,9 +100,9 @@ if ($op eq 'add_form') {
 							id => $data->{'id'}
 							);
 	if ($data->{'category'}) {
-		$template->param(category => "<input type=\"hidden\" name=\"category\" value='$data->{'category'}'>$data->{'category'}");
+		$template->param(category => "<input type=\"hidden\" name=\"category\" value=\"'$data->{'category'}'\" />$data->{'category'}");
 	} else {
-		$template->param(category => "<input type=text name=\"category\" size=8 maxlength=8>");
+		$template->param(category => "<input type=\"text\" name=\"category\" id=\"category\" size=\"8\" maxlength=\"8\" />");
 	}
 ################## ADD_VALIDATE ##################################
 # called by add_form, used to insert/modify data in DB
@@ -164,21 +164,21 @@ if ($op eq 'add_form') {
 		$searchfield=$category_list[0];
 	}
 	my ($count,$results)=StringSearch($searchfield,'web');
-	my $toggle="white";
+	my $toggle=1;
 	my @loop_data = ();
 	# builds value list
 	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
-	  	if ($toggle eq 'white'){
-			$toggle="#ffffcc";
+	  	if ($toggle eq 1){
+			$toggle=1;
 	  	} else {
-			$toggle="white";
+			$toggle=0;
 	  	}
 		my %row_data;  # get a fresh hash for the row data
 		$row_data{category} = $results->[$i]{'category'};
 		$row_data{authorised_value} = $results->[$i]{'authorised_value'};
 		$row_data{lib} = $results->[$i]{'lib'};
-		$row_data{edit} = "$script_name?op=add_form&id=".$results->[$i]{'id'};
-		$row_data{delete} = "$script_name?op=delete_confirm&searchfield=$searchfield&id=".$results->[$i]{'id'};
+		$row_data{edit} = "$script_name?op=add_form&amp;id=".$results->[$i]{'id'};
+		$row_data{delete} = "$script_name?op=delete_confirm&amp;searchfield=$searchfield&amp;id=".$results->[$i]{'id'};
 		push(@loop_data, \%row_data);
 	}
 
diff --git a/admin/categoryitem.pl b/admin/categoryitem.pl
deleted file mode 100755
index e2a8b83c19..0000000000
--- a/admin/categoryitem.pl
+++ /dev/null
@@ -1,199 +0,0 @@
-#!/usr/bin/perl
-
-#script to administer the categories table
-#written 20/02/2002 by paul.poulain@free.fr
-# This software is placed under the gnu General Public License, v2 (http://www.gnu.org/licenses/gpl.html)
-
-# ALGO :
-# this script use an $op to know what to do.
-# if $op is empty or none of the above values,
-#	- the default screen is build (with all records, or filtered datas).
-#	- the   user can clic on add, modify or delete record.
-# if $op=add_form
-#	- if primkey exists, this is a modification,so we read the $primkey record
-#	- builds the add/modify form
-# if $op=add_validate
-#	- the user has just send datas, so we create/modify the record
-# if $op=delete_form
-#	- we show the record having primkey=$primkey and ask for deletion validation form
-# if $op=delete_confirm
-#	- we delete the record having primkey=$primkey
-
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-use strict;
-use CGI;
-use C4::Context;
-use C4::Auth;
-use C4::Output;
-
-sub StringSearch  {
-	my ($searchstring,$type)=@_;
-	my $dbh = C4::Context->dbh;
-	$searchstring=~ s/\'/\\\'/g;
-	my @data=split(' ',$searchstring);
-	my $count=@data;
-	my $sth=$dbh->prepare("Select * from categories where (description like ?)");
-	$sth->execute("$data[0]%");
-	my @results;
-	while (my $data=$sth->fetchrow_hashref){
-	push(@results,$data);
-	}
-	#  $sth->execute;
-	$sth->finish;
-	return (scalar(@results),\@results);
-}
-
-my $input = new CGI;
-my $searchfield=$input->param('description');
-my $script_name="/cgi-bin/koha/admin/categorie.pl";
-my $categorycode=$input->param('categorycode');
-my $op = $input->param('op');
-$searchfield=~ s/\,//g;
-
-my ($template, $loggedinuser, $cookie) 
-    = get_template_and_user({template_name => "admin/categoryitem.tmpl",
-                             query => $input,
-                             type => "intranet",
-                             authnotrequired => 0,
-                             debug => 1,
-                             });
-
-
-$template->param(script_name => $script_name,
-                 categorycode => $categorycode,
-		 searchfield => $searchfield);
-
-
-################## ADD_FORM ##################################
-# called by default. Used to create form to add or  modify a record
-if ($op eq 'add_form') {
-	$template->param(add_form => 1);
-	#---- if primkey exists, it's a modify action, so read values to modify...
-	my $data;
-	if ($categorycode) {
-		my $dbh = C4::Context->dbh;
-		my $sth=$dbh->prepare("select categorycode,description,enrolmentperiod,upperagelimit,dateofbirthrequired,finetype,bulk,enrolmentfee,reservefee,overduenoticerequired from categories where categorycode=?");
-		$sth->execute($categorycode);
-		$data=$sth->fetchrow_hashref;
-		$sth->finish;
-	}
-
-        $template->param(description             => $data->{'description'},
-                                enrolmentperiod         => $data->{'enrolmentperiod'},
-                                upperagelimit           => $data->{'upperagelimit'},
-                                dateofbirthrequired     => $data->{'dateofbirthrequired'},
-                                finetype                => $data->{'finetype'},
-                                bulk                    => $data->{'bulk'},
-                                enrolmentfee            => $data->{'enrolmentfee'},
-                                overduenoticerequired   => $data->{'overduenoticerequired'},
-                                reservefee              => $data->{'reservefee'});
-
-
-;
-													# END $OP eq ADD_FORM
-################## ADD_VALIDATE ##################################
-# called by add_form, used to insert/modify data in DB
-} elsif ($op eq 'add_validate') {
-	$template->param(add_validate => 1);
-	my $dbh = C4::Context->dbh;
-	my $sth=$dbh->prepare("replace categories (categorycode,description,enrolmentperiod,upperagelimit,dateofbirthrequired,finetype,bulk,enrolmentfee,reservefee,overduenoticerequired) values (?,?,?,?,?,?,?,?,?,?)");
-	$sth->execute(map {$input->param($_)} ('categorycode','description','enrolmentperiod','upperagelimit','dateofbirthrequired','finetype','bulk','enrolmentfee','reservefee','overduenoticerequired'));
-	$sth->finish;
-	print "data recorded";
-	print "<form action='$script_name' method=post>";
-	print "<input type=submit value=OK>";
-	print "</form>";
-													# END $OP eq ADD_VALIDATE
-################## DELETE_CONFIRM ##################################
-# called by default form, used to confirm deletion of data in DB
-} elsif ($op eq 'delete_confirm') {
-	$template->param(delete_confirm => 1);
-	my $dbh = C4::Context->dbh;
-	my $sth=$dbh->prepare("select count(*) as total from categoryitem where categorycode=?");
-	$sth->execute($categorycode);
-	my $total = $sth->fetchrow_hashref;
-	print "TOTAL : $categorycode : $total->{'total'}<br>";
-	$sth->finish;
-	my $sth2=$dbh->prepare("select categorycode,description,enrolmentperiod,upperagelimit,dateofbirthrequired,finetype,bulk,enrolmentfee,reservefee,overduenoticerequired from categories where categorycode=?");
-	$sth2->execute($categorycode);
-	my $data=$sth2->fetchrow_hashref;
-	$sth2->finish;
-
-        $template->param(description             => $data->{'description'},
-                                enrolmentperiod         => $data->{'enrolmentperiod'},
-                                upperagelimit           => $data->{'upperagelimit'},
-                                dateofbirthrequired     => $data->{'dateofbirthrequired'},
-                                finetype                => $data->{'finetype'},
-                                bulk                    => $data->{'bulk'},
-                                enrolmentfee            => $data->{'enrolmentfee'},
-                                overduenoticerequired   => $data->{'overduenoticerequired'},
-                                reservefee              => $data->{'reservefee'});
-
-													# END $OP eq DELETE_CONFIRM
-################## DELETE_CONFIRMED ##################################
-# called by delete_confirm, used to effectively confirm deletion of data in DB
-} elsif ($op eq 'delete_confirmed') {
-	$template->param(delete_confirmed => 1);
-	my $dbh = C4::Context->dbh;
-	my $categorycode=uc($input->param('categorycode'));
-	my $sth=$dbh->prepare("delete from categories where categorycode=?");
-	$sth->execute($categorycode);
-	$sth->finish;
-													# END $OP eq DELETE_CONFIRMED
-} else { # DEFAULT
-        $template->param(else => 1);
-        my @loop;
-        my ($count,$results)=StringSearch($searchfield,'web');
-	my $toggle = 'white';
-        for (my $i=0; $i < $count; $i++){
-                my %row = (categorycode => $results->[$i]{'categorycode'},
-                                description => $results->[$i]{'description'},
-                                enrolmentperiod => $results->[$i]{'enrolmentperiod'},
-                                upperagelimit => $results->[$i]{'upperagelimit'},
-                                dateofbirthrequired => $results->[$i]{'dateofbirthrequired'},
-                                finetype => $results->[$i]{'finetype'},
-                                bulk => $results->[$i]{'bulk'},
-                                enrolmentfee => $results->[$i]{'enrolmentfee'},
-                                overduenoticerequired => $results->[$i]{'overduenoticerequired'},
-                                reservefee => $results->[$i]{'reservefee'},
-				toggle => $toggle );
-                push @loop, \%row;
-                if ( $toggle eq 'white' )
-                {
-                        $toggle = '#ffffcc';
-                }
-                else
-                {
-                        $toggle = 'white';
-                }
-
-        }
-        $template->param(loop => \@loop);
-
-
-} #---- END $OP eq DEFAULT
-$template->param(intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
-		);
-output_html_with_http_headers $input, $cookie, $template->output;
-
-
-
diff --git a/admin/marc_subfields_structure.pl b/admin/marc_subfields_structure.pl
index 8bdcfe6077..ae3d94b2ab 100755
--- a/admin/marc_subfields_structure.pl
+++ b/admin/marc_subfields_structure.pl
@@ -204,7 +204,7 @@ if ( $op eq 'add_form' ) {
             $data->{'tagsubfield'}
           . "<input type=\"hidden\" name=\"tagsubfield\" value=\""
           . $data->{'tagsubfield'}
-          . "\" id=\"tagsubfield\">";
+          . "\" id=\"tagsubfield\" />";
         $row_data{subfieldcode} = $data->{'tagsubfield'};
         $row_data{liblibrarian} = CGI::escapeHTML( $data->{'liblibrarian'} );
         $row_data{libopac}      = CGI::escapeHTML( $data->{'libopac'} );
@@ -309,7 +309,7 @@ if ( $op eq 'add_form' ) {
         $row_data{tagsubfield} =
             "<input type=\"text\" name=\"tagsubfield\" value=\""
           . $data->{'tagsubfield'}
-          . "\" size=\"1\" id=\"tagsubfield\" maxlength=\"1\">";
+          . "\" size=\"1\" id=\"tagsubfield\" maxlength=\"1\" />";
         $row_data{liblibrarian} = "";
         $row_data{libopac}      = "";
         $row_data{seealso}      = "";
@@ -383,7 +383,7 @@ if ( $op eq 'add_form' ) {
     $template->param(
         action   => "Edit subfields",
         tagfield =>
-"<input type=\"hidden\" name=\"tagfield\" value=\"$tagfield\">$tagfield",
+"<input type=\"hidden\" name=\"tagfield\" value=\"$tagfield\" />$tagfield",
         loop           => \@loop_data,
         more_subfields => $more_subfields,
         more_tag       => $tagfield
@@ -540,7 +540,7 @@ else {    # DEFAULT
         $row_data{delete}           =
 "$script_name?op=delete_confirm&amp;tagfield=$tagfield&amp;tagsubfield="
           . $results->[$i]{'tagsubfield'}
-          . "&frameworkcode=$frameworkcode";
+          . "&amp;frameworkcode=$frameworkcode";
         $row_data{toggle} = $toggle;
 
         if ( $row_data{tab} eq -1 ) {
diff --git a/admin/marctagstructure.pl b/admin/marctagstructure.pl
index 99edb1cc6a..e65d92fedb 100755
--- a/admin/marctagstructure.pl
+++ b/admin/marctagstructure.pl
@@ -258,9 +258,9 @@ if ($op eq 'add_form') {
 			$row_data{repeatable} = $results[$i]->{'mts_repeatable'};
 			$row_data{mandatory} = $results[$i]->{'mts_mandatory'};
 			$row_data{authorised_value} = $results[$i]->{'mts_authorised_value'};
-			$row_data{subfield_link} ="marc_subfields_structure.pl?op=add_form&tagfield=".$results[$i]->{'mts_tagfield'}."&frameworkcode=".$frameworkcode;
-			$row_data{edit} = "$script_name?op=add_form&amp;searchfield=".$results[$i]->{'mts_tagfield'}."&frameworkcode=".$frameworkcode;
-			$row_data{delete} = "$script_name?op=delete_confirm&amp;searchfield=".$results[$i]->{'mts_tagfield'}."&frameworkcode=".$frameworkcode;
+			$row_data{subfield_link} ="marc_subfields_structure.pl?op=add_form&amp;tagfield=".$results[$i]->{'mts_tagfield'}."&amp;frameworkcode=".$frameworkcode;
+			$row_data{edit} = "$script_name?op=add_form&amp;searchfield=".$results[$i]->{'mts_tagfield'}."&amp;frameworkcode=".$frameworkcode;
+			$row_data{delete} = "$script_name?op=delete_confirm&amp;searchfield=".$results[$i]->{'mts_tagfield'}."&amp;frameworkcode=".$frameworkcode;
 			$row_data{toggle} = $toggle;
 			$j=$i;
 			my @internal_loop = ();
@@ -308,9 +308,9 @@ if ($op eq 'add_form') {
 			$row_data{repeatable} = $results->[$i]{'repeatable'};
 			$row_data{mandatory} = $results->[$i]{'mandatory'};
 			$row_data{authorised_value} = $results->[$i]{'authorised_value'};
-			$row_data{subfield_link} ="marc_subfields_structure.pl?tagfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode;
-			$row_data{edit} = "$script_name?op=add_form&amp;searchfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode;
-			$row_data{delete} = "$script_name?op=delete_confirm&amp;searchfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode;
+			$row_data{subfield_link} ="marc_subfields_structure.pl?tagfield=".$results->[$i]{'tagfield'}."&amp;frameworkcode=".$frameworkcode;
+			$row_data{edit} = "$script_name?op=add_form&amp;searchfield=".$results->[$i]{'tagfield'}."&amp;frameworkcode=".$frameworkcode;
+			$row_data{delete} = "$script_name?op=delete_confirm&amp;searchfield=".$results->[$i]{'tagfield'}."&amp;frameworkcode=".$frameworkcode;
 			$row_data{toggle} = $toggle;
 			push(@loop_data, \%row_data);
 		}
diff --git a/admin/roadtype.pl b/admin/roadtype.pl
index 44c801570a..12d6e75c14 100755
--- a/admin/roadtype.pl
+++ b/admin/roadtype.pl
@@ -121,7 +121,7 @@ if ($op eq 'add_form') {
 	}
 
         $template->param(	
-				city_name       =>	( $data->{'road_type'}),
+				road_type       =>	( $data->{'road_type'}),
 				);
 
 
diff --git a/admin/thesaurus.pl b/admin/thesaurus.pl
deleted file mode 100755
index 4c54a0d7d4..0000000000
--- a/admin/thesaurus.pl
+++ /dev/null
@@ -1,267 +0,0 @@
-#!/usr/bin/perl
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-use strict;
-use CGI;
-use C4::Context;
-use C4::Output;
-use C4::Auth;
-use C4::AuthoritiesMarc;
-
-my $input = new CGI;
-my $search_category=$input->param('search_category');
-# $search_category=$input->param('category') unless $search_category;
-#my $toponly = $input->param('toponly');
-my $branch = $input->param('branch');
-my $searchstring = $input->param('searchstring');
-# $searchstring=~ s/\,//g;
-my $id = $input->param('id');
-my $offset=$input->param('offset');
-my $father=$input->param('father');
-
-my $reqsel="";
-my $reqdel="delete from bibliothesaurus where id='$id'";
-my $script_name="/cgi-bin/koha/admin/thesaurus.pl";
-my $dbh = C4::Context->dbh;
-my $authoritysep = C4::Context->preference("authoritysep");
-
-my ($template, $borrowernumber, $cookie)
-    = get_template_and_user({template_name => "admin/thesaurus.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {parameters => 1},
-			     debug => 1,
-			     });
-
-my $pagesize=20;
-
-my $prevpage = $offset-$pagesize;
-my $nextpage =$offset+$pagesize;
-
-my $op = $input->param('op');
-
-if ($op) {
-$template->param(script_name => $script_name,
-						$op              => 1); # we show only the TMPL_VAR names $op
-} else {
-$template->param(script_name => $script_name,
-						else              => 1); # we show only the TMPL_VAR names $op
-}
-################## ADD_FORM ##################################
-# called by default. Used to create form to add or  modify a record
-if ($op eq 'add_form') {
-	my $data;
-	if ($id) {
-		my $dbh = C4::Context->dbh;
-		my $sth=$dbh->prepare("select id,category,freelib,stdlib from bibliothesaurus where id=?");
-		$sth->execute($id);
-		$data=$sth->fetchrow_hashref;
-		$sth->finish;
-	} else {
-		$data->{'category'} = $input->param('category');
-		$data->{'stdlib'} = $input->param('stdlib');
-	}
-	if ($search_category) {
-		$template->param(action => "Modify thesaurus");
-	} else {
-		$template->param(action => "Add thesaurus");
-	}
-	$template->param(category => $data->{'category'},
-							stdlib => $data->{'stdlib'},
-							freelib => $data->{'freelib'},
-							id => $data->{'id'},
-							branch => $branch,
-#							toponly => $toponly,
-							search_category => $search_category,
-							searchstring => $searchstring,
-							offset => $offset,
-							father => $father,
-							);
-	if ($data->{'category'}) {
-		$template->param(category => "<input type=\"hidden\" name=\"category\" value='$data->{'category'}'>$data->{'category'}");
-	} else {
-		$template->param(category => "<input type=text name=\"category\" size=8 maxlength=8>");
-	}
-################## ADD_VALIDATE ##################################
-# called by add_form, used to insert data in DB
-} elsif ($op eq 'add_validate') {
-	my $dbh = C4::Context->dbh;
-	my $freelib = $input->param('freelib');
-	$freelib = $input->param('stdlib') unless ($input->param('freelib'));
-	newauthority($dbh,$input->param('category'),$input->param('father')." ".$input->param('stdlib'), $freelib,'',1,'');
-	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=thesaurus.pl?branch=$branch&search_category=$search_category&searchstring=$searchstring&offset=$offset\"></html>";
-	exit;
-################## MOD_VALIDATE ##################################
-# called by add_form, used to modify data in DB
-} elsif ($op eq 'mod_validate') {
-	my $dbh = C4::Context->dbh;
-	my $freelib = $input->param('freelib');
-	modauthority($dbh,$id,$freelib);
-	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=thesaurus.pl?branch=$branch&search_category=$search_category&offset=$offset&searchstring=".CGI::escapeHTML($searchstring)."\"></html>";
-	exit;
-################## DELETE_CONFIRM ##################################
-# called by default form, used to confirm deletion of data in DB
-} elsif ($op eq 'delete_confirm') {
-	my $dbh = C4::Context->dbh;
-	my $sth=$dbh->prepare("select category,stdlib,freelib from bibliothesaurus where id=?");
-	$sth->execute($id);
-	my $data=$sth->fetchrow_hashref;
-	$sth->finish;
-	$template->param(search_category => $search_category,
-							Tvalue => $data->{'stdlib'},
-							id =>$id,
-							);
-
-													# END $OP eq DELETE_CONFIRM
-################## DELETE_CONFIRMED ##################################
-# called by delete_confirm, used to effectively confirm deletion of data in DB
-} elsif ($op eq 'delete_confirmed') {
-	&delauthority($id);
-	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=thesaurus.pl?search_category=$search_category&searchstring=$searchstring\"></html>";
-	exit;
-													# END $OP eq DELETE_CONFIRMED
-################## DETAIL_FORM ##################################
-} elsif ($op eq 'detail_form') {
-	# build categories list
-	my $sth = $dbh->prepare("select distinct category from bibliothesaurus");
-	$sth->execute;
-	my @category_list;
-	while ( my ($category) = $sth->fetchrow_array) {
-		push(@category_list,$category);
-	}
-	my $tab_list = CGI::scrolling_list(-name=>'search_category',
-			-values=> \@category_list,
-			-default=>"$search_category",
-			-size=>1,
- 			-tabindex=>'',
-			-multiple=>0,
-			);
-	if (!$search_category) {
-		$search_category=$category_list[0];
-	}
-	my $sth = $dbh->prepare("select father,stdlib,category,hierarchy from bibliothesaurus where id=?");
-	$sth->execute($id);
-	my ($father,$stdlib,$category,$suphierarchy) = $sth->fetchrow_array;
-	$sth->finish;
-	$sth= $dbh->prepare("select id,freelib from bibliothesaurus where father=? and stdlib=?");
-	$sth->execute($father,$stdlib);
-	my $toggle="white";
-	# builds value list
-	my @loop_data;
-	while ( my ($id,$freelib) = $sth->fetchrow_array) {
-	  	if ($toggle eq 'white'){
-			$toggle="#ffffcc";
-	  	} else {
-			$toggle="white";
-	  	}
-		my %row_data;  # get a fresh hash for the row data
-		$row_data{freelib} = $freelib;
-		$row_data{edit} = "$script_name?op=add_form&id=$id";
-		$row_data{delete} = "$script_name?op=delete_confirm&search_category=$search_category&id=$id";
-		push(@loop_data, \%row_data);
-	}
-
-	$template->param(loop => \@loop_data,
-							tab_list => $tab_list,
-							category => $search_category,
-#							toponly => $toponly,
-							searchstring => $searchstring,
-							stdlib => $stdlib,
-							category => $category);
-################## DEFAULT ##################################
-} else { # DEFAULT
-	# build categories list
-	my $sth = $dbh->prepare("select distinct category from bibliothesaurus");
-	$sth->execute;
-	my @category_list;
-	while ( my ($category) = $sth->fetchrow_array) {
-		push(@category_list,$category);
-	}
-	my $tab_list = CGI::scrolling_list(-name=>'search_category',
-			-values=> \@category_list,
-			-default=>"$search_category",
-			-size=>1,
- 			-tabindex=>'',
-			-multiple=>0,
-			);
-	if (!$search_category) {
-		$search_category=$category_list[0];
-	}
-	my ($count,$results)=searchauthority($search_category,$branch,$searchstring,$offset,$pagesize);
-	my $toggle="white";
-	my @loop_data = ();
-	# builds value list
-	for (my $i=0; $i < $pagesize; $i++){
-		if ($results->[$i]{'stdlib'}) {
-			if ($toggle eq 'white'){
-				$toggle="#ffffcc";
-			} else {
-				$toggle="white";
-			}
-			my %row_data;  # get a fresh hash for the row data
-			$row_data{category} = $results->[$i]{'category'};
-#			$row_data{stdlib} = ("&nbsp;&nbsp;&nbsp;&nbsp;" x $results->[$i]{'level'}).$results->[$i]{'stdlib'};
-			$row_data{stdlib} = $results->[$i]{'stdlib'};
-			$row_data{freelib} = $results->[$i]{'freelib'};
-			$row_data{freelib} =~ s/($searchstring)/<b>$1<\/b>/gi;
-			$row_data{father} = $results->[$i]{'father'};
-			$row_data{dig} ="<a href=thesaurus.pl?branch=$results->[$i]{'hierarchy'}$results->[$i]{'id'}|&search_category=$search_category>";
-			$row_data{related} ="<a href=thesaurus.pl?id=$results->[$i]{'id'}&search_category=$search_category&op=detail_form>";
-			$row_data{edit} = "$script_name?op=add_form&branch=$branch&search_category=$search_category&searchstring=$searchstring&offset=$offset&id=".$results->[$i]{'id'};
-			$row_data{delete} = "$script_name?op=delete_confirm&search_category=$search_category&id=".$results->[$i]{'id'};
-			push(@loop_data, \%row_data);
-		}
-	}
-	# rebuild complete hierarchy
-	my  $sth = $dbh->prepare("select stdlib from bibliothesaurus where id=?");
-	my @hierarchy = split(/\|/,$branch);
-	my @hierarchy_loop;
-	my $x;
-	my $father;
-	for (my $xi=0;$xi<=$#hierarchy;$xi++) {
-		my %link;
-		$sth->execute($hierarchy[$xi]);
-		my ($t) = $sth->fetchrow_array;
-		$x.=$hierarchy[$xi]."|";
-		$link{'string'}=$t;
-		$link{'branch'}=$x;
-		push (@hierarchy_loop, \%link);
-		$father .= $t." $authoritysep ";
-	}
-	$template->param(loop => \@loop_data,
-							tab_list => $tab_list,
-							category => $search_category,
-#							toponly => $toponly,
-							searchstring => $searchstring,
-							hierarchy_loop => \@hierarchy_loop,
-							branch => $branch,
-							father => $father);
-	if ($offset>0) {
-		$template->param(previous => "$script_name?branch=$branch&search_category=$search_category&searchstring=$searchstring&offset=$prevpage");
-	}
-	if ($pagesize<$count) {
-		$template->param(next => "$script_name?branch=$branch&search_category=$search_category&searchstring=$searchstring&offset=$nextpage");
-	}
-} #---- END $OP eq DEFAULT
-$template->param(intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
-		);
-output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-menu.inc
new file mode 100644
index 0000000000..a0408c629c
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-menu.inc
@@ -0,0 +1,33 @@
+<!-- Begin Members Resident Search Box -->
+<div id="header_search">
+	<div id="city_search">
+	<p class="tip">City Search:</p>
+	<form action="<TMPL_VAR NAME="script_name">" method="post">
+		<input type="text" name="city_name" value="<!-- TMPL_VAR NAME="searchfield" -->" size="40" />
+		<input type="submit" name="submit" value="OK" class="button" />
+	</form>
+	</div>
+	<div id="circ_search">
+	<p class="tip">Enter patron card number or partial name:</p>
+	<form action="/cgi-bin/koha/circ/circulation.pl" method="post">
+			<label for="findborrower"> </label>
+    <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
+	<input name="branch" value="CPL" type="hidden" />
+    <input name="printer" value="" type="hidden" />
+	<input value="Submit" type="submit" />
+	</form>
+	</div>	
+	<div id="catalog_search">
+	<p class="tip">Enter search keywords:</p>
+		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
+			 <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
+				<input type="submit" name="op" id="opac-submit" value="Submit"  class="form-submit" />
+		</form>
+	</div>
+			<ul>
+			<li><a href="/cgi-bin/koha/admin/roadtype.pl#city_search">Search Cities</a></li>
+			<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check Out</a></li>
+			<li><a href="/cgi-bin/koha/catalogue/advsearch.pl#catalog_search">Search the Catalog</a></li>
+			</ul>	
+</div>
+<!-- End Members Resident Search Box -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-menu.inc
new file mode 100644
index 0000000000..3bea57f6c4
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-menu.inc
@@ -0,0 +1,33 @@
+<!-- Begin Members Resident Search Box -->
+<div id="header_search">
+	<div id="roadtype_search">
+	<p class="tip">Road Type Search:</p>
+		<form action="<TMPL_VAR NAME="script_name">" method="post">
+		<input type="text" name="road_type" value="<!-- TMPL_VAR NAME="searchfield" -->" size="40" />
+		<input type="submit" name="submit" value="OK" class="button" />
+	</form>
+	</div>
+	<div id="circ_search">
+	<p class="tip">Enter patron card number or partial name:</p>
+	<form action="/cgi-bin/koha/circ/circulation.pl" method="post">
+			<label for="findborrower"> </label>
+    <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
+	<input name="branch" value="CPL" type="hidden" />
+    <input name="printer" value="" type="hidden" />
+	<input value="Submit" type="submit" />
+	</form>
+	</div>	
+	<div id="catalog_search">
+	<p class="tip">Enter search keywords:</p>
+		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
+			 <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
+				<input type="submit" name="op" id="opac-submit" value="Submit"  class="form-submit" />
+		</form>
+	</div>
+			<ul>
+			<li><a href="/cgi-bin/koha/admin/roadtype.pl#roadtype_search">Search Road Types</a></li>
+			<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check Out</a></li>
+			<li><a href="/cgi-bin/koha/catalogue/advsearch.pl#catalog_search">Search the Catalog</a></li>
+			</ul>	
+</div>
+<!-- End Members Resident Search Box -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl
index 33abf51cd9..4621603837 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl
@@ -1,10 +1,67 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Administration &rsaquo; Funds and Budgets</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_IF name="add_form" -->
+<script type="text/javascript">
+//<![CDATA[
+
+	function isNotNull(f,noalert) {
+		if (f.value.length ==0) {
+   return false;
+		}
+		return true;
+	}
+
+	function toUC(f) {
+		var x=f.value.toUpperCase();
+		f.value=x;
+		return true;
+	}
+
+	function isNum(v,maybenull) {
+	var n = new Number(v.value);
+	if (isNaN(n)) {
+		return false;
+		}
+	if (maybenull==0 && v.value=="") {
+		return false;
+	}
+	return true;
+	}
+
+	function isDate(f) {
+		var t = Date.parse(f.value);
+		if (isNaN(t)) {
+			return false;
+		}
+	}
+
+	function Check(f) {
+		var ok=1;
+		var _alertString="";
+		var alertString2;
+		if (f.bookfundid.value.length==0) {
+			_alertString += "- bookfundid missing\n";
+		}
+		if (f.bookfundname.value.length==0) {
+			_alertString += "- bookfundname missing\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);
+		}
+	}
+	//]]>
+</script>
+<!-- /TMPL_IF -->
 </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; Funds and Budgets </div>
 
@@ -105,62 +162,6 @@
 <!-- /TMPL_IF --> <!-- else -->
 
 <!-- TMPL_IF name="add_form" -->
-<script type="text/javascript">
-//<![CDATA[
-
-	function isNotNull(f,noalert) {
-		if (f.value.length ==0) {
-   return false;
-		}
-		return true;
-	}
-
-	function toUC(f) {
-		var x=f.value.toUpperCase();
-		f.value=x;
-		return true;
-	}
-
-	function isNum(v,maybenull) {
-	var n = new Number(v.value);
-	if (isNaN(n)) {
-		return false;
-		}
-	if (maybenull==0 && v.value=="") {
-		return false;
-	}
-	return true;
-	}
-
-	function isDate(f) {
-		var t = Date.parse(f.value);
-		if (isNaN(t)) {
-			return false;
-		}
-	}
-
-	function Check(f) {
-		var ok=1;
-		var _alertString="";
-		var alertString2;
-		if (f.bookfundid.value.length==0) {
-			_alertString += "- bookfundid missing\n";
-		}
-		if (f.bookfundname.value.length==0) {
-			_alertString += "- bookfundname missing\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);
-		}
-	}
-	//]]>
-</script>
-
 <form action="<!-- TMPL_VAR name="action" -->" name="Aform" method="post">
   <input type="hidden" name="op" value="add_validate" />
   <input type="hidden" name="checked" value="0" />
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 5f5b00c3f0..1827e99a20 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl
@@ -1,15 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Administration &rsaquo; Budgets</title>
+<title>Koha &rsaquo; Administration &rsaquo; <!-- TMPL_IF NAME="else" -->Budgets<!-- /TMPL_IF --><!-- TMPL_IF name="add_form" -->Budgets &rsaquo; <!-- TMPL_IF NAME="aqbudgetid" -->Modify<!-- TMPL_ELSE -->Add<!-- /TMPL_IF --> Budget<!-- /TMPL_IF --><!-- TMPL_IF NAME="add_validate" -->Budgets &rsaquo; Budget Data Recorded<!-- /TMPL_IF --><!-- TMPL_IF name="delete_confirmed" -->Budgets &rsaquo; Budget Deleted<!-- /TMPL_IF --><!-- TMPL_IF name="delete_confirm" -->Budgets &rsaquo; Delete Book Budget?<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- Additions to enable Calendar system -->
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css" />
-<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar.js">//]]>
-</script>
-<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-en.js">//]]>
-</script>
-<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-setup.js">//]]>
-</script>
-<!-- End of additions -->
+<!-- TMPL_INCLUDE NAME="calendar.inc" -->
 <!-- TMPL_IF name="add_form" -->
 <script type="text/javascript">
 //<![CDATA[
@@ -70,8 +62,9 @@
 </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; Budgets</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" -->Budgets<!-- /TMPL_IF --><!-- TMPL_IF name="add_form" --><a href="/cgi-bin/koha/admin/aqbudget.pl">Budgets</a> &rsaquo; <!-- TMPL_IF NAME="aqbudgetid" -->Modify<!-- TMPL_ELSE -->Add<!-- /TMPL_IF --> Budget<!-- /TMPL_IF --><!-- TMPL_IF NAME="add_validate" --><a href="/cgi-bin/koha/admin/aqbudget.pl">Budgets</a> &rsaquo; Budget Data Recorded<!-- /TMPL_IF --><!-- TMPL_IF name="delete_confirmed" --><a href="/cgi-bin/koha/admin/aqbudget.pl">Budgets</a> &rsaquo; Budget Deleted<!-- /TMPL_IF --><!-- TMPL_IF name="delete_confirm" --><a href="/cgi-bin/koha/admin/aqbudget.pl">Budgets</a> &rsaquo; Delete Book Budget?<!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
@@ -79,19 +72,20 @@
 	<div id="yui-main">
 	<div class="yui-b">
 
-<ul id="_informations">
+
 <!-- TMPL_IF NAME="add_validate" -->
-  <li>Budget Data Recorded, return to <a href="<!-- TMPL_VAR name="script_name" -->">budget list</a></li>
+  <ul id="_informations"><li>Budget Data Recorded, return to <a href="<!-- TMPL_VAR name="script_name" -->">budget list</a></li></ul>
 <!-- /TMPL_IF --> <!-- add_validate -->
 
 <!-- TMPL_IF name="delete_confirmed" -->
-  <li>Budget deleted, return to <a href="<!-- TMPL_VAR name="script_name" -->">budget list</a></li>
+  <ul id="_informations"><li>Budget deleted, return to <a href="<!-- TMPL_VAR name="script_name" -->">budget list</a></li></ul>
 <!-- /TMPL_IF --> <!-- delete_confirmed -->
-</ul>
+
 
 <!-- TMPL_IF name="else" -->
-<h1>Budget admin</h1>
+<h1>Budgets</h1>
 
+<form action="/cgi-bin/koha/admin/aqbudget.pl" method="post">
 <table>
   <tr>
     <th>Book fund</th>
@@ -102,7 +96,6 @@
     <th>Actions</th>
   </tr>
 
-<form action="/cgi-bin/koha/admin/aqbudget.pl" method="post">
   <tr class="filter">
     <td>
       <select name="filter_bookfundid">
@@ -149,7 +142,7 @@
     <!-- /TMPL_IF -->
       </select>
       <input type="text" size="10" id="filter_startdate" name="filter_startdate" value="<!-- TMPL_VAR Name="filter_startdate" -->" />
-      <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="filter_startdate_button" />
+      <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="filter_startdate_button" alt="Show Calendar" />
       <script type="text/javascript">
 //<![CDATA[
         Calendar.setup(
@@ -183,7 +176,7 @@
     <!-- /TMPL_IF -->
       </select>
       <input type="text" size="8" maxlength="10" id="filter_enddate" name="filter_enddate" value="<!-- TMPL_VAR Name="filter_enddate" -->" />
-      <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="filter_enddate_button" />
+      <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="filter_enddate_button" alt="Show Calendar" />
       <script type="text/javascript">
 //<![CDATA[
         Calendar.setup(
@@ -222,7 +215,6 @@
       <input type="submit" name="filter" value="Filter" />
     </td>
   </tr>
-</form>
   
   <!-- TMPL_LOOP name="budget" -->
     <!-- TMPL_IF NAME="toggle" -->
@@ -242,16 +234,16 @@
   </tr>
   <!-- /TMPL_LOOP --> <!-- budget -->
 </table>
+</form>
 
 <div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
 <!-- /TMPL_IF --> <!-- else -->
 
 <!-- TMPL_IF name="add_form" -->
 
-
 <form action="/cgi-bin/koha/admin/aqbudget.pl" name="Aform" method="post">
   <fieldset>
-    <legend>Add budget</legend>
+    <legend><!-- TMPL_IF NAME="aqbudgetid" -->Modify<!-- TMPL_ELSE -->Add<!-- /TMPL_IF --> budget</legend>
     <input type="hidden" name="op" value="add_validate" />
     <input type="hidden" name="checked" value="0" />
 
@@ -270,7 +262,7 @@
         </th>
         <td>
           <input type="text" size="8" maxlength="10" id="startdate" name="startdate" value="<!-- TMPL_VAR Name="startdate" -->" />
-          <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="startdate_button" />
+          <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="startdate_button" alt="Show Calendar" />
           <script type="text/javascript">
 //<![CDATA[
             Calendar.setup(
@@ -290,7 +282,7 @@
         </th>
         <td>
           <input type="text" size="8" maxlength="10" id="enddate" name="enddate" value="<!-- TMPL_VAR Name="enddate" -->" />
-          <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="enddate_button" alt="" />
+          <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="enddate_button" alt="Show Calendar" />
           <script type="text/javascript">
 //<![CDATA[
             Calendar.setup(
@@ -320,7 +312,7 @@
   <!-- TMPL_IF NAME="disable_branchselection" -->
           <!-- Pierrick's note: I've found that a disabled select was not -->
           <!-- giving its value to Perl :-/ So I use a hidden field trick -->
-          <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->" />
+          <input type="hidden" name="branch" id="branch" value="<!-- TMPL_VAR NAME="branch" -->" />
           <select name="branch" disabled="disabled">
   <!-- TMPL_ELSE -->
           <select name="branch">
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 4bb945b1ff..e648f8ff37 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
@@ -4,6 +4,7 @@
 </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; Authority MARC subfield structure</div>
 
@@ -15,7 +16,7 @@
 
 <!-- TMPL_IF NAME="add_form" -->
 
-	<h><!-- TMPL_IF NAME="use-heading-flags-p" -->
+	<h1><!-- 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 --></h1>
 	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
@@ -32,13 +33,12 @@
 	   <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><label>Help input:</label>
+        <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>
-        </p>	 
+        </ul> 
     </div>
 	<!-- /TMPL_LOOP -->
 	<input type="submit" class="submit" value="Save Changes" />
@@ -53,26 +53,32 @@
 
 <!-- TMPL_IF NAME="delete_confirm" -->
 
-<div class="data"><table>
-<caption>Confirm Deletion of Subfield <span class="ex"><!-- TMPL_VAR NAME="tagsubfield" -->?</span></caption>
-	<tr>
-		<th>Subfield</th>
-		<td><!-- TMPL_VAR NAME="tagsubfield" --></td>
-	</tr>
-	<p>Description<!-- TMPL_VAR NAME="liblibrarian" --></p>
-</table></div>
-			<form class="inline" action="<!-- TMPL_VAR NAME="delete_link" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" />
+<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" />
 				<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 class="inline" 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" />
-			</form>
+				<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" />
+		</form>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="delete_confirmed" -->
 
-	Data deleted
-	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->">
-	<input type="submit" class="submit" value="OK" />
+	<h3>Data deleted</h3>
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+		<input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->" />
+		<input type="submit" class="submit" value="OK" />
 	</form>
 <!-- /TMPL_IF -->
 
@@ -88,6 +94,7 @@
 	<th>Text</th>
 	<th>Constraints</th>
 	<th>Delete</th>
+</tr>
 <!-- TMPL_LOOP NAME="loop" -->
 <!-- TMPL_IF NAME="toggle" --><tr class="highlighted"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
 	<td><!-- TMPL_VAR NAME="tagsubfield" --></td>
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 1db340003c..6f947ef265 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,5 +1,8 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Administration &rsaquo; Authority MARC framework</title>
+<title>Koha &rsaquo; Administration &rsaquo; Authority MARC framework <!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="use-heading-flags-p" -->
+    <!-- TMPL_IF NAME="heading-modify-tag-p" -->&rsaquo; Modify tag<!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="heading-add-tag-p" -->&rsaquo; Add tag<!-- /TMPL_IF -->
+    <!-- TMPL_ELSE -->&rsaquo; <!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirm" -->&rsaquo; Confirm Deletion<!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirmed" -->&rsaquo; Data Deleted<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script type="text/javascript">
 //<![CDATA[
@@ -56,8 +59,12 @@ return false;
 </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; Authority MARC framework</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="use-heading-flags-p" -->
+    <!-- TMPL_IF NAME="heading-modify-tag-p" --><a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Authority MARC Framework</a> &rsaquo; Modify tag<!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="heading-add-tag-p" --><a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Authority MARC Framework</a> &rsaquo; Add tag<!-- /TMPL_IF -->
+    <!-- TMPL_ELSE --><a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Authority MARC Framework</a> &rsaquo; <!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF --><!-- TMPL_ELSE --><!-- TMPL_IF NAME="delete_confirm" --><a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Authority MARC Framework</a> &rsaquo; Confirm Deletion<!-- TMPL_ELSE --><!-- TMPL_IF NAME="delete_confirmed" --><a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Authority MARC Framework</a> &rsaquo; Data Deleted<!-- TMPL_ELSE -->Authority MARC Framework<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
@@ -88,7 +95,6 @@ return false;
             <!-- TMPL_ELSE -->
                 <input type="checkbox" name="repeatable" id="repeatable" value="1" />
             <!-- /TMPL_IF -->
-            &nbsp;
         </p>
         <p><label for="mandatory">Mandatory</label>
             <!-- TMPL_IF NAME="mandatory" -->
@@ -96,16 +102,15 @@ return false;
             <!-- TMPL_ELSE -->
                 <input type="checkbox" name="mandatory" id="mandatory" value="1" />
             <!-- /TMPL_IF -->
-            &nbsp;
             </p>
         <p><label>Authorised value</label><!-- TMPL_VAR NAME="authorised_value" --> (if you select a value here, the indicators will be limited to the authorised value list)</p>
-        <p><label>&nbsp;</label><input type="button" value="OK" class="button" onclick="Check(this.form)" /></p>
+        <p><input type="button" value="OK" class="button" onclick="Check(this.form)" /></p>
     </form>
 <!-- /TMPL_IF -->
 
 
 <!-- TMPL_IF NAME="delete_confirm" -->
-
+<h3>Confirm Deletion</h3>
 <table>
     <tr>
         <td>tag</td>
@@ -114,17 +119,17 @@ return false;
     <tr>
         <td>&nbsp;</td><td><!-- TMPL_VAR NAME="liblibrarian" --></td>
     </tr>
-    <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+    
+    <tr><td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
         <input type="hidden" name="op" value="delete_confirmed" />
         <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR name="authtypecode" -->" />
-        <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
-    <tr><td colspan="2" align="center">CONFIRM DELETION</td></tr>
-    <tr><td><input type="submit" value="YES"></form></td><td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="NO" class="submit" /></form></td></tr>
+        <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" /><input type="submit" value="YES"></form></td><td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="NO" class="submit" /></form></td></tr>
+</table>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="delete_confirmed" -->
 
-    Data deleted
+    <h3>Data deleted</h3>
     <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
     <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR name="authtypecode" -->" />
     <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
@@ -175,8 +180,9 @@ return false;
         <th>Subfields</th>
         <th>Edit</th>
         <th>Delete</th>
+	</tr>
     <!-- TMPL_LOOP NAME="loop" -->
-    <tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
+		<!-- TMPL_IF NAME="toggle" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
         <td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
         <td><!-- TMPL_VAR NAME="liblibrarian" --></td>
         <td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
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 d6d37b0d52..a5f3b65ce9 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,15 +1,20 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Administration &rsaquo; <!-- TMPL_IF name="add_form" --><!-- TMPL_VAR name="action" --><!-- /TMPL_IF -->
+<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="else" -->Authorised values admin<!-- /TMPL_IF --></title>
+<!-- TMPL_IF name="else" -->Authorized values admin<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
-<!-- TMPL_INCLUDE NAME="header.inc" -->	
+<!-- TMPL_INCLUDE NAME="header.inc" -->
+<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF name="add_form" --><!-- TMPL_VAR name="action" --><!-- /TMPL_IF -->
-<!-- TMPL_IF name="delete_confirm" -->Confirm Deletion<!-- /TMPL_IF -->
-<!-- TMPL_IF name="else" -->Authorised values admin<!-- /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/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="delete_confirm" --> <a href="/cgi-bin/koha/admin/authorised_values.pl">Authorized Values</a> &rsaquo; Confirm Deletion<!-- /TMPL_IF -->
+<!-- TMPL_IF name="else" -->Authorized values admin<!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
@@ -23,7 +28,7 @@
 	   <!-- TMPL_IF name="action_add_value" -->Add authorised value<!-- /TMPL_IF -->
 	   <!-- TMPL_IF name="action_add_category" -->Add category<!-- /TMPL_IF -->
 	</h1>
-	<form class="inline" action="<!-- TMPL_VAR name="script_name" -->" name="Aform" method="post">
+	<form action="<!-- TMPL_VAR name="script_name" -->" name="Aform" method="post">
 	<input type="hidden" name="op" value="add_validate" />
         <table>
         <tr>
@@ -31,7 +36,7 @@
             <td><!-- TMPL_VAR name="category" --></td>
         </tr>
         <tr>
-            <th><label for="authorised_value">Authorised value</label></th>
+            <th><label for="authorised_value">Authorized value</label></th>
             <td><input type="text" id="authorised_value" name="authorised_value" value="<!-- TMPL_VAR name="authorised_value" -->" /></td>
         </tr>
         <tr>
@@ -55,7 +60,7 @@
 		<td>Description</td>
 		<td><!-- TMPL_VAR name="searchfield" --></td>
 	</tr>
-	<tr><td>Value</td><td><!-- TMPL_VAR name="Tvalue" --></td></tr>
+	<tr><td>Value</td><td><!-- TMPL_VAR name="Tvalue" --></td><td>&nbsp;</td></tr>
 	</table>
 	<form action="<!-- TMPL_VAR name=" script_name " -->" method="post">
 		<input type="hidden" name="op" value="delete_confirmed" />
@@ -63,18 +68,17 @@
 		<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>
 <!-- /TMPL_IF -->
 
-<!-- -->
 <!-- TMPL_IF name="else" -->
 
-<h1>Authorised values admin</h1>
-<p>This table is used in MARC definition. You can define as many categories as you want, and as many authorised values as you want in each category.</p>
-<p>When you define the MARC subfield structure, you can link a subfield to a authorised-value category. When the user ask for adding of modifying a biblio,
-the subfield is not entered through a free field, but though a list of authorised values</p>
+<h1>Authorized values admin</h1>
+<p>This table is used in MARC definition. You can define as many categories as you want, and as many authorized values as you want in each category.</p>
+<p>When you define the MARC subfield structure, you can link a subfield to a authorized-value category. When the user ask for adding of modifying a biblio,
+the subfield is not entered through a free field, but though a list of authorized values</p>
 <form action="/cgi-bin/koha/admin/authorised_values.pl" method="post"><label for="searchfield">Show Category: </label><!-- TMPL_VAR name="tab_list" --> <input type="submit" value="Submit" /></form>
 <table>
 <tr>
 	<th>Category</th>
-	<th>Authorised value</th>
+	<th>Authorized value</th>
 	<th>Description</th>
 	<th>Edit</th>
 	<th>Delete</th>
@@ -97,7 +101,7 @@ the subfield is not entered through a free field, but though a list of authorise
 <!-- /TMPL_IF --> 
 
 <div id="action">
-    <a href= "/cgi-bin/koha/admin/authorised_values.pl?op=add_form&category=<!-- TMPL_VAR NAME="category" -->">Add Authorised value for <!-- TMPL_VAR name="category" --></a>
+    <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>
 
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 a22bf3817a..c067aa36b9 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="authtypecode" -->Modify authority type<!-- TMPL_ELSE -->Add authority type<!-- /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; 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>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script type="text/javascript">
 //<![CDATA[
@@ -59,8 +59,9 @@ function Check(f) {
 </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; <!-- TMPL_IF NAME="authtypecode" -->Modify authority type<!-- TMPL_ELSE -->Add authority type<!-- /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; 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="doc3" class="yui-t2">
    
@@ -81,7 +82,7 @@ function Check(f) {
 				<tr><td><label for="authtypecode">Authority type<label></td><td><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" --></td></tr>
 			<!-- 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>
+				<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>
 			<!-- /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>
@@ -93,15 +94,13 @@ function Check(f) {
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="delete_confirm" -->
-<div>
-	<h2>Authority structure definition for <!-- TMPL_VAR NAME="authtypetext" --> (<!-- TMPL_VAR NAME="authtypecode" -->)</h2>
+	<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 -->
-	<p>CONFIRM DELETION</p>
-	<p>
+
 		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
 			<input type="hidden" name="op" value="delete_confirmed" />
 			<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
@@ -110,12 +109,12 @@ function Check(f) {
 		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
 			<input type="submit" value="NO" />
 		</form>
-	</p>
+
 
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="else" -->
-<h1>Auth type Admin</h1>
+<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>
 	<tr>
@@ -143,8 +142,8 @@ function Check(f) {
 <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
 	<input type="hidden" name="op" value="add_form" />
 	<input type="submit" value="Add authority type" />
-	<td width="33%"><!-- TMPL_IF NAME="previous" --><a href="<!-- TMPL_VAR NAME="previous" -->">&lt;&lt; Previous</a><!-- /TMPL_IF --></td>
-	<td width="33%"><!-- TMPL_IF NAME="next" --><a href="<!-- TMPL_VAR NAME="next" -->">Next &gt;&gt;</a><!-- /TMPL_IF --></td>
+	<!-- 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 -->
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 92432d1784..21488a0b86 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
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Administration &rsaquo; <!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="frameworkcode" -->Modify framework text<!-- TMPL_ELSE -->Add framework<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirm" -->Delete Framework for <!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)?<!-- /TMPL_IF --><!-- TMPL_IF NAME="else" -->Biblio Framework<!-- /TMPL_IF --></title>
+<title>Koha &rsaquo; Administration &rsaquo; <!-- TMPL_IF NAME="add_form" --> Biblio Framework &rsaquo; <!-- TMPL_IF NAME="frameworkcode" -->Modify framework text<!-- TMPL_ELSE -->Add framework<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirm" --> Biblio Framework &rsaquo; Delete Framework for <!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)?<!-- /TMPL_IF --><!-- TMPL_IF NAME="else" -->Biblio Framework<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script type="text/javascript">
 //<![CDATA[
@@ -59,8 +59,9 @@ function Check(f) {
 </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; <!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="frameworkcode" -->Modify framework text<!-- TMPL_ELSE -->Add framework<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirm" -->Delete Framework for <!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)?<!-- /TMPL_IF --><!-- TMPL_IF NAME="else" -->Biblio Framework<!-- /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/biblio_framework.pl">Biblio Framework</a> &rsaquo; <!-- TMPL_IF NAME="frameworkcode" -->Modify framework text<!-- TMPL_ELSE -->Add framework<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirm" --><a href="/cgi-bin/koha/admin/biblio_framework.pl">Biblio Framework</a> &rsaquo; Delete Framework for <!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)?<!-- /TMPL_IF --><!-- TMPL_IF NAME="else" -->Biblio Framework<!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
@@ -87,13 +88,11 @@ function Check(f) {
 <!-- TMPL_IF NAME="delete_confirm" -->
 <h3>Delete ramework for <!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)?</h3>
     <!-- TMPL_IF NAME="total" -->
-        <div class="error">This framework is used <!-- TMPL_VAR NAME="total" --> times
+        <div class="error">This framework is used <!-- TMPL_VAR NAME="total" --> times</div>
     <!-- /TMPL_IF -->
-    <p>
         <form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" /><input type="submit" value="Yes, Delete this Framework!" />
         </form>
         <form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="No, Do not Delete!" /></form>
-    </p>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="else" -->
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 fad647b7ad..3348cac1ce 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
@@ -5,6 +5,7 @@
 </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;  <!-- TMPL_IF NAME="editcategory" --><!-- TMPL_IF NAME="categorycode" --><a href="/cgi-bin/koha/admin/branches.pl">Branches</a> &rsaquo; Edit Branch Category <!-- TMPL_VAR NAME="categorycode" --><!-- TMPL_ELSE --><a href="/cgi-bin/koha/admin/branches.pl">Branches</a> &rsaquo; Add Branch Category<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_category" --><a href="/cgi-bin/koha/admin/branches.pl">Branches</a> &rsaquo; Confirm Deletion of Branch Category <!-- TMPL_VAR name="categorycode" --><!-- /TMPL_IF --><!-- TMPL_IF name="add" -->
     <!-- TMPL_IF name="heading-branches-add-branch-p" --><a href="/cgi-bin/koha/admin/branches.pl">Branches</a> &rsaquo; Add branch<!-- TMPL_ELSE --><a href="/cgi-bin/koha/admin/branches.pl">Branches</a> &rsaquo; Modify branch <!-- TMPL_VAR name="branchcode" --><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF name="delete_confirm" --><a href="/cgi-bin/koha/admin/branches.pl">Branches</a> &rsaquo; Confirm deletion of branch '<!-- TMPL_VAR NAME="branchcode" -->'<!-- /TMPL_IF --><!-- TMPL_IF name="else" -->Branches<!-- /TMPL_IF --></div>
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 0c5791b0e1..542fef08d7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl
@@ -72,6 +72,7 @@
 </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; <!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="categorycode" -->Modify category '<!-- TMPL_VAR NAME="categorycode" -->'<!-- TMPL_ELSE -->Add category<!-- /TMPL_IF --><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="add_validate" -->Data recorded<!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categoryitem.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categoryitem.tmpl
deleted file mode 100644
index 11e5c98fc5..0000000000
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categoryitem.tmpl
+++ /dev/null
@@ -1,327 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Administration &rsaquo; <!-- TMPL_IF NAME="categorycode" -->Modify category<!-- TMPL_ELSE -->Add category<!-- /TMPL_IF --></title>
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<script type="text/javascript">
-//<![CDATA[
-        //
-        function isNotNull(f,noalert) {
-                if (f.value.length ==0) {
-   return false;
-                }
-                return true;
-        }
-        //
-        function toUC(f) {
-                var x=f.value.toUpperCase();
-                f.value=x;
-                return true;
-        }
-        //
-        function isNum(v,maybenull) {
-        var n = new Number(v.value);
-        if (isNaN(n)) {
-                return false;
-                }
-        if (maybenull==0 && v.value=='') {
-                return false;
-        }
-        return true;
-        }
-        //
-        function isDate(f) {
-                var t = Date.parse(f.value);
-                if (isNaN(t)) {
-                        return false;
-                }
-        }
-        //
-        function Check(f) {
-                var ok=1;
-                var _alertString="";
-                var alertString2;
-                if (f.categorycode.value.length==0) {
-                        _alertString += "- categorycode missing\n";
-                }
-//              alert(window.document.Aform.description.value);
-                if (!(isNotNull(window.document.Aform.description,1))) {
-                        _alertString += "- description missing\n";
-                }
-                if (!isNum(f.upperagelimit,0)) {
-                        _alertString += "- upperagelimit is not a number\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;
-                }
-        }
-        //]]>
-</script>
-</head>
-<body>
-<!-- TMPL_INCLUDE NAME="header.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="categorycode" -->Modify category<!-- TMPL_ELSE -->Add category<!-- /TMPL_IF --></div>
-
-<!-- TMPL_IF NAME="add_form" -->
-        
-
-<div id="doc3" class="yui-t2">
-   
-   <div id="bd">
-	<div id="yui-main">
-	<div class="yui-b">
-		
-        <!-- TMPL_IF NAME="categorycode" -->
-                <h1>Modify category</h1>
-        <!-- TMPL_ELSE -->
-                <h1>Add category</h1>
-        <!-- /TMPL_IF -->
-
-        <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
-        <input type="hidden" name="op" value="add_validate" />
-        <input type="hidden" name="checked" value="0" />
-                        
-        <table>  
-        <!-- TMPL_IF NAME="categorycode" -->
-                <tr>
-                        <td>Category code</td>
-                        <td>
-                                <input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->" />
-                        </td>
-                </tr>
-        <!-- TMPL_ELSE -->
-                <tr>
-                        <td>Category code</td>
-                        <td>
-                                <input type="text" name="categorycode" size="3" maxlength="2" onblur="toUC(this)" />
-                        </td>
-                </tr>
-        <!-- /TMPL_IF -->
-                <tr>
-                        <td>Description</td>
-                        <td>
-                                <input type="text" name="description" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="description" -->" />
-                                &nbsp;
-                        </td>
-                </tr>
-                <tr>
-                        <td>Enrolment period</td>
-                        <td>
-                                <input type="text" name="enrolmentperiod" value="<!-- TMPL_VAR NAME="enrolmentperiod" -->" />
-                        </td>
-                </tr>
-                <tr>
-                        <td>Upperage limit</td>
-                        <td>
-                                <input type="text" name="upperagelimit" value="<!-- TMPL_VAR NAME="upperagelimit" -->" />
-                        </td>
-                </tr>
-                <tr>
-                        <td>Age Required</td>
-                        <td>
-                                <input type="text" name="dateofbirthrequired" value="<!-- TMPL_VAR NAME="dateofbirthrequired" -->" />
-                        </td>
-                </tr>
-                <tr>
-                        <td>Fine type</td>
-                        <td>
-                                <input type="text" name="finetype" size="30" maxlength="30" value="<!-- TMPL_VAR NAME="finetype" -->" />
-                        </td>
-                </tr>
-                <tr>
-                        <td>Bulk</td>
-                        <td>
-                                <input type="text" name="bulk" value="<!-- TMPL_VAR NAME="bulk" -->" />
-                        </td>
-                </tr>
-                <tr>
-                        <td>Enrolment fee</td>
-                        <td>
-                                <input type="text" name="enrolmentfee" value="<!-- TMPL_VAR NAME="enrolmentfee" -->" />
-                        </td>
-                </tr>
-                <tr>
-                        <td>Overdue notice required</td>
-                        <td>
-                                <input type="text" name="overduenoticerequired" value="<!-- TMPL_VAR NAME="overduenoticerequired" -->" />
-                        </td>
-                </tr>
-                <tr>
-                        <td>Issue limit</td>
-                        <td>
-                                <input type="text" name="issuelimit" value="<!-- TMPL_VAR NAME="issuelimit" -->" />
-                        </td>
-                </tr>
-                <tr>
-                        <td>Reserve fee</td>
-                        <td>
-                                <input type="text" name="reservefee" value="<!-- TMPL_VAR NAME="reservefee" -->" />
-                        </td>
-                </tr>
-                <tr>
-                        <td>&nbsp;</td>
-                        <td>
-                                <input type="button" value="OK" onclick="Check(this.form)" />
-                        </td>
-                </tr>
-        </table>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="add_validate" -->
-        Data recorded
-        <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-                <input type="submit" value="OK" />
-        </form>
-<!-- /TMPL_IF -->
-
-        TOTAL : <!-- TMPL_VAR NAME="categorycode" --> : <!-- TMPL_VAR NAME="total" --><br />
-                    
-        <table>
-                <tr>
-                        <td>
-                                Category code
-                        </td>
-                        <td>
-                                <!-- TMPL_VAR NAME="categorycode" -->
-                        </td>
-                </tr>
-                <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" -->" />
-                <tr>
-                        <td>Description</td>
-                        <td><!-- TMPL_VAR NAME="description" --></td>
-                </tr>
-                <tr>
-                        <td>Enrolment period</td>
-                        <td><!-- TMPL_VAR NAME="enrolmentperiod" --></td>
-                </tr>
-                <tr>
-                        <td>Upperage limit</td>
-                        <td><!-- TMPL_VAR NAME="upperagelimit" --></td>
-                </tr>
-                <tr>
-                        <td>Age Required</td>
-                        <td><!-- TMPL_VAR NAME="dateofbirthrequired" --></td>
-                </tr>
-                <tr>
-                        <td>Fine type</td>
-                        <td><!-- TMPL_VAR NAME="finetype" --></td>
-                </tr>
-                <tr>
-                        <td>Bulk</td>
-                        <td><!-- TMPL_VAR NAME="bulk" --></td>
-                </tr>
-                <tr>
-                        <td>Enrolment fee</td>
-                        <td><!-- TMPL_VAR NAME="enrolmentfee" --></td>
-                </tr>
-                <tr>
-                        <td>Overdue notice required</td>
-                        <td><!-- TMPL_VAR NAME="overduenoticerequired" --></td>
-                </tr>
-                <tr>
-                        <td>Issue limit</td>
-                        <td><!-- TMPL_VAR NAME="issuelimit" --></td>
-                </tr>
-                <tr>
-                        <td>Reserve fee</td>
-                        <td><!-- TMPL_VAR NAME="reservefee" --></td>
-                </tr>
-                <!-- TMPL_IF NAME="totalgtzero" -->
-                <tr>
-                        <td colspan="2">This record is used <!-- TMPL_VAR NAME="total" --> times. Deletion not possible</td>
-                </tr>
-               <tr>
-                        <td colspan="2">
-                                </form><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-                                <input type="submit" value="OK" />
-                                </form>
-                        </td>
-                </tr>
-                <!-- TMPL_ELSE -->
-                <tr>
-                        <td colspan="2">CONFIRM DELETION</td>
-                </tr>
-                <tr>
-                        <td><input type="submit" value="YES" /></form></td>
-                        <td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="NO" /></form></td>
-                </tr>
-                <!-- /TMPL_IF -->
-
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="delete_confirmed" -->
-        data deleted
-        <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post" />
-        <input type="submit" value="OK" />
-        </form>
-
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="else" -->
-        <h2>Category admin</h2>
-        <!-- TMPL_IF NAME="searchfield" -->
-                You Searched for <!-- TMPL_VAR NAME="searchfield" -->
-        <!-- /TMPL_IF -->
-
-        <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-                <input type="text" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->" />
-                <input type="reset" name="reset" value="clr" />
-        </form>
-
-        <table>
-                <tr>
-                        <th>Category</th>
-                        <th>Description</th>
-                        <th>Enrolment</th>
-                        <th>Upper Age Limit</th>
-                        <th>Age Required</th>
-                        <th>Fine</th>
-                        <th>Bulk</th>
-                        <th>Fee</th>
-                        <th>Overdue</th>
-                        <th>Issue Limit</th>
-                        <th>Reserve</th>
-                        <th>&nbsp;</th>
-                        <th>&nbsp;</th>
-                </tr>
-                <!-- TMPL_LOOP NAME="loop" -->
-                <tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
-                        <td><!-- TMPL_VAR NAME="categorycode" --></td>
-                        <td><!-- TMPL_VAR NAME="description" --></td>
-                        <td><!-- TMPL_VAR NAME="enrolmentperiod" --></td>
-                        <td><!-- TMPL_VAR NAME="upperagelimit" --></td>
-                        <td><!-- TMPL_VAR NAME="dateofbirthrequired" --></td>
-                        <td><!-- TMPL_VAR NAME="finetype" --></td>
-                        <td><!-- TMPL_VAR NAME="bulk" --></td>
-                        <td><!-- TMPL_VAR NAME="enrolmentfee" --></td>
-                        <td><!-- TMPL_VAR NAME="overduenoticerequired" --></td>
-                        <td><!-- TMPL_VAR NAME="issuelimit" --></td>
-                        <td><!-- TMPL_VAR NAME="reservefee" --></td>
-                        <td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->">Edit</a></td>
-                        <td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->">Delete</a></td></tr>
-                <!-- /TMPL_LOOP -->
-
-        </table>
-        <p><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-                <input type="hidden" name="op" value="add_form" />
-                <input type="submit" value="Add Category" /></a><br />
-        </form></p>
-<!-- /TMPL_IF -->
-
-
-</div>
-</div>
-<div class="yui-b">
-<!-- TMPL_INCLUDE NAME="admin-menu.inc" -->
-</div>
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-
-
-
-
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/charges.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/charges.tmpl
deleted file mode 100644
index 630eccc458..0000000000
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/charges.tmpl
+++ /dev/null
@@ -1,47 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Administration &rsaquo; Fines</title>
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-</head>
-<body>
-<!-- TMPL_INCLUDE NAME="header.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; Fines</div>
-
-<div id="doc3" class="yui-t2">
-   
-   <div id="bd">
-	<div id="yui-main">
-	<div class="yui-b">
-
-<h2>Calculating Fines</h2>
-<p>Each box needs to be filled in with fine,time to start charging,charging cycle</p>
-<p>eg 1,7,7 = $1 fine, after 7 days, every 7 days</p>
-<p>Note : fines are calculated by the fines2.pl</span> script, located in misc</span> directory. Ask your administrator to put this script in crontab (after midnight) to have fines calculated every night</p>
-<form action="/cgi-bin/koha/admin/updatecharges.pl" method="post">
-<div class="table"><table>
-<tr>
-	<th>&nbsp;</th><!-- TMPL_LOOP NAME="title" --><th><!-- TMPL_VAR NAME="in_title" --></th><!-- /TMPL_LOOP -->
-</tr>
-<!-- TMPL_LOOP NAME="row" -->
-	<tr>
-		<th>
-			<!-- TMPL_VAR NAME="categorycode" -->
-		</th>
-		<!-- TMPL_LOOP NAME="cell" -->
-			<td bgcolor="<!-- TMPL_VAR name="toggle" -->">
-				<input name="<!-- TMPL_VAR name="inputname" -->" value="<!-- TMPL_VAR name="inputvalue" -->" size="6" maxlength="10" />
-			</td>
-		<!-- /TMPL_LOOP -->
-	</TR>
-<!-- /TMPL_LOOP -->
-</table>
-<input type="submit" value="Submit Changes" />
-</form>
-
-</div>
-</div>
-<div class="yui-b">
-<!-- TMPL_INCLUDE NAME="admin-menu.inc" -->
-</div>
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl
index e77d001f13..27f526bbfc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl
@@ -1,13 +1,14 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Administration &rsaquo; MARC Check
-<!-- TMPL_IF name="total" --> &rsaquo; <!-- TMPL_VAR name="total" --> errors found<!-- TMPL_ELSE --> &rsaquo; Configuration OK!<!-- /TMPL_IF --></title>
+<!-- TMPL_IF name="total" --> :<!-- TMPL_VAR name="total" --> errors found<!-- TMPL_ELSE --> : Configuration OK!<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </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; MARC Check
-<!-- TMPL_IF name="total" --> &rsaquo; <!-- TMPL_VAR name="total" --> errors found<!-- TMPL_ELSE --> &rsaquo; Configuration OK!<!-- /TMPL_IF --></div>
+<!-- TMPL_IF name="total" -->: <!-- TMPL_VAR name="total" --> errors found<!-- TMPL_ELSE --> : Configuration OK!<!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
@@ -15,7 +16,7 @@
 	<div id="yui-main">
 	<div class="yui-b">
 
-<h1>MARC Checking</h1>
+<h1>MARC Bibliographic Framework Test</h1>
 <table>
     <tr>
         <th>Test</th>
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 c0d9c7d473..3c6e3f9e5b 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; Cities</title>
+<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>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script type="text/javascript">
 //<![CDATA[
@@ -52,8 +52,9 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
+<!-- TMPL_INCLUDE NAME="cities-admin-menu.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; Cities</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 --> 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="doc3" class="yui-t2">
    
@@ -69,9 +70,9 @@
 	<!-- /TMPL_IF -->
 
 	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
-	<input type="hidden" name="op" value="add_validate">
-	<input type="hidden" name="checked" value="0">
-	<input type="hidden" name="cityid" value="<!-- TMPL_VAR NAME="cityid" -->">
+	<input type="hidden" name="op" value="add_validate" />
+	<input type="hidden" name="checked" value="0" />
+	<input type="hidden" name="cityid" value="<!-- TMPL_VAR NAME="cityid" -->" />
 
 	<!-- TMPL_IF NAME="cityid" -->
 		<p class="p_borrowers">
@@ -82,22 +83,21 @@
 	<!-- /TMPL_IF -->
 	<p>
 	<label>City name</label>
-	<input  type="text" name="city_name" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="city_name" ESCAPE="HTML" -->">&nbsp;
+	<input  type="text" name="city_name" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="city_name" ESCAPE="HTML" -->" />
 	</p>
 	<p>				
 	<label>City zipcode</label>
-	<input type="text" name="city_zipcode" size="10" maxlength="10" value="<!-- TMPL_VAR NAME="city_zipcode" -->">
+	<input type="text" name="city_zipcode" size="10" maxlength="10" value="<!-- TMPL_VAR NAME="city_zipcode" -->" />
 	</p>
 	
 	<p>
-	<div >
-		<input class="button" type="button" onclick="Check(this.form)" value="OK">
-	</div>	
+		<input class="button" type="button" onclick="Check(this.form)" value="OK" />
 	</p>
 	</form>
 
 <!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="delete_confirm" -->
+<h3>Confirm Deletion of City</h3>
 	<table>
 		<tr>
 			<td>
@@ -107,37 +107,33 @@
 				<!-- TMPL_VAR NAME="cityid" -->
 			</td>
 		</tr>
-		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-			<input type="hidden" name="op" value="delete_confirmed">
-			<input type="hidden" name="cityid" value="<!-- TMPL_VAR NAME="cityid" -->">        
+		        
 		<tr>
-			<td>city name</td>
+			<td>City name</td>
 			<td><!-- TMPL_VAR NAME="city_name" --></td>
 		</tr>
 		<tr>
 			<td>City zipcode</td>
 			<td><!-- TMPL_VAR NAME="city_zipcode" --></td>
 		</tr>
-		</tr>
 		<!-- TMPL_IF NAME="totalgtzero" -->
 		<tr>
 			<td colspan="2" align="center" class="problem">This record is used <!-- TMPL_VAR NAME="total" --> times. Impossible to delete it</td>
 		</tr>
 	<tr>
 			<td colspan="2">
-				</form><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-				<input type="submit" value="OK">
+				<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+				<input type="submit" value="OK" />
 				</form>
 			</td>
 		</tr>
 		<!-- TMPL_ELSE -->
 		<tr>
-			<td colspan="2" align="center">confirm deletion</td>
-		</tr>
-		<tr>
-			<td><input type="submit" value="YES"></form></td>
 			<td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-			<input type="submit" value="NO"></form></td>
+			<input type="hidden" name="op" value="delete_confirmed" />
+			<input type="hidden" name="cityid" value="<!-- TMPL_VAR NAME="cityid" -->" /><input type="submit" value="YES" /></form></td>
+			<td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+			<input type="submit" value="NO" /></form></td>
 		</tr>
 		<!-- /TMPL_IF -->
 </table>
@@ -148,10 +144,6 @@
 	<!-- TMPL_IF NAME="searchfield" -->
 		Searching: <!-- TMPL_VAR NAME="searchfield" -->
 	<!-- /TMPL_IF -->
-	<form action="<TMPL_VAR NAME="script_name">" method="post">
-		<input type="text" name="city_name" value="<!-- TMPL_VAR NAME="searchfield" -->">
-		<input type="submit" name="submit" value="OK" class="button">
-	</form>
 
 	<table>
 		<tr>
@@ -178,10 +170,10 @@
 		<!-- /TMPL_LOOP -->
 
 	</table>
-	<p><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
 		<input type="hidden" name="op" value="add_form" />
-		<input type="submit" class="button" value="Add a city"  alt="Add city" /><br />
-	</form></p>
+		<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/finesrules.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/finesrules.tmpl
index 5f63f74488..eee2b37f05 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/finesrules.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/finesrules.tmpl
@@ -4,6 +4,7 @@
 </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; Fines</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 10319b07c7..8a38adb394 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/issuingrules.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/issuingrules.tmpl
@@ -4,6 +4,7 @@
 </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;  Issuing Rules</div>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl
index 65407b3f52..0789e5eade 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl
@@ -81,6 +81,7 @@ function Check(f) {
 </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; <!-- TMPL_IF name="add_form" -->
   <!-- TMPL_IF name="itemtype" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl
index efbec67412..6e4971c906 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl
@@ -7,6 +7,7 @@
 </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; <!-- TMPL_IF name="add_form" --><!-- TMPL_VAR name="action" --><!-- /TMPL_IF -->
 <!-- TMPL_IF name="else" -->MARC links <!-- TMPL_VAR name="tagfield" --><!-- /TMPL_IF --></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 4ba8b6a571..9d9eba98e0 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
@@ -1,7 +1,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Administration &rsaquo;
-<!-- TMPL_IF name="add_form" --><!-- TMPL_IF NAME="modify" -->Modify system preference '<!-- TMPL_VAR NAME="searchfield" -->'<!-- TMPL_ELSE -->Add a system preference<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF name="add_validate" -->Data Added<!-- /TMPL_IF -->
-<!-- TMPL_IF name="delete_confirm" -->Confirm Deletion of Parameter '<!-- TMPL_VAR name="searchfield" -->'<!-- /TMPL_IF --><!-- TMPL_IF name="delete_confirmed" -->Parameter Deleted<!-- /TMPL_IF --><!-- TMPL_IF name="else" -->Preferences<!-- /TMPL_IF --></title>
+<title>Koha &rsaquo; Administration &rsaquo;<!-- TMPL_IF name="add_form" --><!-- TMPL_IF NAME="use-heading-flags-p" --><!-- TMPL_IF NAME="heading-edit-subfields-p" --> MARC Subfield Structure &rsaquo; Edit MARC subfields constraints<!-- /TMPL_IF --><!-- TMPL_ELSE --> MARC Subfield Structure &rsaquo; <!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF --><!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirm" --> MARC Subfield Structure &rsaquo; Confirm Deletion of Subfield <!-- TMPL_VAR NAME="tagsubfield" --><!-- /TMPL_IF --><!-- TMPL_IF name="delete_confirmed" --> MARC Subfield Structure &rsaquo; Subfield Deleted<!-- /TMPL_IF --><!-- TMPL_IF name="else" -->MARC Subfield Structure<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script type="text/javascript">
 //<![CDATA[
@@ -50,9 +49,10 @@ function displayMoreConstraint(numlayer){
 </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; <!-- TMPL_IF name="add_form" --><!-- TMPL_IF NAME="modify" -->Modify system preference '<!-- TMPL_VAR NAME="searchfield" -->'<!-- TMPL_ELSE -->Add a system preference<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF name="add_validate" -->Data Added<!-- /TMPL_IF -->
-<!-- TMPL_IF name="delete_confirm" -->Confirm Deletion of Parameter '<!-- TMPL_VAR name="searchfield" -->'<!-- /TMPL_IF --><!-- TMPL_IF name="delete_confirmed" -->Parameter Deleted<!-- /TMPL_IF --><!-- TMPL_IF name="else" -->Preferences<!-- /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="use-heading-flags-p" --><!-- TMPL_IF NAME="heading-edit-subfields-p" --> <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl">MARC Subfield Structure</a> &rsaquo; Edit MARC subfields constraints<!-- /TMPL_IF --><!-- TMPL_ELSE --> <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl">MARC Subfield Structure</a> &rsaquo; <!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF --><!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirm" --> <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl">MARC Subfield Structure</a> &rsaquo; Confirm Deletion of Subfield <!-- TMPL_VAR NAME="tagsubfield" --><!-- /TMPL_IF --><!-- TMPL_IF name="delete_confirmed" --> <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl">MARC Subfield Structure</a> &rsaquo; Subfield Deleted<!-- /TMPL_IF --><!-- TMPL_IF name="else" -->MARC Subfield Structure<!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
@@ -106,22 +106,22 @@ function displayMoreConstraint(numlayer){
             <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>
             
             <a href="javascript:displayMoreConstraint('more<!-- TMPL_VAR NAME="subfieldcode" -->')">display more constraints</a>
-            <span id="more<!-- TMPL_VAR NAME="subfieldcode" -->" class="content_hidden">
+            <div id="more<!-- TMPL_VAR NAME="subfieldcode" -->" class="content_hidden">
                 <h3>Advanced constraint</h3>
                 <p>
                     <label for="defaultvalue">default value</label>
                     <input type="text" name="defaultvalue" id="defaultvalue" value="<!-- TMPL_VAR NAME="defaultvalue" -->" />
                 </p>
-                <p><label for="hidden">hidden</label><input type="text" id="hidden<!-- TMPL_VAR NAME="row" -->" name="hidden" value="<!-- TMPL_VAR name="hidden" -->" size="2" /> (see online help)</label></p>
+                <p><label for="hidden">hidden</label><input type="text" id="hidden<!-- TMPL_VAR NAME="row" -->" name="hidden" value="<!-- TMPL_VAR name="hidden" -->" size="2" /> (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><label>Link</label><input type="text" name="link" value="<!-- TMPL_VAR NAME="link" -->" size="10" maxlength="5" /> (exemple:200b)</p>
-                <p><label>Others Options: <p>(choose one)</p></label>
+                <p><label>Others Options:</label> (choose one)</p>
                     <p><label>Authorized Value</label><!-- TMPL_VAR NAME="authorised_value" --></p>
                     <p><label>Thesaurus</label><!-- TMPL_VAR NAME="authtypes" --></p>
                     <p><label>Plugin</label><!-- TMPL_VAR NAME="value_builder" --></p>
                 </p>
                 <p><label for="kohafield<!-- TMPL_VAR NAME="row" -->">Koha link</label><!-- TMPL_VAR NAME="kohafield" --></p>
-            </span>
+            </div>
         </div>
         <!-- /TMPL_LOOP -->
     </div>
@@ -130,25 +130,32 @@ function displayMoreConstraint(numlayer){
 
 <!-- TMPL_IF NAME="delete_confirm" -->
 
-<table>
-<caption>Confirm Deletion of Subfield <!-- TMPL_VAR NAME="tagsubfield" -->?</span></caption>
-    <tr>
-        <th>Subfield</th>
-        <td><!-- TMPL_VAR NAME="tagsubfield" --></td>
-    </tr>
+<h3>Confirm Deletion of Subfield <!-- TMPL_VAR NAME="tagsubfield" -->?</h3>
+    <p>Subfield: <!-- TMPL_VAR NAME="tagsubfield" --></p>
     <p>Description<!-- TMPL_VAR NAME="liblibrarian" --></p>
-</table>
-            <form class="inline" action="<!-- TMPL_VAR NAME="delete_link" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" />
+
+            <form action="<!-- TMPL_VAR NAME="delete_link" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" />
                 <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="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" /><input type="submit" value="Yes, Delete this Subfield" />
-            </form> <form class="inline" 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="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />	<input type="submit" value="No, Do Not Delete" />
+                <input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->" />
+				<input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->" />
+				<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
+				<input type="submit" 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="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
+			<input type="submit" value="No, Do Not Delete" />
             </form>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="delete_confirmed" -->
 
-    Data deleted
-    <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->">
+    <h3>Data deleted</h3>
+    <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+	<input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->" />
     <input type="submit" value="OK" />
     </form>
 <!-- /TMPL_IF -->
@@ -165,6 +172,7 @@ function displayMoreConstraint(numlayer){
     <th>Text</th>
     <th>Constraints</th>
     <th>Delete</th>
+</tr>
 <!-- TMPL_LOOP NAME="loop" -->
 <!-- TMPL_IF NAME="toggle" --><tr class="highlighted"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
     <td><!-- TMPL_VAR NAME="tagsubfield" --></td>
@@ -196,24 +204,23 @@ function displayMoreConstraint(numlayer){
 </tr>
 <!-- /TMPL_LOOP -->
 </table>
-<form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="get">
+<form action="<!-- TMPL_VAR NAME="script_name" -->" method="get">
     <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" />
 </form>
-<form class="inline" action="marctagstructure.pl" method="get">
+<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" />
-    </a><!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="next" -->
     <!-- TMPL_VAR NAME="next" -->
         <input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1rightarrow.png" title="next" alt="next" border="0" />
-    </a>
 <!-- /TMPL_IF -->
 <!-- /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 bfbc10cf63..182724680c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl
@@ -1,9 +1,9 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Administration &rsaquo;
-<!-- TMPL_IF name="add_form" --><!-- TMPL_VAR name="action" --><!-- /TMPL_IF -->
-<!-- TMPL_IF name="delete_confirm" -->Confirm Deletion of Tag '<!-- TMPL_VAR name="searchfield" -->'<!-- /TMPL_IF -->
-<!-- TMPL_IF name="delete_confirmed" -->Data Deleted<!-- /TMPL_IF -->
-<!-- TMPL_IF name="else" -->MARC tag Structure<!-- /TMPL_IF --></title>
+<!-- TMPL_IF name="add_form" -->MARC Tag Structure &rsaquo; <!-- TMPL_VAR name="action" --><!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirm" -->MARC Tag Structure &rsaquo; Confirm Deletion of Tag '<!-- TMPL_VAR name="searchfield" -->'<!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirmed" -->MARC Tag Structure &rsaquo;  Data Deleted<!-- /TMPL_IF -->
+<!-- TMPL_IF name="else" -->MARC Tag Structure<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script type="text/javascript">
 //<![CDATA[
@@ -60,10 +60,11 @@
 </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; <!-- TMPL_IF name="add_form" --><!-- TMPL_VAR name="action" --><!-- /TMPL_IF -->
-<!-- TMPL_IF name="delete_confirm" -->Confirm Deletion of Tag '<!-- TMPL_VAR name="searchfield" -->'<!-- /TMPL_IF -->
-<!-- TMPL_IF name="delete_confirmed" -->Data Deleted<!-- /TMPL_IF -->
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF name="add_form" --> <a href="/cgi-bin/koha/admin/marctagstructure.pl">MARC Tag Structure</a> &rsaquo; <!-- TMPL_VAR name="action" --><!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirm" --> <a href="/cgi-bin/koha/admin/marctagstructure.pl">MARC Tag Structure</a> &rsaquo; Confirm Deletion of Tag '<!-- TMPL_VAR name="searchfield" -->'<!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirmed" --> <a href="/cgi-bin/koha/admin/marctagstructure.pl">MARC Tag Structure</a> &rsaquo; Data Deleted<!-- /TMPL_IF -->
 <!-- TMPL_IF name="else" -->MARC tag Structure<!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
@@ -76,7 +77,7 @@
 
 
 <!-- TMPL_IF NAME="add_form" -->
-<!-- ------------------------------------------------------------------------ -->
+
     <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
         <input type="hidden" name="op" value="add_validate" />
 	<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
@@ -96,24 +97,27 @@
 
 
 <!-- TMPL_IF NAME="delete_confirm" -->
-<!-- ------------------------------------------------------------------------ -->
-<table>
-<caption>Confirm Deletion of Tag <em><!-- TMPL_VAR NAME="searchfield" --></em>?</caption>
+
+<h3>Confirm Deletion of Tag <em><!-- TMPL_VAR NAME="searchfield" --></em>?</h3>
     <p>Tag: <!-- TMPL_VAR NAME="searchfield" --></p>
     <p>Description: <!-- TMPL_VAR NAME="liblibrarian" --></p>
-    </table>
-    <form class="inline" 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="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />	<input type="submit" value="Yes, Delete this Tag" /></form> <form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="No, Do Not Delete" /></form>
+    <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="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
+	<input type="submit" value="Yes, Delete this Tag" /></form>
+	
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="No, Do Not Delete" /></form>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="delete_confirmed" -->
-<!-- ------------------------------------------------------------------------ -->
+
     <div class="details"><h3>Tag Deleted</h3>
     <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
     <input type="submit" value="Return to MARC Tag Structure" />
     </form>
 <!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="framework_create" -->
-<!-- ------------------------------------------------------------------------ -->
+
     <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
         <input type="hidden" name="op" value="framework_create_confirm" />
         <input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
@@ -128,7 +132,7 @@
     </form>
 <!-- /TMPL_IF -->
 
-<!-- ------------------------------------------------------------------------ -->
+
 <!-- TMPL_IF NAME="else" -->
 
 <form name="f" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
@@ -169,7 +173,8 @@
         <th>Subfields</th>
         <th>Edit</th>
         <th>Delete</th>
-                <tr>
+	</tr>
+
     <!-- TMPL_IF NAME="select_display" -->
         <!-- TMPL_LOOP NAME="loop" -->
             <!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
@@ -182,7 +187,7 @@
             <td><a href="<!-- TMPL_VAR NAME="edit" -->">Edit</a></td>
             <td><a href="<!-- TMPL_VAR NAME="delete" -->">Delete</a></td>
         </tr>
-            <!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
+      <!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
             <td>
                 &nbsp;
             </td>
@@ -212,12 +217,11 @@
     </table>
     <!-- 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 class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-    <input type="hidden" name="op" value="add_form" />
+        <!-- /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="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" -->
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 1f868991af..e4135d2719 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl
@@ -65,6 +65,7 @@
 </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; <!-- 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 -->
 <!-- TMPL_IF NAME="add_validate" --> <a href="/cgi-bin/koha/admin/printers.pl">Printers</a> &rsaquo; Printer Added<!-- /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 e03f9d9b14..55560ec5d5 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; Road Types</title>
+<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>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script type="text/javascript">
 //<![CDATA[
@@ -52,8 +52,8 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.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; Road Types</div>
+<!-- TMPL_INCLUDE NAME="roadtype-admin-menu.inc" -->
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF NAME="add_form" --><a href="/cgi-bin/koha/admin/roadtype.pl">Road Types</a> &rsaquo; <!-- TMPL_IF NAME="roadtypeid" --> Modify Road Type<!-- TMPL_ELSE --> Add Road Type<!-- /TMPL_IF --><!-- TMPL_ELSE --><!-- TMPL_IF NAME="delete_confirm" --><a href="/cgi-bin/koha/admin/roadtype.pl">Road Types</a> &rsaquo; Confirm Deletion of Road Type<!-- TMPL_ELSE --> Road Type<!-- /TMPL_IF --><!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
@@ -62,7 +62,7 @@
 	<div class="yui-b">
 
 <!-- TMPL_IF NAME="add_form" -->
-	<!-- TMPL_IF NAME="id_city" -->
+	<!-- TMPL_IF NAME="roadtypeid" -->
 		<h1>Modify road type</h1>
 	<!-- TMPL_ELSE -->
 		<h1>Add road type</h1>
@@ -76,7 +76,6 @@
 <!-- TMPL_IF NAME="roadtypeid" -->
 
 	<p>
-
 	<label>Road type</label>
 	<label><b><!-- TMPL_VAR NAME="roadtypeid" --></b></label>
 	</p>
@@ -90,33 +89,26 @@
 	</p>
 	
 	<p>					  
-	<div >
-		<input class="button" type="button" onclick="Check(this.form)" value="OK" />
-	</div>	
+	<input class="button" type="button" onclick="Check(this.form)" value="OK" />	
 	</p>
 	</form>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="delete_confirm" -->
+	<h3>Confirm Deletion of Road Type</h3>
 	<table>
 		<tr>
 			<th>Road type id </th>
-			<td>
-				<!-- TMPL_VAR NAME="roadtypeid" -->
-			</td>
+			<td><!-- TMPL_VAR NAME="roadtypeid" --></td>
 		</tr>
-		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-			<input type="hidden" name="op" value="delete_confirmed" />
-			<input type="hidden" name="roadtypeid" value="<!-- TMPL_VAR NAME="roadtypeid" -->" />
 		<tr>
-			<td>Road type</td>
+			<th>Road type</th>
 			<td><!-- TMPL_VAR NAME="road_type" --></td>
 		</tr>
 		<tr>
-			<td colspan="2" align="center">Confirm deletion</td>
-		</tr>
-		<tr>
-			<td><input type="submit" value="YES" /></form></td>
+			<td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+			<input type="hidden" name="op" value="delete_confirmed" />
+			<input type="hidden" name="roadtypeid" value="<!-- TMPL_VAR NAME="roadtypeid" -->" /><input type="submit" value="YES" /></form></td>
 			<td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
 			<input type="submit" value="NO" /></form></td>
 		</tr>	
@@ -128,16 +120,12 @@
 	<!-- TMPL_IF NAME="searchfield" -->
 		Search on  <!-- TMPL_VAR NAME="searchfield" -->
 	<!-- /TMPL_IF -->
-	<form action="<TMPL_VAR NAME="script_name">" method="post">
-		<input type="text" name="road_type" value="<!-- TMPL_VAR NAME="searchfield" -->" />
-		<input type="submit" name="submit" value="OK" class="button" />
-	</form>
+
 
 	<table>
 		<tr>
 			<th>Road type</th>
-			<th>&nbsp;</th>
-			<th>&nbsp;</th>
+			<th colspan="2">&nbsp;</th>
 		</tr>
 		<!-- TMPL_LOOP NAME="loop" -->
 		<!-- TMPL_IF NAME="toggle" -->
@@ -146,8 +134,8 @@
 		<tr>
 		<!-- /TMPL_IF -->
 			<td><!-- TMPL_VAR NAME="road_type" --></td>
-			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;roadtypeid=<!-- TMPL_VAR NAME="roadtypeid" -->">edit</a></td>
-			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;roadtypeid=<!-- TMPL_VAR NAME="roadtypeid" -->">delete</a></td>
+			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;roadtypeid=<!-- TMPL_VAR NAME="roadtypeid" -->">Edit</a></td>
+			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;roadtypeid=<!-- TMPL_VAR NAME="roadtypeid" -->">Delete</a></td>
 		</tr>
 		<!-- /TMPL_LOOP -->
 
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 5393d3feb5..dee50cd319 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tmpl
@@ -61,6 +61,7 @@
 </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; <!-- TMPL_IF name="add_form" --><!-- TMPL_IF NAME="modify" -->Modify system preference '<!-- TMPL_VAR NAME="searchfield" -->'<!-- TMPL_ELSE -->Add a system preference<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF name="add_validate" -->Data Added<!-- /TMPL_IF -->
 <!-- TMPL_IF name="delete_confirm" -->Confirm Deletion of Parameter '<!-- TMPL_VAR name="searchfield" -->'<!-- /TMPL_IF --><!-- TMPL_IF name="delete_confirmed" -->Parameter Deleted<!-- /TMPL_IF --><!-- TMPL_IF name="else" -->Preferences<!-- /TMPL_IF --></div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/thesaurus.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/thesaurus.tmpl
deleted file mode 100644
index ef2f4038fd..0000000000
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/thesaurus.tmpl
+++ /dev/null
@@ -1,171 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Administration &rsaquo; Thesaurus Management</title>
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-</head>
-<body>
-<!-- TMPL_INCLUDE NAME="header.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; Thesaurus Management</div>
-
-<div id="doc3" class="yui-t2">
-   
-   <div id="bd">
-	<div id="yui-main">
-	<div class="yui-b">
-
-<!-- TMPL_IF name="detail_form" -->
-<table>
-    <caption>Thesaurus management</caption>
-    <tr>
-        <td>Values related to <!-- TMPL_VAR name="stdlib" --> (<!-- TMPL_VAR name="category" -->)</td>
-    </tr>
-    </table>
-
-    <table>
-    <tr>
-        <th>Other forms</th>
-        <th>&nbsp;</th>
-        <th>&nbsp;</th>
-    </tr>
-    <!-- TMPL_LOOP name="loop" -->
-    <tr>
-        <td><!-- TMPL_VAR name="freelib" --></td>
-        <td><a href="<!-- TMPL_VAR name="edit" -->">Edit</a></td>
-        <td><a href="<!-- TMPL_VAR name="delete" -->">Delete</a></td>
-    </tr>
-    <!-- /TMPL_LOOP -->
-    <form action="<!-- TMPL_VAR name="script_name" -->" method="post">
-    <input type="hidden" name="op" value="add_form" />
-    </table>
-    <form action="<!-- TMPL_VAR name="script_name" -->" method="post">
-    <input type="hidden" name="op" value="add_form" />
-    <input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->" />
-    <input type="hidden" name="stdlib" value="<!-- TMPL_VAR name="stdlib" -->" />
-    <input type="submit" value="Add thesaurus entry" />
-    </form>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF name="add_form" -->
-<!-- -->
-
-    <form action="<!-- TMPL_VAR name="script_name" -->" name="Aform" method="post">
-    <h1><!-- TMPL_IF name="search_category" -->Add<!-- TMPL_ELSE -->Modify<!-- /TMPL_IF --></h1><!-- TMPL_IF name="search_category" -->
-        <input type="hidden" name="op" value="add_validate" />
-    <!-- TMPL_ELSE -->
-        <input type="hidden" name="op" value="mod_validate" />
-    <!-- /TMPL_IF --><table>
-    <tr>
-        <td>Category</td>
-        <td><!-- TMPL_VAR name="category" --></td>
-    </tr>
-    <tr>
-        <td>Authority lib</td>
-        <!-- TMPL_IF name="id" -->
-            <td><!-- TMPL_VAR name="father" --><!-- TMPL_VAR name="stdlib" --><input type="hidden" name="stdlib" value="<!-- TMPL_VAR name="stdlib" -->" /></td>
-        <!-- TMPL_ELSE -->
-            <td><!-- TMPL_VAR name="father" --><input type="text" name="stdlib" value="<!-- TMPL_VAR name="stdlib" escape="HTML" -->" maxlength="80" size="80" /></td>
-        <!-- /TMPL_IF -->
-    </tr>
-    <tr>
-        <td>Other lib</td>
-        <td><!-- TMPL_VAR name="father" --><input type="text" name="freelib" value="<!-- TMPL_VAR name="freelib" escape="HTML" -->" maxlength="80" size="80" /></td>
-    </tr>
-    </table>
-    <p><input type="hidden" name="id" value="<!-- TMPL_VAR name="id" -->" />
-            <input type="hidden" name="father" value="<!-- TMPL_VAR name="father" escape="HTML" -->" />
-            <input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" escape="HTML" -->" />
-            <input type="hidden" name="search_category" value="<!-- TMPL_VAR name="search_category" -->" />
-            <input type="hidden" name="searchstring" value="<!-- TMPL_VAR name="searchstring" escape="HTML" -->" />
-            <input type="hidden" name="offset" value="<!-- TMPL_VAR name="offset" -->" />
-            <!-- TMPL_IF name="search_category" -->
-                <input type="submit" value="Add Value" />
-            <!-- TMPL_ELSE -->
-                <input type="submit" value="Modify Value" />
-            <!-- /TMPL_IF -->
-            </p></form>
-<!-- /TMPL_IF -->
-
-
-<!-- TMPL_IF name="delete_confirm" -->
-<!-- -->
-        <table>
-        <tr>
-            <td>lib</td>
-            <td><!-- TMPL_VAR name="search_category" --></td>
-        </tr>
-        <tr><td>Value</td><td><!-- TMPL_VAR name="Tvalue" --></td></tr>
-        <tr><td>
-            <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="search_category" value="<!-- TMPL_VAR name="search_category" -->" />
-        </tr></td>
-        <tr><td colspan="2">CONFIRM DELETION of this entry and all entries depending on this one</td></tr>
-        <tr><td><input type="submit" value="YES" /></form></td>
-                <td><form action="<!-- TMPL_VAR name="script_name" -->" method="post"><input type="submit" value="NO" /></form></td></tr>
-    </table>
-<!-- /TMPL_IF -->
-
-<!-- -->
-<!-- TMPL_IF name="else" -->
-<h1>Thesaurus management</h1>
-    <p>Manages thesaurus and authorities files.</p>
-    <ul>
-        <li>Dig: see data dependent on this one</li>
-        <li>Related: see other forms of this authority entry</li>
-    </ul>
-    <form action="/cgi-bin/koha/admin/thesaurus.pl" method="post">
-        <!-- TMPL_VAR name="tab_list" -->
-        <input type="text" name="searchstring" value="<!-- TMPL_VAR name="searchstring" -->" />
-        <input type="submit" value="OK" /></form>
-    <form action="/cgi-bin/koha/admin/thesaurus.pl" method="get"><input type="hidden" value="add_form" name="op" /><input type="submit" value="New Category" /></form>
-    
-    <!-- TMPL_LOOP name="hierarchy_loop" -->
-        <a href="thesaurus.pl?branch=<!-- TMPL_VAR name="branch" -->&amp;search_category=<!-- TMPL_VAR name="category" -->"><!-- TMPL_VAR name="string" --></a><br />
-    <!-- /TMPL_LOOP -->
-    
-<!-- TMPL_IF NAME="loop" -->
-<table>
-    <tr>
-        <th>&nbsp;</th>
-        <th>Free form</th>
-        <th>Authority</th>
-        <th>Dig</th>
-        <th>Related</th>
-        <th>Edit</th>
-        <th>Delete</th>
-    </tr>	<!-- TMPL_LOOP name="loop" -->
-
-    <tr>
-        <td>&nbsp;</td>
-        <td><!-- TMPL_VAR name="freelib" --></td>
-        <td><!-- TMPL_VAR name="father" --> <!-- TMPL_VAR name="stdlib" --></td>
-        <td><!-- TMPL_VAR name="dig" -->Dig</a></td>
-        <td><!-- TMPL_VAR name="related" -->Related</a></td>
-        <td><a href="<!-- TMPL_VAR name="edit" -->">Edit</a></td>
-        <td><a href="<!-- TMPL_VAR name="delete" -->">Delete</a></td>
-    </tr>
-    <!-- /TMPL_LOOP -->
-    </table>
-<!-- /TMPL_IF -->
-<p>		<form action="<!-- TMPL_VAR name="script_name" -->" method="post">
-    <input type="hidden" name="op" value="add_form" />
-</p>
-<p><form action="<!-- TMPL_VAR name="script_name" -->" method="post">
-    <input type="hidden" name="op" value="add_form" />
-    <input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->" />
-    <input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" -->" />
-    <input type="hidden" name="father" value="<!-- TMPL_VAR name="father" -->" />
-    <input type="submit"  value="Add Thesaurus entry" />
-    </form></p>
-<!-- TMPL_VAR name="previous" --> <!-- TMPL_VAR name="next" -->
-<!-- /TMPL_IF -->
-
-
-</div>
-</div>
-<div class="yui-b">
-<!-- TMPL_INCLUDE NAME="admin-menu.inc" -->
-</div>
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-- 
2.39.5