diff --git a/admin/koha2marclinks.pl b/admin/koha2marclinks.pl
index aa2e3682ff..c23c39de5d 100755
--- a/admin/koha2marclinks.pl
+++ b/admin/koha2marclinks.pl
@@ -89,7 +89,6 @@ if ( $op eq 'add_form' ) {
             -default =>
               "$defaulttagfield $defaulttagsubfield - $defaultliblibrarian",
             -size     => 1,
-            -tabindex => '',
             -multiple => 0,
         );
         $template->param( "marclist$i" => $marclist );
@@ -173,7 +172,6 @@ else {    # DEFAULT
             ],
             -default  => $tablename,
             -size     => 1,
-            -tabindex => '',
             -multiple => 0
         )
     );
diff --git a/admin/marctagstructure.pl b/admin/marctagstructure.pl
index 2759a03af9..b930271af5 100755
--- a/admin/marctagstructure.pl
+++ b/admin/marctagstructure.pl
@@ -118,7 +118,6 @@ if ($op eq 'add_form') {
 	my $authorised_value  = CGI::scrolling_list(-name=>'authorised_value',
 			-values=> \@authorised_values,
 			-size=>1,
- 			-tabindex=>'',
 			-id=>"authorised_value",
 			-multiple=>0,
 			-default => $data->{'authorised_value'},
@@ -138,13 +137,11 @@ if ($op eq 'add_form') {
 			repeatable => CGI::checkbox(-name=>'repeatable',
 						-checked=> $data->{'repeatable'}?'checked':'',
 						-value=> 1,
- 						-tabindex=>'',
 						-label => '',
 						-id=> 'repeatable'),
 			mandatory => CGI::checkbox(-name => 'mandatory',
 						-checked => $data->{'mandatory'}?'checked':'',
 						-value => 1,
- 						-tabindex=>'',
 						-label => '',
 						-id => 'mandatory'),
 			authorised_value => $authorised_value,
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 3a95d533bd..774d947e92 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl
@@ -79,11 +79,8 @@ function Check(f) {
 		<legend>New authority type</legend>
 	<!-- /TMPL_IF -->
 	<ol>
-		<!-- TMPL_IF NAME="authtypecode" -->
-		<input type="hidden" name="modif" value="1" />
-	<!-- /TMPL_IF -->
 			<!-- TMPL_IF NAME="authtypecode" -->
-				<li><label for="authtypecode">Authority type<label><input type="hidden" name="op" value="add_validate" />
+				<li><span class="label">Authority type</span><input type="hidden" name="op" value="add_validate" />
 		<input type="hidden" name="checked" value="0" /><input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" /><!-- TMPL_VAR NAME="authtypecode" --></li>
 			<!-- TMPL_ELSE -->
 				<li><label for="authtypecode">Authority type: </label><input id="authtypecode" type="text" name="authtypecode" size="10" maxlength="10" onblur="toUC(this)" /></li>
@@ -94,6 +91,9 @@ function Check(f) {
 		<p class="tip">Note: for 'Authority field to copy', enter the authority field that should be copied from the authority record to the bibliographic record. E.g., in MARC21, field 100 in the authority record should be copied to field 100 in the bibliographic record</p>
 		<label for="auth_tag_to_report">Authority field to copy: </label><input type="text" id="auth_tag_to_report" name="auth_tag_to_report" size="5" maxlength="3" value="<!-- TMPL_VAR NAME="auth_tag_to_report">" />
 		<input type="hidden" name="op" value="add_validate" />
+		<!-- TMPL_IF NAME="authtypecode" -->
+		<input type="hidden" name="modif" value="1" />
+	<!-- /TMPL_IF -->
 	</li></ol>
 	</fieldset>
 	<fieldset class="action"><input type="submit" value="Submit" onclick="Check(this.form); return false;" /><a class="cancel" href="/cgi-bin/koha/admin/authtypes.pl">Cancel</a></fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tmpl
index bee599fdc1..973d8798bf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tmpl
@@ -116,9 +116,9 @@ function CheckRuleForm(f) {
 
 <!-- TMPL_IF name="class_source_form" -->
   <!-- TMPL_IF name="edit_class_source" -->
-<h2>&rsaquo; Modify classification source</h2>
+<h2>Modify classification source</h2>
   <!-- TMPL_ELSE -->
-<h2>&rsaquo; Add classification source</h2>
+<h2>Add classification source</h2>
   <!-- /TMPL_IF -->
 <form action="<!-- TMPL_VAR name="script_name" -->" name="Aform" method="post">
   <input type="hidden" name="op" value="<!-- TMPL_VAR name="confirm_op"-->" />
@@ -170,9 +170,9 @@ function CheckRuleForm(f) {
 
 <!-- TMPL_IF name="sort_rule_form" -->
   <!-- TMPL_IF name="edit_sort_rule" -->
-<h2>&rsaquo; Modify filing rule</h2>
+<h2>Modify filing rule</h2>
   <!-- TMPL_ELSE -->
-<h2>&rsaquo; Add filing rule</h2>
+<h2>Add filing rule</h2>
   <!-- /TMPL_IF -->
 <form action="<!-- TMPL_VAR name="script_name" -->" name="Aform" method="post">
   <input type="hidden" name="op" value="<!-- TMPL_VAR name="confirm_op"-->" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tmpl
index aa466fd9df..f795efbdc2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tmpl
@@ -144,6 +144,9 @@ function CheckRuleForm(f) {
 
 //]]>
 </script>
+<style type="text/css">
+	fieldset.rows fieldset {font-size:100%;}
+</style>
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
@@ -211,8 +214,8 @@ function CheckRuleForm(f) {
         <label for="mp_<!-- TMPL_VAR name="mp_num" -->_search_index">Search index: </label>
         <input type ="text" id="mp_<!-- TMPL_VAR name="mp_num" -->_search_index" 
                name="mp_<!-- TMPL_VAR name="mp_num" -->_search_index" size="20" 
-               value="<!-- TMPL_VAR name="index" -->"
-          maxlegnth="30" escape="HTML" />
+               value="<!-- TMPL_VAR name="index" escape="HTML" -->"
+          maxlegnth="30" />
       </li>
       <li>
         <label for="mp_<!-- TMPL_VAR name="mp_num" -->_score">Score: </label>
@@ -572,7 +575,7 @@ function CheckRuleForm(f) {
 <div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
 
 <!-- /TMPL_IF -->
- 
+ <!-- TMPL_IF name="matching_rule_form" -->
 <div id="mp_template" style="display:none">
   <fieldset class="rows">
     <legend><a class="button" onclick="DeleteMatchpoint(this)">Remove this matchpoint</a></legend>
@@ -685,6 +688,7 @@ function CheckRuleForm(f) {
   </ol>
 </fieldset>
 </div>
+<!-- /TMPL_IF -->
 
 </div>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl
index ed9dc9e156..e495b6aa5a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl
@@ -295,7 +295,7 @@
                 <thead><tr><th>Target</th><th>Hostname/Port</th><th>Database</th><th>Userid</th><th>Password</th><th>Checked</th><th>Rank</th>       			<th>Syntax</th><th>Encoding</th><th colspan="2">&nbsp;</th>
                 </tr></thead>
                 <tbody><!-- TMPL_LOOP NAME="loop" -->
-               <!-- TMPL_IF NAME="toggle" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF --><td><a href="<!-- TMPL_VAR name="script_name" -->?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="name" -->"><!-- TMPL_VAR NAME="name" --></a></td><td><!-- TMPL_VAR NAME="host" -->:<!-- TMPL_VAR NAME="port" --></td><td><!-- TMPL_VAR NAME="db" --></td><td><!-- TMPL_VAR NAME="userid" --></td><td><!-- TMPL_VAR NAME="password" --></td><td><!-- TMPL_VAR NAME="checked" --></td><td><!-- TMPL_VAR NAME="rank" --></td>			<td><!-- TMPL_VAR NAME="syntax" --></td><td><!-- TMPL_VAR NAME="encoding" --></td><td><a href="<!-- TMPL_VAR name="script_name" -->?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="name" -->">Edit</a></td><td><a href="<!-- TMPL_VAR name="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="name" -->">Delete</a></td>                </tr>
+               <!-- TMPL_IF NAME="toggle" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF --><td><a href="<!-- TMPL_VAR name="script_name" -->?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="name" ESCAPE="url" -->"><!-- TMPL_VAR NAME="name" --></a></td><td><!-- TMPL_VAR NAME="host" -->:<!-- TMPL_VAR NAME="port" --></td><td><!-- TMPL_VAR NAME="db" --></td><td><!-- TMPL_VAR NAME="userid" --></td><td><!-- TMPL_VAR NAME="password" --></td><td><!-- TMPL_VAR NAME="checked" --></td><td><!-- TMPL_VAR NAME="rank" --></td>			<td><!-- TMPL_VAR NAME="syntax" --></td><td><!-- TMPL_VAR NAME="encoding" --></td><td><a href="<!-- TMPL_VAR name="script_name" -->?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="name" ESCAPE="url" -->">Edit</a></td><td><a href="<!-- TMPL_VAR name="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="name" ESCAPE="url" -->">Delete</a></td>                </tr>
                 <!-- /TMPL_LOOP --></tbody>
 	</table>