diff --git a/admin/koha2marclinks.pl b/admin/koha2marclinks.pl
index 90da842672..aa2e3682ff 100755
--- a/admin/koha2marclinks.pl
+++ b/admin/koha2marclinks.pl
@@ -141,14 +141,14 @@ else {    # DEFAULT
     my $sth2 = $dbh->prepare("SHOW COLUMNS from $tablename");
     $sth2->execute;
 
-    my $toggle    = "white";
+    my $toggle    = 1;
     my @loop_data = ();
     while ( ( my $field ) = $sth2->fetchrow_array ) {
-        if ( $toggle eq 'white' ) {
-            $toggle = "#ffffcc";
+        if ( $toggle eq 1 ) {
+            $toggle = 0;
         }
         else {
-            $toggle = "white";
+            $toggle = 1;
         }
         my %row_data;    # get a fresh hash for the row data
         $row_data{tagfield} = $fields{ $tablename . "." . $field }->{tagfield};
@@ -159,7 +159,7 @@ else {    # DEFAULT
         $row_data{kohafield} = $field;
         $row_data{edit}      =
 "$script_name?op=add_form&tablename=$tablename&kohafield=$field";
-        $row_data{bgcolor} = $toggle;
+        $row_data{toggle} = $toggle;
         push( @loop_data, \%row_data );
     }
     $template->param(
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 0a372c3ddf..1e3fc04318 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl
@@ -1,6 +1,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Administration &rsaquo;
-<!-- TMPL_IF name="add_form" -->MARC Links &rsaquo; <!-- TMPL_VAR name="action" --><!-- /TMPL_IF -->
+<!-- TMPL_IF name="add_form" --> MARC Links &rsaquo; Connect <!-- TMPL_VAR name="tablename" -->.<!-- TMPL_VAR name="kohafield" --> to a MARC subfield<!-- /TMPL_IF -->
 <!-- TMPL_IF name="else" -->MARC Links <!-- TMPL_VAR name="tagfield" --><!-- /TMPL_IF --></title>
 
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
@@ -9,7 +9,7 @@
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF name="add_form" --> <a href="/cgi-bin/koha/admin/koha2marclinks.pl">MARC Links</a> &rsaquo; Connect<!-- /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/koha2marclinks.pl">MARC Links</a> &rsaquo; Connect <!-- TMPL_VAR name="tablename" -->.<!-- TMPL_VAR name="kohafield" --> to a MARC subfield<!-- /TMPL_IF -->
 <!-- TMPL_IF name="else" -->MARC Links <!-- TMPL_VAR name="tagfield" --><!-- /TMPL_IF --></div>
 <!-- TMPL_IF name="add_form" -->
 <div id="doc" class="yui-t7">
@@ -26,98 +26,98 @@
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF name="add_form" -->
-<h1>Connect a koha field and a MARC subfield</h1>
-    <p>Choose and validate 1 MARC subfield for <!-- TMPL_VAR name="tablename" -->.<!-- TMPL_VAR name="kohafield" -->. That will modify <b>all frameworks</b> which is usually what you need, but you have been warned.</p>
-    <table>
-<tr><td><form action="<!-- TMPL_VAR name="script_name" -->" method="post">	<input type="hidden" name="op" value="add_validate" />
+<h1>Connect <!-- TMPL_VAR name="tablename" -->.<!-- TMPL_VAR name="kohafield" --> to a MARC subfield</h1>
+    <p>Choose and validate 1 MARC subfield for <strong><!-- TMPL_VAR name="tablename" -->.<!-- TMPL_VAR name="kohafield" --></strong>. That will modify <b>all frameworks</b> which is usually what you need, but you have been warned.</p>
+    <fieldset class="rows"><ol>
+<li><form action="<!-- TMPL_VAR name="script_name" -->" method="post">	<input type="hidden" name="op" value="add_validate" />
             <input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
             <input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
-            <!-- TMPL_VAR name="marclist0" --><input type="submit" value="OK" /></form>
-        </td>
-    </tr>
-    <tr>
+            <!-- TMPL_VAR name="marclist0" --> <input type="submit" value="OK" /></form>
+        
+    </li>
+    <li>
 
-        <td>	<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_validate" />
             <input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
-            <input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" /><input type="submit" value="OK" />
-            <!-- TMPL_VAR name="marclist1" -->	</form>
-        </td>
-    </tr>
-    <tr>
+            <!-- TMPL_VAR name="marclist1" -->
+            <input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" /><input type="submit" value="OK" />	</form>
+        
+    </li>
+    <li>
 
-        <td>
+        
                 <form action="<!-- TMPL_VAR name="script_name" -->" method="post"><input type="hidden" name="op" value="add_validate" />
             <input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
             <input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
-            <!-- TMPL_VAR name="marclist2" --><input type="submit" value="OK" /></form>
-        </td>
-    </tr>
-    <tr>
+            <!-- TMPL_VAR name="marclist2" --> <input type="submit" value="OK" /></form>
+        
+    </li>
+    <li>
     
-        <td><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_validate" />
             <input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
             <input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
-            <!-- TMPL_VAR name="marclist3" --><input type="submit" value="OK" />	</form>
-        </td>
-    </tr>
-    <tr>
+            <!-- TMPL_VAR name="marclist3" --> <input type="submit" value="OK" />	</form>
+        
+    </li>
+    <li>
     
-        <td><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_validate" />
             <input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
             <input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
-            <!-- TMPL_VAR name="marclist4" --><input type="submit" value="OK" /></form>
-        </td>
-    </tr>
-    <tr>
+            <!-- TMPL_VAR name="marclist4" --> <input type="submit" value="OK" /></form>
+        
+    </li>
+    <li>
 
-        <td>	<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_validate" />
             <input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
             <input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
-            <!-- TMPL_VAR name="marclist5" --><input type="submit" value="OK" /></form>
-        </td>
-    </tr>
-    <tr>
+            <!-- TMPL_VAR name="marclist5" --> <input type="submit" value="OK" /></form>
+        
+    </li>
+    <li>
     
-        <td><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_validate" />
             <input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
             <input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
-            <!-- TMPL_VAR name="marclist6" --><input type="submit" value="OK" /></form>
-        </td>
-    </tr>
-    <tr>
+            <!-- TMPL_VAR name="marclist6" --> <input type="submit" value="OK" /></form>
+        
+    </li>
+    <li>
     
-        <td><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_validate" />
             <input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
             <input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
-            <!-- TMPL_VAR name="marclist7" --><input type="submit" value="OK" /></form>
-        </td>
-    </tr>
-    <tr>
+            <!-- TMPL_VAR name="marclist7" --> <input type="submit" value="OK" /></form>
+        
+    </li>
+    <li>
     
-        <td><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_validate" />
             <input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
             <input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
-            <!-- TMPL_VAR name="marclist8" --><input type="submit" value="OK" /></form>
-        </td>
-    </tr>
-    <tr>
+            <!-- TMPL_VAR name="marclist8" --> <input type="submit" value="OK" /></form>
+        
+    </li>
+    <li>
     
-        <td><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_validate" />
             <input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
             <input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
-            <!-- TMPL_VAR name="marclist9" --><input type="submit" value="OK" /></form>
-        </td>
-    </tr>
-    <tr>
-        <td>
+            <!-- TMPL_VAR name="marclist9" --> <input type="submit" value="OK" /></form>
+        
+    </li>
+    </ol></fieldset>
+	<fieldset class="action">
             <form action="<!-- TMPL_VAR name="script_name" -->" name="Aform" method="post">
                 <input type="hidden" name="op" value="add_validate" />
                 <input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
@@ -125,9 +125,8 @@
                 <input type="hidden" name="choice" value="" />
                 <input type="submit" value="Click to &quot;Unmap&quot;" />
             </form>
-        </td>
-    </tr>
-    </table>
+	<a class="cancel" href="/cgi-bin/koha/admin/koha2marclinks.pl">Cancel</a>
+	</fieldset>
 <!-- /TMPL_IF -->
 
 
@@ -146,7 +145,7 @@
     <th>&nbsp;</th>
 </tr>
 <!-- TMPL_LOOP name="loop" -->
-<tr>
+<!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
     <td><a href="<!-- TMPL_VAR name="edit" -->"><!-- TMPL_VAR name="kohafield" --></a></td>
     <td><!-- TMPL_VAR name="tagfield" --></td>
     <td><!-- TMPL_VAR name="tagsubfield" --></td>