[Koha-patches] [PATCH] Further fixes for Bug 3211, cataloging value plugin forms should be valid XHTML

Owen Leonard oleonard at myacpl.org
Mon Jul 26 18:35:56 CEST 2010


- Adding page heading
- Adding "Cancel" link to close popup
- Correctly marking up <label> <input> pairs
- Correctly escaping JavaScript blocks
- General markup corrections
---
 .../cataloguing/value_builder/labs_theses.tmpl     |   21 +-
 .../modules/cataloguing/value_builder/macles.tmpl  |   11 +-
 .../value_builder/marc21_field_006.tmpl            |    2 +-
 .../value_builder/marc21_field_007.tmpl            |    2 +-
 .../value_builder/marc21_field_008.tmpl            |    4 +-
 .../marc21_field_008_authorities.tmpl              |    4 +-
 .../cataloguing/value_builder/marc21_leader.tmpl   |    2 +-
 .../value_builder/marc21_leader_authorities.tmpl   |    7 +-
 .../value_builder/marc21_leader_book.tmpl          |    2 +-
 .../value_builder/marc21_leader_computerfile.tmpl  |    6 +-
 .../value_builder/unimarc_field_100.tmpl           |  150 ++--
 .../value_builder/unimarc_field_105.tmpl           |  102 ++--
 .../value_builder/unimarc_field_106.tmpl           |   34 +-
 .../value_builder/unimarc_field_110.tmpl           |   70 +-
 .../value_builder/unimarc_field_115a.tmpl          |  540 +++++++-------
 .../value_builder/unimarc_field_115b.tmpl          |  243 +++---
 .../value_builder/unimarc_field_116.tmpl           |  564 +++++++-------
 .../value_builder/unimarc_field_117.tmpl           |  303 ++++----
 .../value_builder/unimarc_field_120.tmpl           |  430 ++++++------
 .../value_builder/unimarc_field_121a.tmpl          |  171 +++--
 .../value_builder/unimarc_field_121b.tmpl          |  163 ++--
 .../value_builder/unimarc_field_122.tmpl           |   58 +-
 .../value_builder/unimarc_field_123a.tmpl          |   37 +-
 .../value_builder/unimarc_field_123d.tmpl          |   55 +-
 .../value_builder/unimarc_field_123e.tmpl          |   55 +-
 .../value_builder/unimarc_field_123f.tmpl          |   81 +--
 .../value_builder/unimarc_field_123g.tmpl          |   58 +-
 .../value_builder/unimarc_field_124a.tmpl          |   33 +-
 .../value_builder/unimarc_field_124b.tmpl          |   49 +-
 .../value_builder/unimarc_field_124c.tmpl          |   71 +-
 .../value_builder/unimarc_field_124d.tmpl          |   33 +-
 .../value_builder/unimarc_field_124e.tmpl          |   33 +-
 .../value_builder/unimarc_field_124f.tmpl          |   63 +-
 .../value_builder/unimarc_field_124g.tmpl          |   47 +-
 .../value_builder/unimarc_field_125a.tmpl          |   75 +-
 .../value_builder/unimarc_field_125b.tmpl          |   71 +-
 .../value_builder/unimarc_field_126a.tmpl          |  451 ++++++------
 .../value_builder/unimarc_field_126b.tmpl          |   93 ++--
 .../value_builder/unimarc_field_127.tmpl           |   53 +-
 .../value_builder/unimarc_field_128a.tmpl          |  167 ++--
 .../value_builder/unimarc_field_128b.tmpl          |  209 +++---
 .../value_builder/unimarc_field_128c.tmpl          |  203 +++---
 .../value_builder/unimarc_field_130.tmpl           |  168 ++---
 .../value_builder/unimarc_field_135a.tmpl          |   44 +-
 .../value_builder/unimarc_field_140.tmpl           |  793 ++++++++++----------
 .../value_builder/unimarc_field_141.tmpl           |   65 +-
 .../value_builder/unimarc_field_210c.tmpl          |   99 ++--
 .../value_builder/unimarc_field_225a.tmpl          |   26 +-
 .../value_builder/unimarc_field_4XX.tmpl           |   71 +-
 .../value_builder/unimarc_field_686a.tmpl          |   10 +-
 .../value_builder/unimarc_field_700-4.tmpl         |   27 +-
 .../cataloguing/value_builder/unimarc_leader.tmpl  |   46 +-
 52 files changed, 3057 insertions(+), 3118 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/labs_theses.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/labs_theses.tmpl
index 5312bff..10d2ba9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/labs_theses.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/labs_theses.tmpl
@@ -1,14 +1,8 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<head>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>KOHA:_Labs Thesis Selection plugin</title>
-
-<script language="JavaScript" type="text/javascript">
-<!-- Hide from old browsers
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<script type="text/javascript">
+//<![CDATA[
 function openWindow(targeturl, windowname) {
 	newwin =
 window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
@@ -16,7 +10,7 @@ window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
 function Help() {
 	newin=window.open("/cgi-bin/koha/help.pl","KohaHelp",'width=600,height=600,toolbar=false,scrollbars=yes');
 }
-// end hiding -->
+//]]>
 </script>
 
 <link rel="stylesheet" type="text/css" href="/intranet-tmpl/default/en/includes/common-style.css" />
@@ -35,7 +29,7 @@ a.catalogue:hover {
 </style>
 </head>
 
-<body>
+<body style="padding:1em;">
 <div id="mainbloc">
 	<h1>Laboratory Search</h1>
 	
@@ -125,5 +119,4 @@ a.catalogue:hover {
 	</div>
 <!-- /TMPL_IF -->
 </div>
-</body>
-</html>
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/macles.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/macles.tmpl
index 52b6bdc..161a041 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/macles.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/macles.tmpl
@@ -1,7 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-<html>
 <head>
 <title>Gestion_des_index_MACLES</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
@@ -18,14 +17,14 @@
 <body  class="yui-skin-sam" onload="Activate(0);load_macles();" >
 
 <h1>Gestion des index MACLES</h1>
-<form name="f_pop">
+<form name="f_pop" action="">
 
 <div id="macles" class="toptabs numbered">
-    <ul>
+    <!-- TMPL_IF name="BIGLOOP" --><ul>
     <!--TMPL_LOOP name="BIGLOOP" -->
         <li><a href="#tab<!-- TMPL_VAR name="number" -->XX"><!-- TMPL_VAR name="number"--></a></li>
     <!--/TMPL_LOOP -->
-    </ul>
+    </ul><!-- /TMPL_IF -->
     <!-- RESET PAGINATION -->
     <!-- TMPL_LOOP name="BIGLOOP" -->
     <!-- TMPL_IF name="number" -->
@@ -89,7 +88,8 @@
     <!-- /TMPL_LOOP -->
 </div>
 </form>
-<script language="JavaScript" type="text/javascript">
+<script type="text/javascript">
+//<![CDATA[
 function Activate(numlayer)
 {
 	for (var i=0; i <= 9 ; i++ ) {
@@ -243,6 +243,7 @@ function load_macles()
   } 
   return false;
 }
+//]]>
 </script>
 </body>
 </html>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl
index 3661879..5615786 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl
@@ -4,7 +4,7 @@
 </head>
 <body style="padding:1em;">
 <h3>006 Fixed-length data elements--Additional material characteristics--General information</h3>
-<form name="f_pop" onsubmit="report()">
+<form name="f_pop" onsubmit="report()" action="">
 <input type="hidden" name="plugin_name" value="marc21_field_006.pl" />
 <table>
 	<tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_007.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_007.tmpl
index d1e6269..73ed2de 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_007.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_007.tmpl
@@ -4,7 +4,7 @@
 </head>
 <body style="padding:1em;" onload="RedrawChoices('<!-- TMPL_VAR NAME="f0" -->');">
 <h3>007 Physical description fixed field--General information</h3>
-<form id="f_pop" onsubmit="report()">
+<form id="f_pop" onsubmit="report()" action="">
 <input type="hidden" name="plugin_name" value="marc21_field_007.pl" />
 <p><label for="MatTypeList">Material Type: </label>
       <select name="MatTypeList" id="MatTypeList" onchange="RedrawChoices(this.options[selectedIndex].value);">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl
index 3dd60fb..e3ca98a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl
@@ -4,7 +4,7 @@
 </head>
 <body style="padding:1em;">
 <h3> 008 Fixed-length data elements--General information</h3>
-<form name="f_pop" onsubmit="report()">
+<form name="f_pop" onsubmit="report()" action="">
 <input type="hidden" name="plugin_name" value="marc21_field_008.pl" />
 <table>
 	<tr>
@@ -656,4 +656,4 @@ function report() {
 	//]]>
 </script>
 
-<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl
index 4ef947a..7fa53dd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl
@@ -4,13 +4,13 @@
 </head>
 <body style="padding:1em;">
 <h3> 008 Fixed-length data elements</h3>
-<form name="f_pop" onsubmit="report()">
+<form name="f_pop" onsubmit="report()" action="">
 <input type="hidden" name="plugin_name" value="marc21_field_008_authorities.pl" />
+<input name="f1" value="<!-- TMPL_VAR name="f1" -->" type="hidden" />
 <table>
 	<tr>
 		<td>00-05- Date entered on file</td>
 		<td><!-- TMPL_VAR name="f1" --></td>
-        <input name="f1" value="<!-- TMPL_VAR name="f1" -->" type="hidden" />
 	</tr>
 	<tr>
 		<td><label for="f6">06- Direct or indirect geographic subdivision</label></td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl
index c01bd22..352cbe5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl
@@ -3,7 +3,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body style="padding:1em;">
-<form name="f_pop" onsubmit="report()">
+<form name="f_pop" onsubmit="report()" action="">
 <input type="hidden" name="plugin_name" value="marc21_leader.pl" />
 <h3>000 - Leader</h3>
 <table>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl
index b6ec8b0..020c25e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl
@@ -4,7 +4,7 @@
 </head>
 <body style="padding:1em;">
 <h3>000 - Leader</h3>
-<form name="f_pop" onsubmit="report()">
+<form name="f_pop" onsubmit="report()" action="">
 <input type="hidden" name="plugin_name" value="marc21_leader_authorities.pl" />
 <table>
 	<tr>
@@ -57,7 +57,7 @@
 	<tr>
 		<td><label for="f6">6- Type of record</label></td>
 		<td>
-            <input name="f6" value="z" type="hidden" />
+            <input name="f6" id="f6" value="z" type="hidden" />
             z- Authority data
 		</td>
 	</tr>
@@ -86,6 +86,7 @@
 	<tr>
 		<td>10-16 indicator/subfields/size</td>
 		<td>(auto-filled)</td>
+	</tr>
 	<tr>
 		<td><label for="f17">17- Encoding level</label></td>
 		<td>
@@ -112,7 +113,7 @@
 	<tr>
 		<td>20-24 entry map &amp; lengths</td>
 		<td>(auto-filled)</td>
-	<tr>
+	</tr>
 
 </table>
 <fieldset class="action"><input type="submit" value="OK" /> <a href="#" class="cancel close">Cancel</a></fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl
index fa6d38a..6b368ba 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl
@@ -3,7 +3,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body style="padding:1em;">
-<form name="f_pop" onsubmit="report()">
+<form name="f_pop" onsubmit="report()" action="">
 <input type="hidden" name="plugin_name" value="marc21_leader_book.pl" />
 <table>
 	<tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl
index c745d89..28af802 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl
@@ -3,7 +3,8 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body style="padding:1em;">
-<form name="f_pop" onsubmit="report()">
+<h3>000 - Leader</h3>
+<form name="f_pop" onsubmit="report()" action="">
 <input type="hidden" name="plugin_name" value="marc21_leader_computerfile.pl" />
 <table>
 	<tr>
@@ -196,6 +197,7 @@
 	<tr>
 		<td>10-16 indicator/subfields/size</td>
 		<td>(auto-filled)</td>
+	</tr>
 	<tr>
 		<td><label for="f17">17- Encoding</label></td>
 		<td>
@@ -302,7 +304,7 @@
 	<tr>
 		<td>20-24 entry map &amp; lengths</td>
 		<td>(auto-filled)</td>
-	<tr>
+	</tr>
 
 </table>
 <fieldset class="action"><input type="submit" value="OK" /> <a href="#" class="cancel close">Cancel</a></fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_100.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_100.tmpl
index f91dae5..e031214 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_100.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_100.tmpl
@@ -1,22 +1,19 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 100 builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 100 builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 100 builder</h3>
+<form name="f_pop" action="">
 <table>
     <tr>
-        <td>Date entered on file</td>
-        <td><input type="text" name="f1" maxlength="8" size="9" value="<!-- TMPL_VAR name="f1" -->"></td>
+        <td><label for="f1">Date entered on file</label></td>
+        <td><input type="text" name="f1" id="f1" maxlength="8" size="9" value="<!-- TMPL_VAR name="f1" -->" /></td>
     </tr>
     <tr>
-        <td>Type of Publication Date: Publication Dates 1 and 2</td>
+        <td><label for="f2">Type of Publication Date: Publication Dates 1 and 2</label></td>
         <td>
-            <select name="f2" size="1">
+            <select name="f2" id="f2" size="1">
             <!-- TMPL_IF name="f2 " -->
                 <option value=" " selected="selected">Non required value</option>
             <!-- TMPL_ELSE -->
@@ -50,8 +47,7 @@
             <!-- /TMPL_IF -->
     
             <!-- TMPL_IF name="f2f" -->
-                <option value="f"
-                selected="selected">f - monograph, date of
+                <option value="f" selected="selected">f - monograph, date of
                 publication uncertain</option>
             <!-- TMPL_ELSE -->
                 <option value="f">f - monograph, date of
@@ -59,8 +55,7 @@
             <!-- /TMPL_IF -->
 
             <!-- TMPL_IF name="f2g" -->
-                <option value="g"
-                selected="selected">g - monograph whose publication continues for more than a
+                <option value="g" selected="selected">g - monograph whose publication continues for more than a
 year</option>
             <!-- TMPL_ELSE -->
                 <option value="g">g - monograph whose publication continues for more than a
@@ -68,22 +63,20 @@ year</option>
             <!-- /TMPL_IF -->
     
             <!-- TMPL_IF name="f2h" -->
-                <option value="h"
-                selected="selected">h - monograph with both actual and copyright/privilege date</option>
+                <option value="h" selected="selected">h - monograph with both actual and copyright/privilege date</option>
             <!-- TMPL_ELSE -->
                 <option value="h">h - monograph with both actual and copyright/privilege date</option>
             <!-- /TMPL_IF -->
     
             <!-- TMPL_IF name="f2i" -->
-                <option value="i"
-                selected="selected">i - monograph with both release/issue date and production date</option>
+                <option value="i" selected="selected">i - monograph with both release/issue date and production date</option>
             <!-- TMPL_ELSE -->
                 <option value="i">i - monograph with both release/issue date and production date</option>
             <!-- /TMPL_IF -->
     
             <!-- TMPL_IF name="f2j" -->
                 <option value="j"
-                selected="selected">j - document with detailed date of publication</option>
+ selected="selected">j - document with detailed date of publication</option>
             <!-- TMPL_ELSE -->
                 <option value="j">j - document with detailed date of publication</option>
             <!-- /TMPL_IF -->
@@ -98,17 +91,17 @@ year</option>
         </td>
     </tr>
     <tr>
-        <td>Publication Date 1</td>
-        <td><input id="pubdate1" type="text" name="f3" maxlength="4" size="5" value="<!-- TMPL_VAR name="f3" -->" /></td>
+        <td><label for="f3">Publication Date 1</label></td>
+        <td><input type="text" name="f3" id="f3" maxlength="4" size="5" value="<!-- TMPL_VAR name="f3" -->" /></td>
     </tr>
     <tr>
-    <td>Publication Date 2</td>
-    <td><input id="pubdate2" type="text" name="f4" maxlength="4" size="5" value="<!-- TMPL_VAR name="f4" -->" /></td>
+    <td><label for="f4">Publication Date 2</label></td>
+    <td><input type="text" name="f4" id="f4" maxlength="4" size="5" value="<!-- TMPL_VAR name="f4" -->" /></td>
     </tr>
     <tr>
-        <td>Target Audience Code</td>
+        <td><label for="f5">Target Audience Code</label></td>
         <td>
-            <select name="f5" size="1">
+            <select name="f5" id="f5" size="1">
             <!-- TMPL_IF name="f5|" -->
                 <option value="|" selected="selected">|- Filling character</option>
             <!-- TMPL_ELSE -->
@@ -122,7 +115,7 @@ year</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f5b" -->
                 <option value="b"
-    selected="selected">b- pre-primary, ages 0-5</option>
+ selected="selected">b- pre-primary, ages 0-5</option>
             <!-- TMPL_ELSE -->
                 <option value="b">b- pre-primary, ages 0-5</option>
             <!-- /TMPL_IF -->
@@ -144,21 +137,21 @@ year</option>
     
             <!-- TMPL_IF name="f5k" -->
                 <option value="k"
-                selected="selected">k- adult, serious</option>
+ selected="selected">k- adult, serious</option>
             <!-- TMPL_ELSE -->
                 <option value="k">k- adult, serious</option>
             <!-- /TMPL_IF -->
 
             <!-- TMPL_IF name="f5m" -->
                 <option value="m"
-                selected="selected">m- adult, general</option>
+ selected="selected">m- adult, general</option>
             <!-- TMPL_ELSE -->
                 <option value="m">m- adult, general</option>
             <!-- /TMPL_IF -->
     
             <!-- TMPL_IF name="f5u" -->
                 <option value="u"
-                selected="selected">u- unknown</option>
+ selected="selected">u- unknown</option>
             <!-- TMPL_ELSE -->
                 <option value="u">u- unknown</option>
             <!-- /TMPL_IF -->
@@ -166,9 +159,9 @@ year</option>
         </td>
     </tr>
     <tr>
-        <td>Target Audience Code 2</td>
+        <td><label for="f6">Target Audience Code 2</label></td>
         <td>
-            <select name="f6" size="1">
+            <select name="f6" id="f6" size="1">
             
             <!-- TMPL_IF name="f6|" -->
             	<option value="|" selected="selected">|- Filling character</option>
@@ -182,7 +175,7 @@ year</option>
                 <option value="a">a- juvenile, general</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f6b" -->
-                <option value="b"  selected="selected">b- pre-primary, ages 0-5</option>
+                <option value="b" selected="selected">b- pre-primary, ages 0-5</option>
             <!-- TMPL_ELSE -->
                 <option value="b">b- pre-primary, ages 0-5</option>
             <!-- /TMPL_IF -->
@@ -204,21 +197,21 @@ year</option>
     
             <!-- TMPL_IF name="f6k" -->
                 <option value="k"
-                selected="selected">k- adult, serious</option>
+ selected="selected">k- adult, serious</option>
             <!-- TMPL_ELSE -->
                 <option value="k">k- adult, serious</option>
             <!-- /TMPL_IF -->
 
             <!-- TMPL_IF name="f6m" -->
                 <option value="m"
-                selected="selected">m- adult, general</option>
+ selected="selected">m- adult, general</option>
             <!-- TMPL_ELSE -->
                 <option value="m">m- adult, general</option>
             <!-- /TMPL_IF -->
     
             <!-- TMPL_IF name="f6u" -->
                 <option value="u"
-                selected="selected">u- unknown</option>
+ selected="selected">u- unknown</option>
             <!-- TMPL_ELSE -->
                 <option value="u">u- unknown</option>
             <!-- /TMPL_IF -->
@@ -226,9 +219,9 @@ year</option>
         </td>
     </tr>
     <tr>
-        <td>Target Audience Code 3</td>
+        <td><label for="f7">Target Audience Code 3</label></td>
         <td>
-            <select name="f7" size="1">
+            <select name="f7" id="f7" size="1">
             <!-- TMPL_IF name="f7|" -->
             	<option value="|" selected="selected">|- Filling character</option>
             <!-- TMPL_ELSE -->
@@ -242,7 +235,7 @@ year</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f7b" -->
                 <option value="b"
-    selected="selected">b- pre-primary, ages 0-5</option>
+ selected="selected">b- pre-primary, ages 0-5</option>
             <!-- TMPL_ELSE -->
                 <option value="b">b- pre-primary, ages 0-5</option>
             <!-- /TMPL_IF -->
@@ -264,21 +257,21 @@ year</option>
     
             <!-- TMPL_IF name="f7k" -->
                 <option value="k"
-                selected="selected">k- adult, serious</option>
+ selected="selected">k- adult, serious</option>
             <!-- TMPL_ELSE -->
                 <option value="k">k- adult, serious</option>
             <!-- /TMPL_IF -->
 
             <!-- TMPL_IF name="f7m" -->
                 <option value="m"
-                selected="selected">m- adult, general</option>
+ selected="selected">m- adult, general</option>
             <!-- TMPL_ELSE -->
                 <option value="m">m- adult, general</option>
             <!-- /TMPL_IF -->
     
             <!-- TMPL_IF name="f7u" -->
                 <option value="u"
-                selected="selected">u- unknown</option>
+ selected="selected">u- unknown</option>
             <!-- TMPL_ELSE -->
                 <option value="u">u- unknown</option>
             <!-- /TMPL_IF -->
@@ -286,9 +279,9 @@ year</option>
         </td>
     </tr>
     <tr>
-        <td>Government Publication</td>
+        <td><label for="f8">Government Publication</label></td>
         <td>
-            <select name="f8" size="1">
+            <select name="f8" id="f8" size="1">
             
             <!-- TMPL_IF name="f8u" -->
             	<option value="u" selected="selected">u- unknown</option>
@@ -312,13 +305,13 @@ year</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f8d" -->
                 <option value="d"
-                selected="selected">d- local(municipal, etc.)</option>
+ selected="selected">d- local(municipal, etc.)</option>
             <!-- TMPL_ELSE -->
                 <option value="d">d- local(municipal, etc.)</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f8e" -->
                 <option value="e"
-                selected="selected">e- multi-local (interstate departments, etc. below the national
+ selected="selected">e- multi-local (interstate departments, etc. below the national
 level)</option>
             <!-- TMPL_ELSE -->
                 <option value="e">e- multi-local (interstate departments, etc. below the national
@@ -327,39 +320,39 @@ level)</option>
     
             <!-- TMPL_IF name="f8f" -->
                 <option value="f"
-                selected="selected">f- intergovernmental</option>
+ selected="selected">f- intergovernmental</option>
             <!-- TMPL_ELSE -->
                 <option value="f">f- intergovernmental</option>
             <!-- /TMPL_IF -->
 
             <!-- TMPL_IF name="f8g" -->
                 <option value="g"
-                selected="selected">g- government in exile or clandestine</option>
+ selected="selected">g- government in exile or clandestine</option>
             <!-- TMPL_ELSE -->
                 <option value="g">g- government in exile or clandestine</option>
             <!-- /TMPL_IF -->
 
             <!-- TMPL_IF name="f8h" -->
                 <option value="h"
-                selected="selected">h- level not determined</option>
+ selected="selected">h- level not determined</option>
             <!-- TMPL_ELSE -->
                 <option value="h">h- level not determined</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f8u" -->
                 <option value="u"
-                selected="selected">u- unknown</option>
+ selected="selected">u- unknown</option>
             <!-- TMPL_ELSE -->
                 <option value="u">u- unknown</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f8y" -->
                 <option value="y"
-                selected="selected">y- not a government publication</option>
+ selected="selected">y- not a government publication</option>
             <!-- TMPL_ELSE -->
                 <option value="y">y- not a government publication</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f8z" -->
                 <option value="z"
-                selected="selected">z- Other</option>
+ selected="selected">z- Other</option>
             <!-- TMPL_ELSE -->
                 <option value="z">z- Other</option>
             <!-- /TMPL_IF -->
@@ -368,9 +361,9 @@ level)</option>
     </tr>
 
     <tr>
-        <td>Modified Record Code</td>
+        <td><label for="f9">Modified Record Code</label></td>
         <td>
-            <select name="f9" size="1">
+            <select name="f9" id="f9" size="1">
             
             <!-- TMPL_IF name="f90" -->
                 <option value="0" selected="selected">0- unmodified record</option>
@@ -388,14 +381,14 @@ level)</option>
 
 
     <tr>
-    <td>Language of Cataloguing (Mandatory)</td>
-    <td><input type="text" name="f10" maxlength="3" size="4" value="<!-- TMPL_VAR name="f10" -->" /></td>
+    <td><label for="f10">Language of Cataloguing (Mandatory)</label></td>
+    <td><input type="text" name="f10" id="f10" maxlength="3" size="4" value="<!-- TMPL_VAR name="f10" -->" /></td>
     </tr>
 
     <tr>
-        <td>Transliteration Code</td>
+        <td><label for="f11">Transliteration Code</label></td>
         <td>
-            <select name="f11" size="1">
+            <select name="f11" id="f11" size="1">
             
             <!-- TMPL_IF name="f11a" -->
                 <option value="a" selected="selected">a- ISO transliteration scheme</option>
@@ -409,7 +402,7 @@ level)</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f11c" -->
                 <option value="c"
-        selected="selected">c- multiple transliterations: ISO or other schemes</option>
+ selected="selected">c- multiple transliterations: ISO or other schemes</option>
             <!-- TMPL_ELSE -->
                 <option value="c">c- multiple transliterations: ISO or other schemes</option>
             <!-- /TMPL_IF -->
@@ -422,9 +415,9 @@ level)</option>
         </td>
     </tr>
     <tr>
-    <td>Character Sets (Mandatory) 1 </td>
+    <td><label for="f12">Character Sets (Mandatory) 1</label></td>
         <td>
-            <select name="f12" size="1">
+            <select name="f12" id="f12" size="1">
             
             <!-- TMPL_IF name="f1201" -->
                 <option value="01" selected="selected">01- ISO 646, IRV version (basic Latin set)</option>
@@ -477,7 +470,7 @@ level)</option>
             <!-- /TMPL_IF -->
             
              <!-- TMPL_IF name="f1211" -->
-                <option value="11"  selected="selected">11- ISO 5426-2 (Latin characters used in minor European
+                <option value="11" selected="selected">11- ISO 5426-2 (Latin characters used in minor European
 languages and obsolete typography)
 </option>
             <!-- TMPL_ELSE -->
@@ -497,11 +490,11 @@ languages and obsolete typography)
 
     </tr>
     <tr>
-    <td>Character Sets (Mandatory) 2</td>
+    <td><label for="f13">Character Sets (Mandatory) 2</label></td>
         <td>
-            <select name="f13" size="1">
+            <select name="f13" id="f13" size="1">
             
-            <!-- TMPL_IF name="f13  " -->
+            <!-- TMPL_IF name="f13" -->
                     <option value="  " selected="selected">non required value</option>
             <!-- TMPL_ELSE -->
                     <option value="  ">non required value</option>
@@ -519,7 +512,7 @@ languages and obsolete typography)
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f1303" -->
                 <option value="03"
-        selected="selected">03- ISO 5426 (extended Latin set)</option>
+ selected="selected">03- ISO 5426 (extended Latin set)</option>
             <!-- TMPL_ELSE -->
                 <option value="03">03- ISO 5426 (extended Latin set)</option>
             <!-- /TMPL_IF -->
@@ -558,7 +551,7 @@ languages and obsolete typography)
             <!-- /TMPL_IF -->
             
              <!-- TMPL_IF name="f1311" -->
-                <option value="11"  selected="selected">11- ISO 5426-2 (Latin characters used in minor European
+                <option value="11" selected="selected">11- ISO 5426-2 (Latin characters used in minor European
 languages and obsolete typography)</option>
             <!-- TMPL_ELSE -->
                 <option value="11">11- ISO 5426-2 (Latin characters used in minor European
@@ -575,16 +568,16 @@ languages and obsolete typography)</option>
     </tr>
 
     <tr>
-        <td>Additional Character Sets</td>
+        <td><label for="f14">Additional Character Sets</label></td>
         <td>
-            <input type="text" name="f14" maxlength="4" size="5" value="<!-- TMPL_VAR name="f14" -->" />
+            <input type="text" name="f14" id="f14" maxlength="4" size="5" value="<!-- TMPL_VAR name="f14" -->" />
         </td>
     </tr>
 
     <tr>
-    <td>Script of Title</td>
+    <td><label for="f15">Script of Title</label></td>
     <td>
-    <select name="f15" size="1">
+    <select name="f15" id="f15" size="1">
             <!-- TMPL_IF name="f15 " -->
                     <option value=" " selected="selected">Non required value</option>
             <!-- TMPL_ELSE -->
@@ -681,12 +674,11 @@ languages and obsolete typography)</option>
             </select>
     </td>
     </tr>
-    
-    <tr><td colspan="2"><input type="button" value="OK"  onclick="report();" /></td></tr>
 </table>
+<p><input type="button" value="OK"  onclick="report();" /> <a href="#" class="cancel close">Cancel</a> </p>
 </form>
-<script type="text/javascript" language="javascript">
-
+<script type="text/javascript">
+//<![CDATA[
 //     GetPublicationDate(); // running directly.
 // 
 //     /**
@@ -748,6 +740,6 @@ languages and obsolete typography)</option>
         self.close();
         return false;
     }
+//]]>
 </script>
-</body>
-</html>
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_105.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_105.tmpl
index 8d3fe39..60e0825 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_105.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_105.tmpl
@@ -1,18 +1,15 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 105 builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 105 builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 105 builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Illustration codes 1:</td>
+		<td><label for="f1">Illustration codes 1:</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
 			<!-- TMPL_IF name="f1|" -->
             	           <option value="|" selected="selected">|- Filling character</option>
                         <!-- TMPL_ELSE -->
@@ -108,9 +105,9 @@
 			<!-- /TMPL_IF -->
 			</select>
 		</td>
-		<td>Illustration codes 2:</td>
+		<td><label for="f2">Illustration codes 2:</label></td>
 		<td>
-			<select name="f2" size="1">
+			<select name="f2" id="f2" size="1">
 			<!-- TMPL_IF name="f2|" -->
                             <option value="|" selected="selected">|- Filling character</option>
                         <!-- TMPL_ELSE -->
@@ -203,10 +200,11 @@
 				<option value="y">y - no illustrations</option>
 			<!-- /TMPL_IF -->
 			</select>
-		</td></tr><tr>
-		<td>Illustration codes 3:</td>
+		</td></tr>
+		<tr>
+		<td><label for="f3">Illustration codes 3:</label></td>
 		<td>
-			<select name="f3" size="1">
+			<select name="f3" id="f3" size="1">
 			<!-- TMPL_IF name="f3|" -->
                             <option value="|" selected="selected">|- Filling character</option>
                         <!-- TMPL_ELSE -->
@@ -300,9 +298,9 @@
 			<!-- /TMPL_IF -->
 			</select>
 		</td>
-		<td>Illustration codes 4:</td>
+		<td><label for="f4">Illustration codes 4:</label></td>
 		<td>
-			<select name="f4" size="1">
+			<select name="f4" id="f4" size="1">
 			<!-- TMPL_IF name="f4|" -->
             	<option value="|" selected="selected">|- Filling character</option>
             <!-- TMPL_ELSE -->
@@ -397,9 +395,9 @@
 			</select>
 		</td>
 	</tr>
-	<tr>		<td>Form of contents codes 1:</td>
+	<tr>		<td><label for="f5">Form of contents codes 1:</label></td>
 		<td>
-			<select name="f5" size="1">
+			<select name="f5" id="f5" size="1">
                         <!-- TMPL_IF name="f5|" -->
                             <option value="|" selected="selected">|- Filling character</option>
                         <!-- TMPL_ELSE -->
@@ -535,9 +533,9 @@
 			<!-- /TMPL_IF -->
 			</select>
 		</td>
-		<td>Form of contents codes 2:</td>
+		<td><label for="f6">Form of contents codes 2:</label></td>
 		<td>
-			<select name="f6" size="1">
+			<select name="f6" id="f6" size="1">
 			<!-- TMPL_IF name="f6|" -->
                             <option value="|" selected="selected">|- Filling character</option>
                         <!-- TMPL_ELSE -->
@@ -672,9 +670,10 @@
 				<option value="z">z - other</option>
 			<!-- /TMPL_IF -->
 			</select>
-		</td></tr><tr>		<td>Form of contents codes 3:</td>
+		</td></tr>
+		<tr>		<td><label for="f7">Form of contents codes 3:</label></td>
 		<td>
-			<select name="f7" size="1">
+			<select name="f7" id="f7" size="1">
 			<!-- TMPL_IF name="f7|" -->
                             <option value="|" selected="selected">|- Filling character</option>
                         <!-- TMPL_ELSE -->
@@ -809,9 +808,9 @@
 			<!-- /TMPL_IF -->
 			</select>
 		</td>
-                  <td>Form of contents codes 4:</td>
+                  <td><label for="f8">Form of contents codes 4:</label></td>
 		<td>
-			<select name="f8" size="1">
+			<select name="f8" id="f8" size="1">
                         <!-- TMPL_IF name="f8|" -->
                             <option value="|" selected="selected">|- Filling character</option>
                         <!-- TMPL_ELSE -->
@@ -947,77 +946,83 @@
 		</td>
 </tr>
   <tr>
-        <td>Conference or meeting code :</td>
+        <td><label for="f9">Conference or meeting code:</label></td>
                 <td>
-                <select name="f9" size="1">
+                <select name="f9" id="f9" size="1">
                	<!-- TMPL_IF name="f1|" -->
             		<option value="|" selected="selected">|- Filling character</option>
 	            <!-- TMPL_ELSE -->
     	        	<option value="|">|- Filling character</option>
         	    <!-- /TMPL_IF -->
         	    
-	            <!-- TMPL_IF name="f90" -->
+	            <!-- TMPL_IF name="f90" id="f90" -->
     	            <option value="0" selected="selected">0- not a conference publication</option>
         	    <!-- TMPL_ELSE -->
                     <option value="0">0- not a conference publication</option>
                 <!-- /TMPL_IF -->
                 
-                <!-- TMPL_IF name="f91" -->
+                <!-- TMPL_IF name="f91" id="f91" -->
                     <option value="1" selected="selected">1- conference publication</option>
                 <!-- TMPL_ELSE -->
                     <option value="1">1- conference publication</option>
                 <!-- /TMPL_IF -->
+                </select>
+                </td>
         </tr>
         
 	    <tr>
 	    
-        <td>Festschrift indicator</td>
+        <td><label for="f10">Festschrift indicator:</label></td>
                 <td>
-                <select name="f10" size="1">
+                <select name="f10" id="f10" size="1">
                 <!-- TMPL_IF name="f10|" -->
                     <option value="|" selected="selected">|- Filling character</option>
                 <!-- TMPL_ELSE -->
                     <option value="|">|- Filling character</option>
                 <!-- /TMPL_IF -->
                         
-                <!-- TMPL_IF name="f100" -->
+                <!-- TMPL_IF name="f100" id="f100" -->
                         <option value="0" selected="selected">0 - not a festschrift</option>
                 <!-- TMPL_ELSE -->
                         <option	value="0">0 - not a festschrift</option>
                 <!-- /TMPL_IF -->
                 
-                <!-- TMPL_IF name="f101" -->
+                <!-- TMPL_IF name="f101" id="f101" -->
                         <option value="1" selected="selected">1 - festschrift</option>
                 <!-- TMPL_ELSE -->
                         <option value="1">1 - festschrift</option>
                 <!-- /TMPL_IF -->
+                </select>
+                </td>
         </tr>
   <tr>
-        <td>Index indicator</td>
+        <td><label for="f11">Index indicator</label></td>
                 <td>
-                        <select name="f11" size="1">
+                        <select name="f11" id="f11" size="1">
                         <!-- TMPL_IF name="f11|" -->
                             <option value="|" selected="selected">|- Filling character</option>
                         <!-- TMPL_ELSE -->
                             <option value="|">|- Filling character</option>
                         <!-- /TMPL_IF -->
                         
-                        <!-- TMPL_IF name="f110" -->
+                        <!-- TMPL_IF name="f110" id="f110" -->
                                 <option value="0" selected="selected">0 - no index</option>
                         <!-- TMPL_ELSE -->
                                 <option	value="0">0 - no index</option>
                         <!-- /TMPL_IF -->
                         
-                        <!-- TMPL_IF name="f111" -->
+                        <!-- TMPL_IF name="f111" id="f111" -->
                                 <option value="1" selected="selected">1 - index present</option>
                         <!-- TMPL_ELSE -->
                                 <option value="1">1 - index present</option>
                         <!-- /TMPL_IF -->
+                        </select>
+                </td>
         </tr>
   <tr>
-        <td>Literature code</td>
+        <td><label for="f12">Literature code</label></td>
                 <td>
-                        <select name="f12" size="1">
+                        <select name="f12" id="f12" size="1">
                         <!-- TMPL_IF name="f12|" -->
                         <option value="|" selected="selected">|- Filling character</option>
                         <!-- TMPL_ELSE -->
@@ -1080,12 +1085,14 @@
                         <!-- TMPL_ELSE -->
                        <option value="z">z - multiple or other literary forms</option>
                         <!-- /TMPL_IF -->
+                        </select>
+                </td>
         </tr>
 
   <tr>
-        <td>Biography code</td>
+        <td><label for="f13">Biography code</label></td>
                 <td>
-                        <select name="f13" size="1">
+                        <select name="f13" id="f13" size="1">
                         
                         <!-- TMPL_IF name="f13|" -->
                         <option value="|" selected="selected">|- Filling character</option>
@@ -1120,12 +1127,14 @@
                         <!-- TMPL_ELSE -->
                                 <option value="d">d - contains biographical information</option>
                         <!-- /TMPL_IF -->
+                        </select>
+                </td>
         </tr>
-
-	<tr><td colspan="2"><input type="button" value="OK"  onclick="report();" /></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK"  onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
+//<![CDATA[
 	function report() {
             var doc   = opener.document; 
             var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
@@ -1134,6 +1143,7 @@
             window.close();
             return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_106.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_106.tmpl
index 9f564a4..370979d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_106.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_106.tmpl
@@ -1,18 +1,15 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 106 builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 106 builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 106 builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Form of item: Coded Data: Medium Designator (Not repeatable)</td>
+		<td><label for="f1">Form of item: Coded Data: Medium Designator (Not repeatable)</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
             
 			<!-- TMPL_IF name="f1r" -->
 				<option value="r" selected="selected">regular print</option>
@@ -83,12 +80,12 @@ supplement)</option>
 			</select>
 		</td>
 	</tr>
-	
-	<tr><td colspan="2"><input type="button" value="OK"  onclick="report();" /></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK"  onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
-<script>
-	function report() {
+<script type="text/javascript">
+//<![CDATA[
+function report() {
         var doc   = opener.document; 
         var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
     
@@ -96,6 +93,9 @@ supplement)</option>
         self.close();
         return false;
 	}
+
+//]]>
 </script>
-</body>
-</html>
+
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_110.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_110.tmpl
index ecf42ea..c47d3b9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_110.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_110.tmpl
@@ -1,18 +1,15 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 110 builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 110 builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 110 builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Type of continuing resource designator</td>
+		<td><label for="f1">Type of continuing resource designator</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
 			<!-- TMPL_IF name="f1|" -->
                             <option value="|" selected="selected">|- Filling character</option>
                         <!-- TMPL_ELSE -->
@@ -45,9 +42,9 @@
 	</tr>
 
 	<tr>
-		<td>Frequency of issue</td>
+		<td><label for="f2">Frequency of issue</label></td>
 		<td>
-			<select name="f2" size="1">
+			<select name="f2" id="f2" size="1">
 			<!-- TMPL_IF name="f2|" -->
                             <option value="|" selected="selected">|- Filling character</option>
                         <!-- TMPL_ELSE -->
@@ -155,9 +152,9 @@
 		</td>
 	</tr>
 	<tr>
-		<td>Regularity</td>
+		<td><label for="f3">Regularity</label></td>
 		<td>
-			<select name="f3" size="1">
+			<select name="f3" id="f3" size="1">
 			<!-- TMPL_IF name="f3|" -->
                             <option value="|" selected="selected">|- Filling character</option>
                         <!-- TMPL_ELSE -->
@@ -192,9 +189,9 @@
 	</tr>
 
 	<tr>
-		<td>Type of material code</td>
+		<td><label for="f4">Type of material code</label></td>
 		<td>
-			<select name="f4" size="1">
+			<select name="f4" id="f4" size="1">
 			<!-- TMPL_IF name="f4|" -->
                             <option value="|" selected="selected">|- Filling character</option>
                         <!-- TMPL_ELSE -->
@@ -327,26 +324,26 @@
 
         </tr>
    <tr>
-                <td>Nature of contents code</td>
-                <td><input type="text" name="f5" maxlength="3" size="4" value="<!-- TMPL_VAR name="f5" -->"></td>
+                <td><label for="f5">Nature of contents code</label></td>
+                <td><input type="text" name="f5" id="f5" maxlength="3" size="4" value="<!-- TMPL_VAR name="f5" -->" /></td>
 
 	</tr>
 	<tr>
-		<td>Conference publication indicator</td>
+		<td><label for="f6">Conference publication indicator</label></td>
 		<td>
-			<select name="f6" size="1">
+			<select name="f6" id="f6" size="1">
 			<!-- TMPL_IF name="f6|" -->
                             <option value="|" selected="selected">|- Filling character</option>
                         <!-- TMPL_ELSE -->
                             <option value="|">|- Filling character</option>
                         <!-- /TMPL_IF -->
                         
-			<!-- TMPL_IF name="f60" -->
+			<!-- TMPL_IF name="f60" id="f60" -->
 				<option value="0" selected="selected">not a conference publication</option>
 			<!-- TMPL_ELSE -->
 				<option value="0">not a conference publication</option>
 			<!-- /TMPL_IF -->
-			<!-- TMPL_IF name="f61" -->
+			<!-- TMPL_IF name="f61" id="f61" -->
 				<option value="1" selected="selected">conference publication</option>
 			<!-- TMPL_ELSE -->
 				<option value="1">conference publication</option>
@@ -354,10 +351,10 @@
 				</select>
 		</td>
 	</tr>
-
-			<td>Title-page availability code</td>
+	<tr>
+			<td><label for="f7">Title-page availability code</label></td>
 		<td>
-			<select name="f7" size="1">
+			<select name="f7" id="f7" size="1">
 			<!-- TMPL_IF name="f7|" -->
                             <option value="|" selected="selected">|- Filling character</option>
                         <!-- TMPL_ELSE -->
@@ -439,9 +436,9 @@
 	</tr>
 
 	<tr>
-		<td>Index availability code</td>
+		<td><label for="f8">Index availability code</label></td>
 		<td>
-			<select name="f8" size="1">
+			<select name="f8" id="f8" size="1">
 			<!-- TMPL_IF name="f8|" -->
                             <option value="|" selected="selected">|- Filling character</option>
                         <!-- TMPL_ELSE -->
@@ -569,21 +566,21 @@
 		</td>
 	</tr>
 	<tr>
-		<td>Cumulative index availability code</td>
+		<td><label for="f9">Cumulative index availability code</label></td>
 		<td>
-			<select name="f9" size="1">
+			<select name="f9" id="f9" size="1">
 			<!-- TMPL_IF name="f9|" -->
                             <option value="|" selected="selected">|- Filling character</option>
                         <!-- TMPL_ELSE -->
                             <option value="|">|- Filling character</option>
                         <!-- /TMPL_IF -->
             
-			<!-- TMPL_IF name="f90" -->
+			<!-- TMPL_IF name="f90" id="f90" -->
 				<option value="0" selected="selected">no cumulative index or table of contents</option>
 			<!-- TMPL_ELSE -->
 				<option value="0">no cumulative index or table of contents</option>
 			<!-- /TMPL_IF -->
-			<!-- TMPL_IF name="f91" -->
+			<!-- TMPL_IF name="f91" id="f91" -->
 				<option value="1" selected="selected">cumulative index or table of contents available</option>
 			<!-- TMPL_ELSE -->
 				<option value="1">cumulative index or table of contents available</option>
@@ -591,11 +588,11 @@
 				</select>
 		</td>
 	</tr>
-
-	<tr><td colspan="2"><input type="button" value="OK"  onclick="report();" /></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
+//<![CDATA[
     function report() {
         document.f_pop.f5.value=document.f_pop.f5.value+'   ';
         document.f_pop.f5.value=document.f_pop.f5.value.substring(0,3);
@@ -605,6 +602,7 @@
         self.close();
         return false;
     }
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_115a.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_115a.tmpl
index 8f4078a..955b998 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_115a.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_115a.tmpl
@@ -1,36 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 115a builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 115a builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 115a builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Type of material</td>
+		<td><label for="f1">Type of material</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
 			<!-- TMPL_IF name="f1|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
-            <!-- TMPL_ELSE -->
-            	<option value="|">|- Filling character</option>
-            <!-- /TMPL_IF -->
+				<option value="|" selected="selected">|- Filling character</option>
+			<!-- TMPL_ELSE -->
+				<option value="|">|- Filling character</option>
+			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f1a" -->
-				<option value="a" SELECTED>motion picture</option>
+				<option value="a" selected="selected">motion picture</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">motion picture</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1b" -->
-				<option value="b" SELECTED>visual projection</option>
+				<option value="b" selected="selected">visual projection</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">visual projection</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1c" -->
-				<option value="c" SELECTED>videorecording</option>
+				<option value="c" selected="selected">videorecording</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">videorecording</option>
 	
@@ -41,50 +38,50 @@
 	</tr>
 
    <tr>
-                <td>Lenght</td>
-                <td><input type="text" name="f2" maxlength=3 size=4 value="<!-- TMPL_VAR name="f2" -->"></td>
+			    <td><label for="f2">Length</label></td>
+			    <td><input type="text" name="f2" id="f2" maxlength="3" size="4" value="<!-- TMPL_VAR name="f2" -->" /></td>
 
 	</tr>
 
 
 	<tr>
-		<td>Colour indicator</td>
+		<td><label for="f3">Colour indicator</label></td>
 		<td>
-	<select name="f3" size="1">
+	<select name="f3" id="f3" size="1">
 			<!-- TMPL_IF name="f1|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
-            <!-- TMPL_ELSE -->
-            	<option value="|">|- Filling character</option>
-            <!-- /TMPL_IF -->
+				<option value="|" selected="selected">|- Filling character</option>
+			<!-- TMPL_ELSE -->
+				<option value="|">|- Filling character</option>
+			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f3a" -->
-				<option value="a" SELECTED>black and white</option>
+				<option value="a" selected="selected">black and white</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">black and white</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f3b" -->
-				<option value="b" SELECTED>colour</option>
+				<option value="b" selected="selected">colour</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">colour</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f3c" -->
-				<option value="c" SELECTED>combination of black and white and colour</option>
+				<option value="c" selected="selected">combination of black and white and colour</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">combination of black and white and colour</option>
 	
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f3u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 	
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f3z" -->
-				<option value="z" SELECTED>other (sepia, tinted, etc.)</option>
+				<option value="z" selected="selected">other (sepia, tinted, etc.)</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other (sepia, tinted, etc.)</option>
 	
@@ -95,35 +92,35 @@
 	</tr>
 
 	<tr>
-		<td>Sound indicator</td>
+		<td><label for="f4">Sound indicator</label></td>
 		<td>
-			<select name="f4" size="1">
+			<select name="f4" id="f4" size="1">
 			<!-- TMPL_IF name="f4|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
-            <!-- TMPL_ELSE -->
-            	<option value="|">|- Filling character</option>
-            <!-- /TMPL_IF -->
-                	<!-- TMPL_IF name="f4a" -->
-				<option value="a" SELECTED>sound on medium</option>
+				<option value="|" selected="selected">|- Filling character</option>
+			<!-- TMPL_ELSE -->
+				<option value="|">|- Filling character</option>
+			<!-- /TMPL_IF -->
+			    	<!-- TMPL_IF name="f4a" -->
+				<option value="a" selected="selected">sound on medium</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">sound on medium</option>
 	
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f4b" -->
-				<option value="b" SELECTED>soundtrack separate</option>
+				<option value="b" selected="selected">soundtrack separate</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">soundtrack separate</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f4u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f4y" -->
-				<option value="y" SELECTED>no sound</option>
+				<option value="y" selected="selected">no sound</option>
 			<!-- TMPL_ELSE -->
 				<option value="y">no sound</option>
 
@@ -134,229 +131,229 @@
 
 
 	<tr>
-		<td>Media for sound</td>
+		<td><label for="f5">Media for sound</label></td>
 		<td>
-			<select name="f5" size="1">
+			<select name="f5" id="f5" size="1">
 			<!-- TMPL_IF name="f5|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
-            <!-- TMPL_ELSE -->
-            	<option value="|">|- Filling character</option>
-            <!-- /TMPL_IF -->
+				<option value="|" selected="selected">|- Filling character</option>
+			<!-- TMPL_ELSE -->
+				<option value="|">|- Filling character</option>
+			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5a" -->
-				<option value="a" SELECTED>optical sound track on motion picture film</option>
+				<option value="a" selected="selected">optical sound track on motion picture film</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">optical sound track on motion picture film</option>
 	
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5b" -->
-				<option value="b" SELECTED>magnetic sound track on motion picture film</option>
+				<option value="b" selected="selected">magnetic sound track on motion picture film</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">magnetic sound track on motion picture film</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5c" -->
-				<option value="c" SELECTED>magnetic audio tape in cartridge</option>
+				<option value="c" selected="selected">magnetic audio tape in cartridge</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">magnetic audio tape in cartridge</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5d" -->
-				<option value="d" SELECTED>sound disc</option>
+				<option value="d" selected="selected">sound disc</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">sound disc</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5g" -->
-				<option value="g" SELECTED>optical and magnetic sound track on motion picture film</option>
+				<option value="g" selected="selected">optical and magnetic sound track on motion picture film</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">optical and magnetic sound track on motion picture film</option>
 
 			<!-- /TMPL_IF -->
 			
 			<!-- TMPL_IF name="f5h" -->
-				<option value="h" SELECTED>videotape</option>
+				<option value="h" selected="selected">videotape</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">videotape</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5i" -->
-				<option value="i" SELECTED>videodisc</option>
+				<option value="i" selected="selected">videodisc</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">videodisc</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5e" -->
-				<option value="e" SELECTED>magnetic audio tape on reel</option>
+				<option value="e" selected="selected">magnetic audio tape on reel</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">magnetic audio tape on reel</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5f" -->
-				<option value="f" SELECTED>magnetic audio tape in cassette</option>
+				<option value="f" selected="selected">magnetic audio tape in cassette</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">magnetic audio tape in cassette</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5x" -->
-				<option value="x" SELECTED>no sound</option>
+				<option value="x" selected="selected">no sound</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">no sound</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 
 			<!-- /TMPL_IF -->
 				</select>
 		</td>
-        </tr>
+		</tr>
 
 	<tr>
-		<td>Width or dimensions</td>
+		<td><label for="f6">Width or dimensions</label></td>
 		<td>
-			<select name="f6" size="1">
+			<select name="f6" id="f6" size="1">
 			<!-- TMPL_IF name="f6|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
-            <!-- TMPL_ELSE -->
-            	<option value="|">|- Filling character</option>
-            <!-- /TMPL_IF -->
+				<option value="|" selected="selected">|- Filling character</option>
+			<!-- TMPL_ELSE -->
+				<option value="|">|- Filling character</option>
+			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6a" -->
-				<option value="a" SELECTED>Motion pictures and filmstrips => 8 mm</option>
+				<option value="a" selected="selected">Motion pictures and filmstrips => 8 mm</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">Motion pictures and filmstrips => 8mm</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6b" -->
-				<option value="b" SELECTED>Motion pictures and filmstrips => Super 8 mm</option>
+				<option value="b" selected="selected">Motion pictures and filmstrips => Super 8 mm</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">Motion pictures and filmstrips => Super 8 mm</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6c" -->
-				<option value="c" SELECTED>Motion pictures and filmstrips => 9.5 mm</option>
+				<option value="c" selected="selected">Motion pictures and filmstrips => 9.5 mm</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">Motion pictures and filmstrips => 9.5 mm</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6d" -->
-				<option value="d" SELECTED>Motion pictures and filmstrips => 16 mm</option>
+				<option value="d" selected="selected">Motion pictures and filmstrips => 16 mm</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">Motion pictures and filmstrips => 16 mm</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6e" -->
-				<option value="e" SELECTED>Motion pictures and filmstrips => 28 mm</option>
+				<option value="e" selected="selected">Motion pictures and filmstrips => 28 mm</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">Motion pictures and filmstrips => 28 mm</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6f" -->
-				<option value="f" SELECTED>Motion pictures and filmstrips => 35 mm</option>
+				<option value="f" selected="selected">Motion pictures and filmstrips => 35 mm</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">Motion pictures and filmstrips => 35 mm</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6g" -->
-				<option value="g" SELECTED>Motion pictures and filmstrips => 70 mm</option>
+				<option value="g" selected="selected">Motion pictures and filmstrips => 70 mm</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">Motion pictures and filmstrips => 70 mm</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6k" -->
-				<option value="k" SELECTED>Slides 21⁄4 x 21⁄4 in. (5.5*5.5 cm)</option>
+				<option value="k" selected="selected">Slides 21⁄4 x 21⁄4 in. (5.5*5.5 cm)</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">Slides 21⁄4 x 21⁄4 in. (5.5*5.5 cm)</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6l" -->
-				<option value="l" SELECTED>Slides 2 x 2in. (5*5 cm)</option>
+				<option value="l" selected="selected">Slides 2 x 2in. (5*5 cm)</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">Slides 2 x 2in. (5*5 cm)</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6m" -->
-				<option value="m" SELECTED>Videotapes 1/4 in. (2 cm)</option>
+				<option value="m" selected="selected">Videotapes 1/4 in. (2 cm)</option>
 			<!-- TMPL_ELSE -->
 				<option value="m">Videotapes 1/4 in. (2 cm)</option>
 			<!-- /TMPL_IF -->
 			
 			<!-- TMPL_IF name="f6n" -->
-				<option value="n" SELECTED>Videotapes 1/4 in. (1/2 cm)</option>
+				<option value="n" selected="selected">Videotapes 1/4 in. (1/2 cm)</option>
 			<!-- TMPL_ELSE -->
 				<option value="n">Videotapes 1/4 in. (1/2 cm)</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6o" -->
-				<option value="o" SELECTED>Videotapes 1/2 in. (1 cm 1/3) </option>
+				<option value="o" selected="selected">Videotapes 1/2 in. (1 cm 1/3) </option>
 			<!-- TMPL_ELSE -->
 				<option value="o">Videotapes 1/2 in. (1 cm 1/3)</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6p" -->
-				<option value="p" SELECTED>Videotapes 1 in. (2 cm 1/2)</option>
+				<option value="p" selected="selected">Videotapes 1 in. (2 cm 1/2)</option>
 			<!-- TMPL_ELSE -->
 				<option value="p">Videotapes 1 in. (2 cm 1/2)</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6q" -->
-				<option value="q" SELECTED>Videotapes 2 in. (5 cm)</option>
+				<option value="q" selected="selected">Videotapes 2 in. (5 cm)</option>
 			<!-- TMPL_ELSE -->
 				<option value="q">Videotapes 2 in. (5 cm)</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6r" -->
-				<option value="r" SELECTED>Transparencies 8 * 10 in. (20 * 25 cm)</option>
+				<option value="r" selected="selected">Transparencies 8 * 10 in. (20 * 25 cm)</option>
 			<!-- TMPL_ELSE -->
 				<option value="r">Transparencies 8 * 10 in. (20 * 25 cm)</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6s" -->
-				<option value="s" SELECTED>Transparencies 4 * 5 in. (10 * 12.5 cm)</option>
+				<option value="s" selected="selected">Transparencies 4 * 5 in. (10 * 12.5 cm)</option>
 			<!-- TMPL_ELSE -->
 				<option value="s">Transparencies 4 * 5 in. (10 * 12.5 cm)</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6t" -->
-				<option value="t" SELECTED>Transparencies 5 * 7 in. (12.5 * 17.5 cm)</option>
+				<option value="t" selected="selected">Transparencies 5 * 7 in. (12.5 * 17.5 cm)</option>
 			<!-- TMPL_ELSE -->
 				<option value="t">Transparencies 5 * 7 in. (12.5 * 17.5 cm)</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6u" -->
-				<option value="u" SELECTED>Transparencies 7 * 7 in. (17.5 * 17.5 cm)</option>
+				<option value="u" selected="selected">Transparencies 7 * 7 in. (17.5 * 17.5 cm)</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">Transparencies 7 * 7 in. (17.5 * 17.5 cm)</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6v" -->
-				<option value="v" SELECTED>Transparencies 8 * 8 in. (20 * 20 cm)</option>
+				<option value="v" selected="selected">Transparencies 8 * 8 in. (20 * 20 cm)</option>
 			<!-- TMPL_ELSE -->
 				<option value="v">Transparencies 8 * 8 in. (20 * 20 cm)</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6w" -->
-				<option value="w" SELECTED>Transparencies 9 * 9 in. (22.5 * 22.5 cm)</option>
+				<option value="w" selected="selected">Transparencies 9 * 9 in. (22.5 * 22.5 cm)</option>
 			<!-- TMPL_ELSE -->
 				<option value="w">Transparencies 8 * 10 in. (20 * 25 cm)</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6x" -->
-				<option value="x" SELECTED>Transparencies 10 * 10 in. (25 * 25 cm)</option>
+				<option value="x" selected="selected">Transparencies 10 * 10 in. (25 * 25 cm)</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">Transparencies 10 * 10 in. (25 * 25 cm)</option>
 			<!-- /TMPL_IF -->
@@ -365,91 +362,91 @@
         </tr>
 
 	<tr>
-		<td>Form of release - visual projection, motion picture</td>
+		<td><label for="f7">Form of release - visual projection, motion picture</label></td>
 		<td>
-			<select name="f7" size="1">
+			<select name="f7" id="f7" size="1">
 			<!-- TMPL_IF name="f7|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
-            <!-- TMPL_ELSE -->
-            	<option value="|">|- Filling character</option>
-            <!-- /TMPL_IF -->
+				<option value="|" selected="selected">|- Filling character</option>
+			<!-- TMPL_ELSE -->
+				<option value="|">|- Filling character</option>
+			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7a" -->
-				<option value="a" SELECTED>film reel</option>
+				<option value="a" selected="selected">film reel</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">film reel</option>
 	
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7b" -->
-				<option value="b" SELECTED>film cartridge</option>
+				<option value="b" selected="selected">film cartridge</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">film cartridge</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7c" -->
-				<option value="c" SELECTED>film cassette</option>
+				<option value="c" selected="selected">film cassette</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">film cassette</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7d" -->
-				<option value="d" SELECTED>other film type/option>
+				<option value="d" selected="selected">other film type/option>
 			<!-- TMPL_ELSE -->
 				<option value="d">other film type</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7g" -->
-				<option value="g" SELECTED>filmstrip cartridge</option>
+				<option value="g" selected="selected">filmstrip cartridge</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">filmstrip cartridge</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7h" -->
-				<option value="h" SELECTED>filmslip</option>
+				<option value="h" selected="selected">filmslip</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">filmslip</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7i" -->
-				<option value="i" SELECTED>other filmstrip type</option>
+				<option value="i" selected="selected">other filmstrip type</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">other filmstrip type</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7j" -->
-				<option value="j" SELECTED>film strip roll</option>
+				<option value="j" selected="selected">film strip roll</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">film strip roll</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7k" -->
-				<option value="k" SELECTED>slide, slide set, stereograph</option>
+				<option value="k" selected="selected">slide, slide set, stereograph</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">slide, slide set, stereograph</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7l" -->
-				<option value="l" SELECTED>transparency</option>
+				<option value="l" selected="selected">transparency</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">transparency</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7x" -->
-				<option value="x" SELECTED>not a motion picture or visual projection</option>
+				<option value="x" selected="selected">not a motion picture or visual projection</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not a motion picture or visual projection</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7z" -->
-				<option value="z" SELECTED>other forms of release</option>
+				<option value="z" selected="selected">other forms of release</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other forms of release</option>
 			<!-- /TMPL_IF -->
@@ -458,49 +455,49 @@
         </tr>
 
 	<tr>
-		<td>Technique - videorecording, motion picture</td>
+		<td><label for="f8">Technique - videorecording, motion picture</label></td>
 		<td>
-		<select name="f8" size="1">
+		<select name="f8" id="f8" size="1">
 			<!-- TMPL_IF name="f8|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
-            <!-- TMPL_ELSE -->
-            	<option value="|">|- Filling character</option>
-            <!-- /TMPL_IF -->
+				<option value="|" selected="selected">|- Filling character</option>
+			<!-- TMPL_ELSE -->
+				<option value="|">|- Filling character</option>
+			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8a" -->
-				<option value="a" SELECTED>animation</option>
+				<option value="a" selected="selected">animation</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">animation</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8b" -->
-				<option value="b" SELECTED>live action</option>
+				<option value="b" selected="selected">live action</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">live action</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8c" -->
-				<option value="c" SELECTED>animation and live action</option>
+				<option value="c" selected="selected">animation and live action</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">animation and live action</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8u" -->
-				<option value="u" SELECTED>unspecified/unknown</option>
+				<option value="u" selected="selected">unspecified/unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unspecified/unknown</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8x" -->
-				<option value="x" SELECTED>not a motion picture or video recording</option>
+				<option value="x" selected="selected">not a motion picture or video recording</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not a motion picture or video recording</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 
@@ -512,59 +509,59 @@
         </tr>
 
 	<tr>
-		<td>Presentation format - motion picture</td>
+		<td><label for="f9">Presentation format - motion picture</label></td>
 		<td>
-			<select name="f9" size="1">
+			<select name="f9" id="f9" size="1">
 			<!-- TMPL_IF name="f9|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
-            <!-- TMPL_ELSE -->
-            	<option value="|">|- Filling character</option>
-            <!-- /TMPL_IF -->
+				<option value="|" selected="selected">|- Filling character</option>
+			<!-- TMPL_ELSE -->
+				<option value="|">|- Filling character</option>
+			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9a" -->
-				<option value="a" SELECTED>standard sound aperture (reduced format)</option>
+				<option value="a" selected="selected">standard sound aperture (reduced format)</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">standard sound aperture (reduced format)</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9b" -->
-				<option value="b" SELECTED>non-anamorphic (wide screen)</option>
+				<option value="b" selected="selected">non-anamorphic (wide screen)</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">non-anamorphic (wide screen)</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9c" -->
-				<option value="c" SELECTED>3D</option>
+				<option value="c" selected="selected">3D</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">3D</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9d" -->
-				<option value="d" SELECTED>anamorphic (wide screen)</option>
+				<option value="d" selected="selected">anamorphic (wide screen)</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">anamorphic (wide screen)</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9e" -->
-				<option value="e" SELECTED>standard silent aperture</option>
+				<option value="e" selected="selected">standard silent aperture</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">standard silent aperture</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9f" -->
-				<option value="f" SELECTED>other wide screen format</option>
+				<option value="f" selected="selected">other wide screen format</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">other wide screen format</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9x" -->
-				<option value="x" SELECTED>not a motion picture</option>
+				<option value="x" selected="selected">not a motion picture</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not a motion picture</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
@@ -574,135 +571,137 @@
         </tr>
 
 	<tr>
-		<td>Accompanying material 1</td>
+		<td><label for="f10">Accompanying material 1</label></td>
 		<td>
-			<select name="f10" size="1">
+			<select name="f10" id="f10" size="1">
 			<!-- TMPL_IF name="f10|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
-            <!-- TMPL_ELSE -->
-            	<option value="|">|- Filling character</option>
-            <!-- /TMPL_IF -->
+				<option value="|" selected="selected">|- Filling character</option>
+			<!-- TMPL_ELSE -->
+				<option value="|">|- Filling character</option>
+			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10a" -->
-				<option value="a" SELECTED>stills</option>
+				<option value="a" selected="selected">stills</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">stills</option>
 	
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10b" -->
-				<option value="b" SELECTED>script material</option>
+				<option value="b" selected="selected">script material</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">script material</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10c" -->
-				<option value="c" SELECTED>posters</option>
+				<option value="c" selected="selected">posters</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">posters</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10d" -->
-				<option value="d" SELECTED>programmes and pressbooks</option>
+				<option value="d" selected="selected">programmes and pressbooks</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">programmes and pressbooks</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10e" -->
-				<option value="e" SELECTED>lobby cards</option>
+				<option value="e" selected="selected">lobby cards</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">lobby cards</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10f" -->
-				<option value="f" SELECTED>instructional materials</option>
+				<option value="f" selected="selected">instructional materials</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">instructional materials</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10g" -->
-				<option value="g" SELECTED>score or other music format</option>
+				<option value="g" selected="selected">score or other music format</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">score or other music format</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10h" -->
-				<option value="h" SELECTED>set or costume designs</option>
+				<option value="h" selected="selected">set or costume designs</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">set or costume designs</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10z" -->
-				<option value="z" SELECTED>other accompanying material</option>
+				<option value="z" selected="selected">other accompanying material</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other accompanying material</option>
 			<!-- /TMPL_IF -->
 
 				</select>
 		</td>
-		<td>Accompanying material 2</td>
+		</tr>
+		<tr>
+		<td><label for="f11">Accompanying material 2</label></td>
 		<td>
-			<select name="f11" size="1">
+			<select name="f11" id="f11" size="1">
 			<!-- TMPL_IF name="f11|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
-            <!-- TMPL_ELSE -->
-            	<option value="|">|- Filling character</option>
-            <!-- /TMPL_IF -->
-            
+				<option value="|" selected="selected">|- Filling character</option>
+			<!-- TMPL_ELSE -->
+				<option value="|">|- Filling character</option>
+			<!-- /TMPL_IF -->
+			
 			<!-- TMPL_IF name="f11a" -->
-				<option value="a" SELECTED>stills</option>
+				<option value="a" selected="selected">stills</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">stills</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f11b" -->
-				<option value="b" SELECTED>script material</option>
+				<option value="b" selected="selected">script material</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">script material</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f11c" -->
-				<option value="c" SELECTED>posters</option>
+				<option value="c" selected="selected">posters</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">posters</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f11d" -->
-				<option value="d" SELECTED>programmes and pressbooks</option>
+				<option value="d" selected="selected">programmes and pressbooks</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">programmes and pressbooks</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f11e" -->
-				<option value="e" SELECTED>lobby cards</option>
+				<option value="e" selected="selected">lobby cards</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">lobby cards</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f11f" -->
-				<option value="f" SELECTED>instructional materials</option>
+				<option value="f" selected="selected">instructional materials</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">instructional materials</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f11g" -->
-				<option value="g" SELECTED>score or other music format</option>
+				<option value="g" selected="selected">score or other music format</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">score or other music format</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f11h" -->
-				<option value="h" SELECTED>set or costume designs</option>
+				<option value="h" selected="selected">set or costume designs</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">set or costume designs</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11z" -->
-				<option value="z" SELECTED>other accompanying material</option>
+				<option value="z" selected="selected">other accompanying material</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other accompanying material</option>
 
@@ -713,116 +712,118 @@
         </tr>
 
 	<tr>
-		<td>Accompanying material 3</td>
+		<td><label for="f12">Accompanying material 3</label></td>
 		<td>
-			<select name="f12" size="1">
+			<select name="f12" id="f12" size="1">
 			<!-- TMPL_IF name="f12|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
-            <!-- TMPL_ELSE -->
-            	<option value="|">|- Filling character</option>
-            <!-- /TMPL_IF -->
+				<option value="|" selected="selected">|- Filling character</option>
+			<!-- TMPL_ELSE -->
+				<option value="|">|- Filling character</option>
+			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f12a" -->
-				<option value="a" SELECTED>stills</option>
+				<option value="a" selected="selected">stills</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">stills</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f12b" -->
-				<option value="b" SELECTED>script material</option>
+				<option value="b" selected="selected">script material</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">script material</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f12c" -->
-				<option value="c" SELECTED>posters</option>
+				<option value="c" selected="selected">posters</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">posters</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f12d" -->
-				<option value="d" SELECTED>programmes and pressbooks</option>
+				<option value="d" selected="selected">programmes and pressbooks</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">programmes and pressbooks</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f12e" -->
-				<option value="e" SELECTED>lobby cards</option>
+				<option value="e" selected="selected">lobby cards</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">lobby cards</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f12f" -->
-				<option value="f" SELECTED>instructional materials</option>
+				<option value="f" selected="selected">instructional materials</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">instructional materials</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f12g" -->
-				<option value="g" SELECTED>score or other music format</option>
+				<option value="g" selected="selected">score or other music format</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">score or other music format</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f12h" -->
-				<option value="h" SELECTED>set or costume designs</option>
+				<option value="h" selected="selected">set or costume designs</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">set or costume designs</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12z" -->
-				<option value="z" SELECTED>other accompanying material</option>
+				<option value="z" selected="selected">other accompanying material</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other accompanying material</option>
 			<!-- /TMPL_IF -->
 
 				</select>
 		</td>
-		<td>Accompanying material 4</td>
+		</tr>
+		<tr>
+		<td><label for="f13">Accompanying material 4</label></td>
 		<td>
-			<select name="f13" size="1">
+			<select name="f13" id="f13" size="1">
 			<!-- TMPL_IF name="f13|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
-            <!-- TMPL_ELSE -->
-            	<option value="|">|- Filling character</option>
-            <!-- /TMPL_IF -->
+				<option value="|" selected="selected">|- Filling character</option>
+			<!-- TMPL_ELSE -->
+				<option value="|">|- Filling character</option>
+			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f13a" -->
-				<option value="a" SELECTED>stills</option>
+				<option value="a" selected="selected">stills</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">stills</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f13b" -->
-				<option value="b" SELECTED>script material</option>
+				<option value="b" selected="selected">script material</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">script material</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f13c" -->
-				<option value="c" SELECTED>posters</option>
+				<option value="c" selected="selected">posters</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">posters</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f13d" -->
-				<option value="d" SELECTED>programmes and pressbooks</option>
+				<option value="d" selected="selected">programmes and pressbooks</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">programmes and pressbooks</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f13e" -->
-				<option value="e" SELECTED>lobby cards</option>
+				<option value="e" selected="selected">lobby cards</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">lobby cards</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f13f" -->
-				<option value="f" SELECTED>instructional materials</option>
+				<option value="f" selected="selected">instructional materials</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">instructional materials</option>
 
@@ -830,7 +831,7 @@
 
 
 			<!-- TMPL_IF name="f13g" -->
-				<option value="g" SELECTED>score or other music format</option>
+				<option value="g" selected="selected">score or other music format</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">score or other music format</option>
 
@@ -838,13 +839,13 @@
 
 
 			<!-- TMPL_IF name="f13h" -->
-				<option value="h" SELECTED>set or costume designs</option>
+				<option value="h" selected="selected">set or costume designs</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">set or costume designs</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13z" -->
-				<option value="z" SELECTED>other accompanying material</option>
+				<option value="z" selected="selected">other accompanying material</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other accompanying material</option>
 
@@ -855,201 +856,201 @@
 
         </tr>
 
-<tr>		<td>Form of release - videorecording</td>
+<tr>		<td><label for="f14">Form of release - videorecording</label></td>
 		<td>
-			<select name="f14" size="1">
+			<select name="f14" id="f14" size="1">
 			<!-- TMPL_IF name="f14|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
-            <!-- TMPL_ELSE -->
-            	<option value="|">|- Filling character</option>
-            <!-- /TMPL_IF -->
+				<option value="|" selected="selected">|- Filling character</option>
+			<!-- TMPL_ELSE -->
+				<option value="|">|- Filling character</option>
+			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f14a" -->
-				<option value="a" SELECTED>videocartridge</option>
+				<option value="a" selected="selected">videocartridge</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">videocartridge</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f14b" -->
-				<option value="b" SELECTED>videodisc</option>
+				<option value="b" selected="selected">videodisc</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">videodisc</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f14c" -->
-				<option value="c" SELECTED>videocassette</option>
+				<option value="c" selected="selected">videocassette</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">videocassette</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f14d" -->
-				<option value="d" SELECTED>videoreel</option>
+				<option value="d" selected="selected">videoreel</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">videoreel</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f14e" -->
-				<option value="e" SELECTED>electronic videorecording (EVR)</option>
+				<option value="e" selected="selected">electronic videorecording (EVR)</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">electronic videorecording (EVR)</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f14x" -->
-				<option value="x" SELECTED>not a videorecording</option>
+				<option value="x" selected="selected">not a videorecording</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not a videorecording</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f14z" -->
-				<option value="z" SELECTED>other videotype</option>
+				<option value="z" selected="selected">other videotype</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other videotype</option>
 			<!-- /TMPL_IF -->
 				</select>
 		</td>
 </tr>	
-<tr>		<td>Presentation format - videorecording</td>
+<tr>		<td><label for="f15">Presentation format - videorecording</label></td>
 		<td>
-			<select name="f15" size="1">
+			<select name="f15" id="f15" size="1">
 			<!-- TMPL_IF name="f15|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
-            <!-- TMPL_ELSE -->
-            	<option value="|">|- Filling character</option>
-            <!-- /TMPL_IF -->
+				<option value="|" selected="selected">|- Filling character</option>
+			<!-- TMPL_ELSE -->
+				<option value="|">|- Filling character</option>
+			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f15a" -->
-				<option value="a" SELECTED>Beta</option>
+				<option value="a" selected="selected">Beta</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">Beta</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f15b" -->
-				<option value="b" SELECTED>VHS</option>
+				<option value="b" selected="selected">VHS</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">VHS</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f15c" -->
-				<option value="c" SELECTED>U-matic</option>
+				<option value="c" selected="selected">U-matic</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">U-matic</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f15d" -->
-				<option value="d" SELECTED>EIAJ (reel)</option>
+				<option value="d" selected="selected">EIAJ (reel)</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">EIAJ (reel)</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f15e" -->
-				<option value="e" SELECTED>Type C (reel)</option>
+				<option value="e" selected="selected">Type C (reel)</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">Type C (reel)</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f15f" -->
-				<option value="f" SELECTED>Quadruplex (reel)</option>
+				<option value="f" selected="selected">Quadruplex (reel)</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">Quadruplex (reel)</option>
 			<!-- /TMPL_IF -->
 
 
 			<!-- TMPL_IF name="f15g" -->
-				<option value="g" SELECTED>Laser optical (Reflective) videodisc</option>
+				<option value="g" selected="selected">Laser optical (Reflective) videodisc</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">Laser optical (Reflective) videodisc</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15h" -->
-				<option value="h" SELECTED>CED (capacitance electronic disk) videodisc</option>
+				<option value="h" selected="selected">CED (capacitance electronic disk) videodisc</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">CED (capacitance electronic disk) videodisc</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15i" -->
-				<option value="i" SELECTED>V2000 (videocassette)</option>
+				<option value="i" selected="selected">V2000 (videocassette)</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">V2000 (videocassette)</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15j" -->
-				<option value="j" SELECTED>Video8 (videocassette)</option>
+				<option value="j" selected="selected">Video8 (videocassette)</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">Video8 (videocassette)</option>
 				
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15k" -->
-				<option value="k" SELECTED>DVD-Video</option>
+				<option value="k" selected="selected">DVD-Video</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">DVD-Video</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15x" -->
-				<option value="x" SELECTED>not a videorecording</option>
+				<option value="x" selected="selected">not a videorecording</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not a videorecording</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
 				</select>
 		</td>
 </tr>	
-<tr>		<td>Base of emulsion material - visual projection</td>
+<tr>		<td><label for="f16">Base of emulsion material - visual projection</label></td>
 		<td>
-			<select name="f16" size="1">
+			<select name="f16" id="f16" size="1">
 				<!-- TMPL_IF name="f16|" -->
-            		<option value="|" SELECTED>|- Filling character</option>
-	            <!-- TMPL_ELSE -->
+					<option value="|" selected="selected">|- Filling character</option>
+				<!-- TMPL_ELSE -->
     	        	<option value="|">|- Filling character</option>
         	    <!-- /TMPL_IF -->
 
 				<!-- TMPL_IF name="f16a" -->
-					<option value="a" SELECTED>safety film</option>
+					<option value="a" selected="selected">safety film</option>
 				<!-- TMPL_ELSE -->
 					<option value="a">safety film</option>
 				<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f16b" -->
-				<option value="b" SELECTED>film base other than safety film</option>
+				<option value="b" selected="selected">film base other than safety film</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">film base other than safety film</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f16c" -->
-				<option value="c" SELECTED>synthetics (plastic, vinyl, etc.)</option>
+				<option value="c" selected="selected">synthetics (plastic, vinyl, etc.)</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">synthetics (plastic, vinyl, etc.)</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f16u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f16v" -->
-				<option value="v" SELECTED>mixed collection (containing more than one type of base)</option>
+				<option value="v" selected="selected">mixed collection (containing more than one type of base)</option>
 			<!-- TMPL_ELSE -->
 				<option value="v">mixed collection (containing more than one type of base)</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f16x" -->
-				<option value="x" SELECTED>not a visual projection</option>
+				<option value="x" selected="selected">not a visual projection</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not a visual projection</option>
 
@@ -1057,7 +1058,7 @@
 
 
 			<!-- TMPL_IF name="f16z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 
@@ -1065,50 +1066,50 @@
 				</select>
 		</td>
 </tr>	
-<tr>		<td>Secondary support material - visual projection</td>
+<tr>		<td><label for="f17">Secondary support material - visual projection</label></td>
 		<td>
-			<select name="f17" size="1">
+			<select name="f17" id="f17" size="1">
 			<!-- TMPL_IF name="f17|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
-            <!-- TMPL_ELSE -->
-            	<option value="|">|- Filling character</option>
-            <!-- /TMPL_IF -->
+				<option value="|" selected="selected">|- Filling character</option>
+			<!-- TMPL_ELSE -->
+				<option value="|">|- Filling character</option>
+			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f17a" -->
-				<option value="a" SELECTED>cardboard</option>
+				<option value="a" selected="selected">cardboard</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">cardboard</option>
 	
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f17b" -->
-				<option value="b" SELECTED>glass</option>
+				<option value="b" selected="selected">glass</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">glass</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f17c" -->
-				<option value="c" SELECTED>synthetics (plastic, vinyl, etc.)</option>
+				<option value="c" selected="selected">synthetics (plastic, vinyl, etc.)</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">synthetics (plastic, vinyl, etc.)</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f17d" -->
-				<option value="d" SELECTED>metall</option>
+				<option value="d" selected="selected">metall</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">metal</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f17e" -->
-				<option value="e" SELECTED>metal and glass</option>
+				<option value="e" selected="selected">metal and glass</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">metal and glass</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f17f" -->
-				<option value="f" SELECTED>synthetics (plastic, vinyl, etc.) and glass</option>
+				<option value="f" selected="selected">synthetics (plastic, vinyl, etc.) and glass</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">synthetics (plastic, vinyl, etc.) and glass</option>
 
@@ -1116,25 +1117,25 @@
 
 
 			<!-- TMPL_IF name="f17u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f17x" -->
-				<option value="x" SELECTED>not a visual projection</option>
+				<option value="x" selected="selected">not a visual projection</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not a visual projection</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f17y" -->
-				<option value="y" SELECTED>not present (no secondary support)</option>
+				<option value="y" selected="selected">not present (no secondary support)</option>
 			<!-- TMPL_ELSE -->
 				<option value="y">not present (no secondary support)</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f17z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 
@@ -1142,42 +1143,42 @@
 				</select>
 		</td>
 </tr>	
-<tr>		<td>Broadcast standard - videorecording</td>
+<tr>		<td><label for="f18">Broadcast standard - videorecording</label></td>
 		<td>
-			<select name="f18" size="1">
+			<select name="f18" id="f18" size="1">
 			<!-- TMPL_IF name="f18|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
-            <!-- TMPL_ELSE -->
-            	<option value="|">|- Filling character</option>
-            <!-- /TMPL_IF -->
+				<option value="|" selected="selected">|- Filling character</option>
+			<!-- TMPL_ELSE -->
+				<option value="|">|- Filling character</option>
+			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f18a" -->
-				<option value="a" SELECTED>405</option>
+				<option value="a" selected="selected">405</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">405</option>
 	
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f18b" -->
-				<option value="b" SELECTED>525 (e.g. NSTC)</option>
+				<option value="b" selected="selected">525 (e.g. NSTC)</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">525 (e.g. NSTC)</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f18c" -->
-				<option value="c" SELECTED>625 PAL</option>
+				<option value="c" selected="selected">625 PAL</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">625 PAL</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f18d" -->
-				<option value="d" SELECTED>625 SECAM</option>
+				<option value="d" selected="selected">625 SECAM</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">625 SECAM</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f18g" -->
-				<option value="g" SELECTED>1125</option>
+				<option value="g" selected="selected">1125</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">1125</option>
 
@@ -1185,11 +1186,11 @@
 				</select>
 		</td>
 </tr>	
-	
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
+//<![CDATA[
 	function report() {
         document.f_pop.f2.value=document.f_pop.f2.value+'   ';
         document.f_pop.f2.value=document.f_pop.f2.value.substring(0,3);
@@ -1201,6 +1202,7 @@
 		self.close();
 		return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_115b.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_115b.tmpl
index 76da3e9..fe89686 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_115b.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_115b.tmpl
@@ -1,59 +1,56 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 115b builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 115b builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 115b builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Generation</td>
+		<td><label for="f1">Generation</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
 			<!-- TMPL_IF name="f1|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
+            	<option value="|" selected="selected">|- Filling character</option>
             <!-- TMPL_ELSE -->
             	<option value="|">|- Filling character</option>
             <!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1a" -->
-				<option value="a" SELECTED>original</option>
+				<option value="a" selected="selected">original</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">original</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1b" -->
-				<option value="b" SELECTED>master</option>
+				<option value="b" selected="selected">master</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">master</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1c" -->
-				<option value="c" SELECTED>duplicate</option>
+				<option value="c" selected="selected">duplicate</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">duplicate</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1d" -->
-				<option value="d" SELECTED>reference print/viewing copy</option>
+				<option value="d" selected="selected">reference print/viewing copy</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">reference print/viewing copy</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1x" -->
-				<option value="x" SELECTED>not applicable</option>
+				<option value="x" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not applicable</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 	
@@ -63,69 +60,69 @@
 		</td>
 	</tr>
 	<tr>
-		<td>Production elements</td>
+		<td><label for="f2">Production elements</label></td>
 		<td>
-			<select name="f2" size="1">
+			<select name="f2" id="f2" size="1">
 			<!-- TMPL_IF name="f2|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
+            	<option value="|" selected="selected">|- Filling character</option>
             <!-- TMPL_ELSE -->
             	<option value="|">|- Filling character</option>
             <!-- /TMPL_IF -->
             
 			<!-- TMPL_IF name="f2a" -->
-				<option value="a" SELECTED>workprint</option>
+				<option value="a" selected="selected">workprint</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">workprint</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2b" -->
-				<option value="b" SELECTED>trims</option>
+				<option value="b" selected="selected">trims</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">trims</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2c" -->
-				<option value="c" SELECTED>outtakes</option>
+				<option value="c" selected="selected">outtakes</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">outtakes</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2d" -->
-				<option value="d" SELECTED>rushes</option>
+				<option value="d" selected="selected">rushes</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">rushes</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2e" -->
-				<option value="e" SELECTED>mixing tracks</option>
+				<option value="e" selected="selected">mixing tracks</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">mixing tracks</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2g" -->
-				<option value="g" SELECTED>title bands/intertitle rolls</option>
+				<option value="g" selected="selected">title bands/intertitle rolls</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">title bands/intertitle rolls</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2h" -->
-				<option value="h" SELECTED>production rolls</option>
+				<option value="h" selected="selected">production rolls</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">production rolls</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2x" -->
-				<option value="x" SELECTED>not applicable</option>
+				<option value="x" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not applicable</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 	
@@ -136,143 +133,143 @@
 	</tr>
 
 	<tr>
-		<td>Refined categories of colour for moving pictures</td>
+		<td><label for="f3">Refined categories of colour for moving pictures</label></td>
 		<td>
-	<select name="f3" size="1">
+	<select name="f3" id="f3" size="1">
 			<!-- TMPL_IF name="f3|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
+            	<option value="|" selected="selected">|- Filling character</option>
             <!-- TMPL_ELSE -->
             	<option value="|">|- Filling character</option>
             <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f3a" -->
-				<option value="a" SELECTED>3 layer colour</option>
+				<option value="a" selected="selected">3 layer colour</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">3 layer colour</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f3b" -->
-				<option value="b" SELECTED>2 colour, single strip</option>
+				<option value="b" selected="selected">2 colour, single strip</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">2 colour, single strip</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f3c" -->
-				<option value="c" SELECTED>undetermined 2 colour</option>
+				<option value="c" selected="selected">undetermined 2 colour</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">undetermined 2 colour</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f3d" -->
-				<option value="d" SELECTED>undetermined 3 colour</option>
+				<option value="d" selected="selected">undetermined 3 colour</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">undetermined 3 colour</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f3e" -->
-				<option value="e" SELECTED>3 strip colour</option>
+				<option value="e" selected="selected">3 strip colour</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">3 strip colour</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3f" -->
-				<option value="f" SELECTED>2 strip colour</option>
+				<option value="f" selected="selected">2 strip colour</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">2 strip colour</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3g" -->
-				<option value="g" SELECTED>red strip</option>
+				<option value="g" selected="selected">red strip</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">red strip</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3h" -->
-				<option value="h" SELECTED>blue or green strip</option>
+				<option value="h" selected="selected">blue or green strip</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">blue or green strip</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3i" -->
-				<option value="i" SELECTED>cyan strip</option>
+				<option value="i" selected="selected">cyan strip</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">cyan strip</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3j" -->
-				<option value="j" SELECTED>magenta strip</option>
+				<option value="j" selected="selected">magenta strip</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">magenta strip</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3k" -->
-				<option value="k" SELECTED>yellow strip</option>
+				<option value="k" selected="selected">yellow strip</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">yellow strip</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3l" -->
-				<option value="l" SELECTED>SEN 2</option>
+				<option value="l" selected="selected">SEN 2</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">SEN 2</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3m" -->
-				<option value="m" SELECTED>SEN 3</option>
+				<option value="m" selected="selected">SEN 3</option>
 			<!-- TMPL_ELSE -->
 				<option value="m">SEN 3</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3n" -->
-				<option value="n" SELECTED>sepia tone</option>
+				<option value="n" selected="selected">sepia tone</option>
 			<!-- TMPL_ELSE -->
 				<option value="n">sepia tone</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3o" -->
-				<option value="o" SELECTED>other tone</option>
+				<option value="o" selected="selected">other tone</option>
 			<!-- TMPL_ELSE -->
 				<option value="o">other tone</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3p" -->
-				<option value="p" SELECTED>tint</option>
+				<option value="p" selected="selected">tint</option>
 			<!-- TMPL_ELSE -->
 				<option value="p">tint</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3q" -->
-				<option value="q" SELECTED>tinted and toned</option>
+				<option value="q" selected="selected">tinted and toned</option>
 			<!-- TMPL_ELSE -->
 				<option value="q">tinted and toned</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3r" -->
-				<option value="r" SELECTED>stencil colour</option>
+				<option value="r" selected="selected">stencil colour</option>
 			<!-- TMPL_ELSE -->
 				<option value="r">stencil colour</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3s" -->
-				<option value="s" SELECTED>handcoloured</option>
+				<option value="s" selected="selected">handcoloured</option>
 			<!-- TMPL_ELSE -->
 				<option value="s">handcoloured</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3x" -->
-				<option value="x" SELECTED>not applicable (item not a colour film)</option>
+				<option value="x" selected="selected">not applicable (item not a colour film)</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not applicable (item not a colour film)</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
@@ -282,42 +279,42 @@
 
 
 	<tr>
-		<td>Film emulsion (polarity)</td>
+		<td><label for="f4">Film emulsion (polarity)</label></td>
 		<td>
-			<select name="f4" size="1">
+			<select name="f4" id="f4" size="1">
 			<!-- TMPL_IF name="f4|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
+            	<option value="|" selected="selected">|- Filling character</option>
             <!-- TMPL_ELSE -->
             	<option value="|">|- Filling character</option>
             <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f4a" -->
-				<option value="a" SELECTED>positive</option>
+				<option value="a" selected="selected">positive</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">positive</option>
 	
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f4b" -->
-				<option value="b" SELECTED>negative</option>
+				<option value="b" selected="selected">negative</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">negative</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f4u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f4x" -->
-				<option value="x" SELECTED>not applicable</option>
+				<option value="x" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not applicable</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
@@ -326,55 +323,55 @@
 	</tr>
 
 	<tr>
-		<td>Film base</td>
+		<td><label for="f5">Film base</label></td>
 		<td>
-			<select name="f5" size="1">
+			<select name="f5" id="f5" size="1">
 			<!-- TMPL_IF name="f5|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
+            	<option value="|" selected="selected">|- Filling character</option>
             <!-- TMPL_ELSE -->
             	<option value="|">|- Filling character</option>
             <!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5a" -->
-				<option value="a" SELECTED>safety (triacetate)</option>
+				<option value="a" selected="selected">safety (triacetate)</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">safety (triacetate)</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5b" -->
-				<option value="b" SELECTED>nitrate</option>
+				<option value="b" selected="selected">nitrate</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">nitrate</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5c" -->
-				<option value="c" SELECTED>safety (diacetate)</option>
+				<option value="c" selected="selected">safety (diacetate)</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">safety (diacetate)</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5d" -->
-				<option value="d" SELECTED>polyester base (e.g. ester)</option>
+				<option value="d" selected="selected">polyester base (e.g. ester)</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">polyester base (e.g. ester)</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5v" -->
-				<option value="v" SELECTED>mixed base (nitrate and safety)</option>
+				<option value="v" selected="selected">mixed base (nitrate and safety)</option>
 			<!-- TMPL_ELSE -->
 				<option value="v">mixed base (nitrate and safety)</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 
@@ -384,50 +381,50 @@
         </tr>
 
 	<tr>
-		<td>Kind of sound for moving images</td>
+		<td><label for="f6">Kind of sound for moving images</label></td>
 		<td>
-			<select name="f6" size="1">
+			<select name="f6" id="f6" size="1">
 			<!-- TMPL_IF name="f6|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
+            	<option value="|" selected="selected">|- Filling character</option>
             <!-- TMPL_ELSE -->
             	<option value="|">|- Filling character</option>
             <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6a" -->
-				<option value="a" SELECTED>monaural</option>
+				<option value="a" selected="selected">monaural</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">monaural</option>
 	
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6b" -->
-				<option value="b" SELECTED>stereophonic</option>
+				<option value="b" selected="selected">stereophonic</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">stereophonic</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6c" -->
-				<option value="c" SELECTED>multichannel, surround or quadraphonic</option>
+				<option value="c" selected="selected">multichannel, surround or quadraphonic</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">multichannel, surround or quadraphonic</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6v" -->
-				<option value="v" SELECTED>mixed</option>
+				<option value="v" selected="selected">mixed</option>
 			<!-- TMPL_ELSE -->
 				<option value="v">mixed</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6x" -->
-				<option value="x" SELECTED>not applicable (item is silent)</option>
+				<option value="x" selected="selected">not applicable (item is silent)</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not applicable (item is silent)</option>
 
@@ -435,7 +432,7 @@
 
 
 			<!-- TMPL_IF name="f6z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 
@@ -448,57 +445,57 @@
 
 
 	<tr>
-		<td>Kind of film stock or print</td>
+		<td><label for="f7">Kind of film stock or print</label></td>
 		<td>
-			<select name="f7" size="1">
+			<select name="f7" id="f7" size="1">
 			<!-- TMPL_IF name="f7|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
+            	<option value="|" selected="selected">|- Filling character</option>
             <!-- TMPL_ELSE -->
             	<option value="|">|- Filling character</option>
             <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7a" -->
-				<option value="a" SELECTED>imbibition dye transfer</option>
+				<option value="a" selected="selected">imbibition dye transfer</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">imbibition dye transfer</option>
 	
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7b" -->
-				<option value="b" SELECTED>three layer stock</option>
+				<option value="b" selected="selected">three layer stock</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">three layer stock</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7c" -->
-				<option value="c" SELECTED>three layer stock (low fade)</option>
+				<option value="c" selected="selected">three layer stock (low fade)</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">three layer stock (low fade)</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7d" -->
-				<option value="d" SELECTED>duplitised stock</option>
+				<option value="d" selected="selected">duplitised stock</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">duplitised stock</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7x" -->
-				<option value="x" SELECTED>not applicable (not a colour film)</option>
+				<option value="x" selected="selected">not applicable (not a colour film)</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not applicable (not a colour film)</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 
@@ -509,80 +506,80 @@
         </tr>
 
 	<tr>
-		<td>Deterioration stage</td>
+		<td><label for="f8">Deterioration stage</label></td>
 		<td>
-			<select name="f8" size="1">
+			<select name="f8" id="f8" size="1">
 			<!-- TMPL_IF name="f8|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
+            	<option value="|" selected="selected">|- Filling character</option>
             <!-- TMPL_ELSE -->
             	<option value="|">|- Filling character</option>
             <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8b" -->
-				<option value="b" SELECTED>nitrate - suspicious odour</option>
+				<option value="b" selected="selected">nitrate - suspicious odour</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">nitrate - suspicious odour</option>
 	
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8c" -->
-				<option value="c" SELECTED>nitrate - pungent odour</option>
+				<option value="c" selected="selected">nitrate - pungent odour</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">nitrate - pungent odour</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8d" -->
-				<option value="d" SELECTED>nitrate - brownish, discoloration, fading, dusty</option>
+				<option value="d" selected="selected">nitrate - brownish, discoloration, fading, dusty</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">nitrate - brownish, discoloration, fading, dusty</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8e" -->
-				<option value="e" SELECTED>nitrate - sticky</option>
+				<option value="e" selected="selected">nitrate - sticky</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">nitrate - sticky</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8f" -->
-				<option value="f" SELECTED>nitrate - frothy, bubbles, blisters</option>
+				<option value="f" selected="selected">nitrate - frothy, bubbles, blisters</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">nitrate - frothy, bubbles, blisters</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8g" -->
-				<option value="g" SELECTED>nitrate - congealed</option>
+				<option value="g" selected="selected">nitrate - congealed</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">nitrate - congealed</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8h" -->
-				<option value="h" SELECTED>nitrate - powder</option>
+				<option value="h" selected="selected">nitrate - powder</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">nitrate - powder</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8k" -->
-				<option value="k" SELECTED>nonnitrate - detectable deterioration (e.g. diacetate odour)</option>
+				<option value="k" selected="selected">nonnitrate - detectable deterioration (e.g. diacetate odour)</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">nonnitrate - detectable deterioration (e.g. diacetate odour)</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8l" -->
-				<option value="l" SELECTED>nonnitrate - advanced deterioration</option>
+				<option value="l" selected="selected">nonnitrate - advanced deterioration</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">nonnitrate - advanced deterioration</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8m" -->
-				<option value="m" SELECTED>nonnitrate - disaster</option>
+				<option value="m" selected="selected">nonnitrate - disaster</option>
 			<!-- TMPL_ELSE -->
 				<option value="m">nonnitrate - disaster</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8y" -->
-				<option value="y" SELECTED>no deterioration</option>
+				<option value="y" selected="selected">no deterioration</option>
 			<!-- TMPL_ELSE -->
 				<option value="y">no deterioration</option>
 
@@ -593,36 +590,36 @@
         </tr>
 
 	<tr>
-		<td>Completeness</td>
+		<td><label for="f9">Completeness</label></td>
 		<td>
-			<select name="f9" size="1">
+			<select name="f9" id="f9" size="1">
 			<!-- TMPL_IF name="f9|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
+            	<option value="|" selected="selected">|- Filling character</option>
             <!-- TMPL_ELSE -->
             	<option value="|">|- Filling character</option>
             <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9a" -->
-				<option value="a" SELECTED>incomplete</option>
+				<option value="a" selected="selected">incomplete</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">incomplete</option>
 	
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9b" -->
-				<option value="b" SELECTED>complete</option>
+				<option value="b" selected="selected">complete</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">complete</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9x" -->
-				<option value="x" SELECTED>not applicable</option>
+				<option value="x" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not applicable</option>
 
@@ -633,14 +630,13 @@
 
    		<tr>
                 <td>Film inspection date</td>
-                <td>Year <input type="text" name="f10" maxlength=4 size=5 value="<!-- TMPL_VAR name="f10" -->"></td>
-                <td>Month <input type="text" name="f11" maxlength=2 size=3 value="<!-- TMPL_VAR name="f11" -->"></td>
+                <td><label for="f10">Year</label> <input type="text" name="f10" id="f10" maxlength="4" size="5" value="<!-- TMPL_VAR name="f10" -->" /> <label for="f11">Month</label> <input type="text" name="f11" id="f11" maxlength="2" size="3" value="<!-- TMPL_VAR name="f11" -->" /></td>
         </tr>
-	
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
-</table>
+	</table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
+//<![CDATA[
 	function report() {
             document.f_pop.f10.value=document.f_pop.f10.value+'    ';
             document.f_pop.f10.value=document.f_pop.f10.value.substring(0,4);
@@ -653,6 +649,7 @@
 		self.close();
 		return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_116.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_116.tmpl
index 7662976..6b03b5c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_116.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_116.tmpl
@@ -1,84 +1,81 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 116 builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 116 builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 116 builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Specific material designation</td>
+		<td><label for="f1">Specific material designation</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
 			<!-- TMPL_IF name="f1|" -->
-                            <option value="|" SELECTED>|- Filling character</option>
+                            <option value="|" selected="selected">|- Filling character</option>
                         <!-- TMPL_ELSE -->
                             <option value="|">|- Filling character</option>
                         <!-- /TMPL_IF -->
             
 			<!-- TMPL_IF name="f1a" -->
-				<option value="a" SELECTED>a- collage</option>
+				<option value="a" selected="selected">a- collage</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">a- collage</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1b" -->
-				<option value="b" SELECTED>b- drawing</option>
+				<option value="b" selected="selected">b- drawing</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">b- drawing</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1c" -->
-				<option value="c" SELECTED>c- painting</option>
+				<option value="c" selected="selected">c- painting</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">c- painting</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1d" -->
-				<option value="d" SELECTED>d- photomechanical reproduction</option>
+				<option value="d" selected="selected">d- photomechanical reproduction</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">d- photomechanical reproduction</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1e" -->
-				<option value="e" SELECTED>e- photonegative</option>
+				<option value="e" selected="selected">e- photonegative</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">e- photonegative</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1f" -->
-				<option value="f" SELECTED>f- photoprint</option>
+				<option value="f" selected="selected">f- photoprint</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">f- photoprint</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1h" -->
-				<option value="h" SELECTED>h- picture</option>
+				<option value="h" selected="selected">h- picture</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">h- picture</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1i" -->
-				<option value="i" SELECTED>i- print</option>
+				<option value="i" selected="selected">i- print</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">i- print</option>
 			<!-- /TMPL_IF -->
 			
 			<!-- TMPL_IF name="f1k" -->
-				<option value="k" SELECTED>k- technical drawing</option>
+				<option value="k" selected="selected">k- technical drawing</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">k- technical drawing</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f1m" -->
-				<option value="m" SELECTED>m- master</option>
+				<option value="m" selected="selected">m- master</option>
 			<!-- TMPL_ELSE -->
 				<option value="m">m- master</option>
 			<!-- /TMPL_IF -->			
 			
 			<!-- TMPL_IF name="f1z" -->
-				<option value="z" SELECTED>z- other non-projected graphic type</option>
+				<option value="z" selected="selected">z- other non-projected graphic type</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">z- other non-projected graphic type</option>
 	
@@ -88,111 +85,111 @@
 		</td>
 	</tr>
 	<tr>
-		<td>Primary support material</td>
+		<td><label for="f2">Primary support material</label></td>
 		<td>
-			<select name="f2" size="1">
+			<select name="f2" id="f2" size="1">
 			<!-- TMPL_IF name="f2|" -->
-                            <option value="|" SELECTED>|- Filling character</option>
+                            <option value="|" selected="selected">|- Filling character</option>
                         <!-- TMPL_ELSE -->
                             <option value="|">|- Filling character</option>
                         <!-- /TMPL_IF -->
             
 			<!-- TMPL_IF name="f2a" -->
-				<option value="a" SELECTED>canvas</option>
+				<option value="a" selected="selected">canvas</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">canvas</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2b" -->
-				<option value="b" SELECTED>bristol board</option>
+				<option value="b" selected="selected">bristol board</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">bristol board</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2c" -->
-				<option value="c" SELECTED>cardboard/illustration board</option>
+				<option value="c" selected="selected">cardboard/illustration board</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">cardboard/illustration board</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2d" -->
-				<option value="d" SELECTED>glass</option>
+				<option value="d" selected="selected">glass</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">glass</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2j" -->
-				<option value="j" SELECTED>plaster</option>
+				<option value="j" selected="selected">plaster</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">plaster</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2k" -->
-				<option value="k" SELECTED>hardboard</option>
+				<option value="k" selected="selected">hardboard</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">hardboard</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2l" -->
-				<option value="l" SELECTED>porcelain</option>
+				<option value="l" selected="selected">porcelain</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">porcelain</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2m" -->
-				<option value="m" SELECTED>stone</option>
+				<option value="m" selected="selected">stone</option>
 			<!-- TMPL_ELSE -->
 				<option value="m">stone</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2n" -->
-				<option value="n" SELECTED>wood</option>
+				<option value="n" selected="selected">wood</option>
 			<!-- TMPL_ELSE -->
 				<option value="n">wood</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2v" -->
-				<option value="v" SELECTED>mixed collection</option>
+				<option value="v" selected="selected">mixed collection</option>
 			<!-- TMPL_ELSE -->
 				<option value="v">mixed collection</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2e" -->
-				<option value="e" SELECTED>synthetics (plastic, vinyl, etc.)</option>
+				<option value="e" selected="selected">synthetics (plastic, vinyl, etc.)</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">synthetics (plastic, vinyl, etc.)</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2f" -->
-				<option value="f" SELECTED>skins (leather, parchment, vellum, etc.)</option>
+				<option value="f" selected="selected">skins (leather, parchment, vellum, etc.)</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">skins (leather, parchment, vellum, etc.)</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2g" -->
-				<option value="g" SELECTED>textiles (including man-made fibres)</option>
+				<option value="g" selected="selected">textiles (including man-made fibres)</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">textiles (including man-made fibres)</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2h" -->
-				<option value="h" SELECTED>metal</option>
+				<option value="h" selected="selected">metal</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">metal</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2i" -->
-				<option value="i" SELECTED>paper</option>
+				<option value="i" selected="selected">paper</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">paper</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 	
@@ -205,17 +202,17 @@
 
 
 	<tr>
-		<td>Secondary support material</td>
+		<td><label for="f3">Secondary support material</label></td>
 		<td>
-	<select name="f3" size="1">
+	<select name="f3" id="f3" size="1">
 			<!-- TMPL_IF name="f3|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
+            	<option value="|" selected="selected">|- Filling character</option>
             <!-- TMPL_ELSE -->
             	<option value="|">|- Filling character</option>
             <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f3y" -->
-				<option value="y" SELECTED>no secondary support</option>
+				<option value="y" selected="selected">no secondary support</option>
 			<!-- TMPL_ELSE -->
 				<option value="y">no secondary support</option>
 			<!-- /TMPL_IF -->
@@ -225,60 +222,60 @@
 
 
 	<tr>
-		<td>Colour</td>
+		<td><label for="f4">Colour</label></td>
 		<td>
-			<select name="f4" size="1">
+			<select name="f4" id="f4" size="1">
 			<!-- TMPL_IF name="f4|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
+            	<option value="|" selected="selected">|- Filling character</option>
             <!-- TMPL_ELSE -->
             	<option value="|">|- Filling character</option>
             <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f4a" -->
-				<option value="a" SELECTED>one-colour, monochrome</option>
+				<option value="a" selected="selected">one-colour, monochrome</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">one-colour, monochrome</option>
 	
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f4b" -->
-				<option value="b" SELECTED>black-and-white</option>
+				<option value="b" selected="selected">black-and-white</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">black-and-white</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f4c" -->
-				<option value="c" SELECTED>multicoloured</option>
+				<option value="c" selected="selected">multicoloured</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">multicoloured</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f4d" -->
-				<option value="d" SELECTED>hand coloured</option>
+				<option value="d" selected="selected">hand coloured</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">hand coloured</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4v" -->
-				<option value="v" SELECTED>mixed</option>
+				<option value="v" selected="selected">mixed</option>
 			<!-- TMPL_ELSE -->
 				<option value="v">mixed</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4x" -->
-				<option value="x" SELECTED>not applicable</option>
+				<option value="x" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not applicable</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
@@ -287,194 +284,194 @@
 	</tr>
 
 	<tr>
-		<td>Techniques (Drawings, Paintings) 1</td>
+		<td><label for="f5">Techniques (Drawings, Paintings) 1</label></td>
 		<td>
-			<select name="f5" size="1">
+			<select name="f5" id="f5" size="1">
 			<!-- TMPL_IF name="f5|" -->
-                            <option value="|" SELECTED>|- Filling character</option>
+                            <option value="|" selected="selected">|- Filling character</option>
                         <!-- TMPL_ELSE -->
                             <option value="|">|- Filling character</option>
                         <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="f5  " -->
-                                <option value="  " SELECTED>non required value</option>
+                                <option value="  " selected="selected">non required value</option>
                         <!-- TMPL_ELSE -->
                                 <option value="  ">non required value</option>
                         <!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5aa" -->
-				<option value="aa" SELECTED>pencil</option>
+				<option value="aa" selected="selected">pencil</option>
 			<!-- TMPL_ELSE -->
 				<option value="aa">pencil</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5ab" -->
-				<option value="ab" SELECTED>graphite</option>
+				<option value="ab" selected="selected">graphite</option>
 			<!-- TMPL_ELSE -->
 				<option value="ab">graphite</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5ac" -->
-				<option value="ac" SELECTED>colour pencil</option>
+				<option value="ac" selected="selected">colour pencil</option>
 			<!-- TMPL_ELSE -->
 				<option value="ac">colour pencil</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5ad" -->
-				<option value="ad" SELECTED>India ink</option>
+				<option value="ad" selected="selected">India ink</option>
 			<!-- TMPL_ELSE -->
 				<option value="ad">India ink</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5ae" -->
-				<option value="ae" SELECTED>lavierung India ink</option>
+				<option value="ae" selected="selected">lavierung India ink</option>
 			<!-- TMPL_ELSE -->
 				<option value="ae">lavierung India ink</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5af" -->
-				<option value="af" SELECTED>coal</option>
+				<option value="af" selected="selected">coal</option>
 			<!-- TMPL_ELSE -->
 				<option value="af">coal</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5ag" -->
-				<option value="ag" SELECTED>chalk</option>
+				<option value="ag" selected="selected">chalk</option>
 			<!-- TMPL_ELSE -->
 				<option value="ag">chalk</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5ah" -->
-				<option value="ah" SELECTED>black chalk</option>
+				<option value="ah" selected="selected">black chalk</option>
 			<!-- TMPL_ELSE -->
 				<option value="ah">black chalk</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5ai" -->
-				<option value="ai" SELECTED>sanguine</option>
+				<option value="ai" selected="selected">sanguine</option>
 			<!-- TMPL_ELSE -->
 				<option value="ai">sanguine</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5aj" -->
-				<option value="aj" SELECTED>water colour</option>
+				<option value="aj" selected="selected">water colour</option>
 			<!-- TMPL_ELSE -->
 				<option value="aj">water colour</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5ak" -->
-				<option value="ak" SELECTED>tempera</option>
+				<option value="ak" selected="selected">tempera</option>
 			<!-- TMPL_ELSE -->
 				<option value="ak">tempera</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5al" -->
-				<option value="al" SELECTED>gouache</option>
+				<option value="al" selected="selected">gouache</option>
 			<!-- TMPL_ELSE -->
 				<option value="al">gouache</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5am" -->
-				<option value="am" SELECTED>pastel</option>
+				<option value="am" selected="selected">pastel</option>
 			<!-- TMPL_ELSE -->
 				<option value="am">pastel</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5an" -->
-				<option value="an" SELECTED>oil</option>
+				<option value="an" selected="selected">oil</option>
 			<!-- TMPL_ELSE -->
 				<option value="an">oil</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5xx" -->
-				<option value="xx" SELECTED>not applicable</option>
+				<option value="xx" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="xx">not applicable</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5ba" -->
-				<option value="ba" SELECTED>felt-tip pen</option>
+				<option value="ba" selected="selected">felt-tip pen</option>
 			<!-- TMPL_ELSE -->
 				<option value="ba">felt-tip pen</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5bb" -->
-				<option value="bb" SELECTED>stain</option>
+				<option value="bb" selected="selected">stain</option>
 			<!-- TMPL_ELSE -->
 				<option value="bb">stain</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5bc" -->
-				<option value="bc" SELECTED>crayon</option>
+				<option value="bc" selected="selected">crayon</option>
 			<!-- TMPL_ELSE -->
 				<option value="bc">crayon</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5bd" -->
-				<option value="bd" SELECTED>sepia</option>
+				<option value="bd" selected="selected">sepia</option>
 			<!-- TMPL_ELSE -->
 				<option value="bd">sepia</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5be" -->
-				<option value="be" SELECTED>writing ink</option>
+				<option value="be" selected="selected">writing ink</option>
 			<!-- TMPL_ELSE -->
 				<option value="be">writing ink</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5bf" -->
-				<option value="bf" SELECTED>casein</option>
+				<option value="bf" selected="selected">casein</option>
 			<!-- TMPL_ELSE -->
 				<option value="bf">casein</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5bg" -->
-				<option value="bg" SELECTED>golding</option>
+				<option value="bg" selected="selected">golding</option>
 			<!-- TMPL_ELSE -->
 				<option value="bg">golding</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5bh" -->
-				<option value="bh" SELECTED>encaustic</option>
+				<option value="bh" selected="selected">encaustic</option>
 			<!-- TMPL_ELSE -->
 				<option value="bh">encaustic</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5bi" -->
-				<option value="bi" SELECTED>acrylics</option>
+				<option value="bi" selected="selected">acrylics</option>
 			<!-- TMPL_ELSE -->
 				<option value="bi">acrylics</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5bj" -->
-				<option value="bj" SELECTED>collage</option>
+				<option value="bj" selected="selected">collage</option>
 			<!-- TMPL_ELSE -->
 				<option value="bj">collage</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5bk" -->
-				<option value="bk" SELECTED>silver point</option>
+				<option value="bk" selected="selected">silver point</option>
 			<!-- TMPL_ELSE -->
 				<option value="bk">silver point</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5bl" -->
-				<option value="bl" SELECTED>air brush</option>
+				<option value="bl" selected="selected">air brush</option>
 			<!-- TMPL_ELSE -->
 				<option value="bl">air brush</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5uu" -->
-				<option value="uu" SELECTED>unknown</option>
+				<option value="uu" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="uu">unknown</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5vv" -->
-				<option value="vv" SELECTED>mixed</option>
+				<option value="vv" selected="selected">mixed</option>
 			<!-- TMPL_ELSE -->
 				<option value="vv">mixed</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5zz" -->
-				<option value="zz" SELECTED>other</option>
+				<option value="zz" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="zz">other</option>
 
@@ -484,198 +481,198 @@
 		</td>
         </tr>
 	<tr>
-		<td>Techniques (Drawings, Paintings) 2</td>
+		<td><label for="f6">Techniques (Drawings, Paintings) 2</label></td>
 		<td>
-			<select name="f6" size="1">
+			<select name="f6" id="f6" size="1">
 			<!-- TMPL_IF name="f6|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
+            	<option value="|" selected="selected">|- Filling character</option>
             <!-- TMPL_ELSE -->
             	<option value="|">|- Filling character</option>
             <!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6  " -->
-				<option value="  " SELECTED>non required value</option>
+				<option value="  " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value="  ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6aa" -->
-				<option value="aa" SELECTED>pencil</option>
+				<option value="aa" selected="selected">pencil</option>
 			<!-- TMPL_ELSE -->
 				<option value="aa">pencil</option>
 	
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6ab" -->
-				<option value="ab" SELECTED>graphite</option>
+				<option value="ab" selected="selected">graphite</option>
 			<!-- TMPL_ELSE -->
 				<option value="ab">graphite</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6ac" -->
-				<option value="ac" SELECTED>colour pencil</option>
+				<option value="ac" selected="selected">colour pencil</option>
 			<!-- TMPL_ELSE -->
 				<option value="ac">colour pencil</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6ad" -->
-				<option value="ad" SELECTED>India ink</option>
+				<option value="ad" selected="selected">India ink</option>
 			<!-- TMPL_ELSE -->
 				<option value="ad">India ink</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6ae" -->
-				<option value="ae" SELECTED>lavierung India ink</option>
+				<option value="ae" selected="selected">lavierung India ink</option>
 			<!-- TMPL_ELSE -->
 				<option value="ae">lavierung India ink</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6af" -->
-				<option value="af" SELECTED>coal</option>
+				<option value="af" selected="selected">coal</option>
 			<!-- TMPL_ELSE -->
 				<option value="af">coal</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6ag" -->
-				<option value="ag" SELECTED>chalk</option>
+				<option value="ag" selected="selected">chalk</option>
 			<!-- TMPL_ELSE -->
 				<option value="ag">chalk</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6ah" -->
-				<option value="ah" SELECTED>black chalk</option>
+				<option value="ah" selected="selected">black chalk</option>
 			<!-- TMPL_ELSE -->
 				<option value="ah">black chalk</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6ai" -->
-				<option value="ai" SELECTED>sanguine</option>
+				<option value="ai" selected="selected">sanguine</option>
 			<!-- TMPL_ELSE -->
 				<option value="ai">sanguine</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6aj" -->
-				<option value="aj" SELECTED>water colour</option>
+				<option value="aj" selected="selected">water colour</option>
 			<!-- TMPL_ELSE -->
 				<option value="aj">water colour</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6ak" -->
-				<option value="ak" SELECTED>tempera</option>
+				<option value="ak" selected="selected">tempera</option>
 			<!-- TMPL_ELSE -->
 				<option value="ak">tempera</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6al" -->
-				<option value="al" SELECTED>gouache</option>
+				<option value="al" selected="selected">gouache</option>
 			<!-- TMPL_ELSE -->
 				<option value="al">gouache</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6am" -->
-				<option value="am" SELECTED>pastel</option>
+				<option value="am" selected="selected">pastel</option>
 			<!-- TMPL_ELSE -->
 				<option value="am">pastel</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6an" -->
-				<option value="an" SELECTED>oil</option>
+				<option value="an" selected="selected">oil</option>
 			<!-- TMPL_ELSE -->
 				<option value="an">oil</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6xx" -->
-				<option value="xx" SELECTED>not applicable</option>
+				<option value="xx" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="xx">not applicable</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6ba" -->
-				<option value="ba" SELECTED>felt-tip pen</option>
+				<option value="ba" selected="selected">felt-tip pen</option>
 			<!-- TMPL_ELSE -->
 				<option value="ba">felt-tip pen</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6bb" -->
-				<option value="bb" SELECTED>stain</option>
+				<option value="bb" selected="selected">stain</option>
 			<!-- TMPL_ELSE -->
 				<option value="bb">stain</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6bc" -->
-				<option value="bc" SELECTED>crayon</option>
+				<option value="bc" selected="selected">crayon</option>
 			<!-- TMPL_ELSE -->
 				<option value="bc">crayon</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6bd" -->
-				<option value="bd" SELECTED>sepia</option>
+				<option value="bd" selected="selected">sepia</option>
 			<!-- TMPL_ELSE -->
 				<option value="bd">sepia</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6be" -->
-				<option value="be" SELECTED>writing ink</option>
+				<option value="be" selected="selected">writing ink</option>
 			<!-- TMPL_ELSE -->
 				<option value="be">writing ink</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6bf" -->
-				<option value="bf" SELECTED>casein</option>
+				<option value="bf" selected="selected">casein</option>
 			<!-- TMPL_ELSE -->
 				<option value="bf">casein</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6bg" -->
-				<option value="bg" SELECTED>golding</option>
+				<option value="bg" selected="selected">golding</option>
 			<!-- TMPL_ELSE -->
 				<option value="bg">golding</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6bh" -->
-				<option value="bh" SELECTED>encaustic</option>
+				<option value="bh" selected="selected">encaustic</option>
 			<!-- TMPL_ELSE -->
 				<option value="bh">encaustic</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6bi" -->
-				<option value="bi" SELECTED>acrylics</option>
+				<option value="bi" selected="selected">acrylics</option>
 			<!-- TMPL_ELSE -->
 				<option value="bi">acrylics</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6bj" -->
-				<option value="bj" SELECTED>collage</option>
+				<option value="bj" selected="selected">collage</option>
 			<!-- TMPL_ELSE -->
 				<option value="bj">collage</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6bk" -->
-				<option value="bk" SELECTED>silver point</option>
+				<option value="bk" selected="selected">silver point</option>
 			<!-- TMPL_ELSE -->
 				<option value="bk">silver point</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6bl" -->
-				<option value="bl" SELECTED>air brush</option>
+				<option value="bl" selected="selected">air brush</option>
 			<!-- TMPL_ELSE -->
 				<option value="bl">air brush</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6uu" -->
-				<option value="uu" SELECTED>unknown</option>
+				<option value="uu" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="uu">unknown</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6vv" -->
-				<option value="vv" SELECTED>mixed</option>
+				<option value="vv" selected="selected">mixed</option>
 			<!-- TMPL_ELSE -->
 				<option value="vv">mixed</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6zz" -->
-				<option value="zz" SELECTED>other</option>
+				<option value="zz" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="zz">other</option>
 
@@ -685,199 +682,199 @@
 		</td>
         </tr>
 	<tr>
-		<td>Techniques (Drawings, Paintings) 3</td>
+		<td><label for="f7">Techniques (Drawings, Paintings) 3</label></td>
 		<td>
-			<select name="f7" size="1">
+			<select name="f7" id="f7" size="1">
 			<!-- TMPL_IF name="f7|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
+            	<option value="|" selected="selected">|- Filling character</option>
             <!-- TMPL_ELSE -->
             	<option value="|">|- Filling character</option>
             <!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7  " -->
-				<option value="  " SELECTED>non required value</option>
+				<option value="  " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value="  ">non required value</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7aa" -->
-				<option value="aa" SELECTED>pencil</option>
+				<option value="aa" selected="selected">pencil</option>
 			<!-- TMPL_ELSE -->
 				<option value="aa">pencil</option>
 	
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7ab" -->
-				<option value="ab" SELECTED>graphite</option>
+				<option value="ab" selected="selected">graphite</option>
 			<!-- TMPL_ELSE -->
 				<option value="ab">graphite</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7ac" -->
-				<option value="ac" SELECTED>colour pencil</option>
+				<option value="ac" selected="selected">colour pencil</option>
 			<!-- TMPL_ELSE -->
 				<option value="ac">colour pencil</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7ad" -->
-				<option value="ad" SELECTED>India ink</option>
+				<option value="ad" selected="selected">India ink</option>
 			<!-- TMPL_ELSE -->
 				<option value="ad">India ink</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7ae" -->
-				<option value="ae" SELECTED>lavierung India ink</option>
+				<option value="ae" selected="selected">lavierung India ink</option>
 			<!-- TMPL_ELSE -->
 				<option value="ae">lavierung India ink</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7af" -->
-				<option value="af" SELECTED>coal</option>
+				<option value="af" selected="selected">coal</option>
 			<!-- TMPL_ELSE -->
 				<option value="af">coal</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7ag" -->
-				<option value="ag" SELECTED>chalk</option>
+				<option value="ag" selected="selected">chalk</option>
 			<!-- TMPL_ELSE -->
 				<option value="ag">chalk</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7ah" -->
-				<option value="ah" SELECTED>black chalk</option>
+				<option value="ah" selected="selected">black chalk</option>
 			<!-- TMPL_ELSE -->
 				<option value="ah">black chalk</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7ai" -->
-				<option value="ai" SELECTED>sanguine</option>
+				<option value="ai" selected="selected">sanguine</option>
 			<!-- TMPL_ELSE -->
 				<option value="ai">sanguine</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7aj" -->
-				<option value="aj" SELECTED>water colour</option>
+				<option value="aj" selected="selected">water colour</option>
 			<!-- TMPL_ELSE -->
 				<option value="aj">water colour</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7ak" -->
-				<option value="ak" SELECTED>tempera</option>
+				<option value="ak" selected="selected">tempera</option>
 			<!-- TMPL_ELSE -->
 				<option value="ak">tempera</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7al" -->
-				<option value="al" SELECTED>gouache</option>
+				<option value="al" selected="selected">gouache</option>
 			<!-- TMPL_ELSE -->
 				<option value="al">gouache</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7am" -->
-				<option value="am" SELECTED>pastel</option>
+				<option value="am" selected="selected">pastel</option>
 			<!-- TMPL_ELSE -->
 				<option value="am">pastel</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7an" -->
-				<option value="an" SELECTED>oil</option>
+				<option value="an" selected="selected">oil</option>
 			<!-- TMPL_ELSE -->
 				<option value="an">oil</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7xx" -->
-				<option value="xx" SELECTED>not applicable</option>
+				<option value="xx" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="xx">not applicable</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7ba" -->
-				<option value="ba" SELECTED>felt-tip pen</option>
+				<option value="ba" selected="selected">felt-tip pen</option>
 			<!-- TMPL_ELSE -->
 				<option value="ba">felt-tip pen</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7bb" -->
-				<option value="bb" SELECTED>stain</option>
+				<option value="bb" selected="selected">stain</option>
 			<!-- TMPL_ELSE -->
 				<option value="bb">stain</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7bc" -->
-				<option value="bc" SELECTED>crayon</option>
+				<option value="bc" selected="selected">crayon</option>
 			<!-- TMPL_ELSE -->
 				<option value="bc">crayon</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7bd" -->
-				<option value="bd" SELECTED>sepia</option>
+				<option value="bd" selected="selected">sepia</option>
 			<!-- TMPL_ELSE -->
 				<option value="bd">sepia</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7be" -->
-				<option value="be" SELECTED>writing ink</option>
+				<option value="be" selected="selected">writing ink</option>
 			<!-- TMPL_ELSE -->
 				<option value="be">writing ink</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7bf" -->
-				<option value="bf" SELECTED>casein</option>
+				<option value="bf" selected="selected">casein</option>
 			<!-- TMPL_ELSE -->
 				<option value="bf">casein</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7bg" -->
-				<option value="bg" SELECTED>golding</option>
+				<option value="bg" selected="selected">golding</option>
 			<!-- TMPL_ELSE -->
 				<option value="bg">golding</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7bh" -->
-				<option value="bh" SELECTED>encaustic</option>
+				<option value="bh" selected="selected">encaustic</option>
 			<!-- TMPL_ELSE -->
 				<option value="bh">encaustic</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7bi" -->
-				<option value="bi" SELECTED>acrylics</option>
+				<option value="bi" selected="selected">acrylics</option>
 			<!-- TMPL_ELSE -->
 				<option value="bi">acrylics</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7bj" -->
-				<option value="bj" SELECTED>collage</option>
+				<option value="bj" selected="selected">collage</option>
 			<!-- TMPL_ELSE -->
 				<option value="bj">collage</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7bk" -->
-				<option value="bk" SELECTED>silver point</option>
+				<option value="bk" selected="selected">silver point</option>
 			<!-- TMPL_ELSE -->
 				<option value="bk">silver point</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7bl" -->
-				<option value="bl" SELECTED>air brush</option>
+				<option value="bl" selected="selected">air brush</option>
 			<!-- TMPL_ELSE -->
 				<option value="bl">air brush</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7uu" -->
-				<option value="uu" SELECTED>unknown</option>
+				<option value="uu" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="uu">unknown</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7vv" -->
-				<option value="vv" SELECTED>mixed</option>
+				<option value="vv" selected="selected">mixed</option>
 			<!-- TMPL_ELSE -->
 				<option value="vv">mixed</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7zz" -->
-				<option value="zz" SELECTED>other</option>
+				<option value="zz" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="zz">other</option>
 
@@ -889,190 +886,190 @@
         </tr>
 
 	<tr>
-		<td>Technique (Prints) 1</td>
+		<td><label for="f8">Technique (Prints) 1</label></td>
 		<td>
-			<select name="f8" size="1">
+			<select name="f8" id="f8" size="1">
 			<!-- TMPL_IF name="f8|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
+            	<option value="|" selected="selected">|- Filling character</option>
             <!-- TMPL_ELSE -->
             	<option value="|">|- Filling character</option>
             <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="f8  " -->
-                                <option value="  " SELECTED>non required value</option>
+                                <option value="  " selected="selected">non required value</option>
                         <!-- TMPL_ELSE -->
                                 <option value="  ">non required value</option>
                         <!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8ba" -->
-				<option value="ba" SELECTED>woodcut</option>
+				<option value="ba" selected="selected">woodcut</option>
 			<!-- TMPL_ELSE -->
 				<option value="ba">woodcut</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8bb" -->
-				<option value="bb" SELECTED>chiaroscuro woodcut</option>
+				<option value="bb" selected="selected">chiaroscuro woodcut</option>
 			<!-- TMPL_ELSE -->
 				<option value="bb">chiaroscuro woodcut</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8bc" -->
-				<option value="bc" SELECTED>white-line woodcut</option>
+				<option value="bc" selected="selected">white-line woodcut</option>
 			<!-- TMPL_ELSE -->
 				<option value="bc">white-line woodcut</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8bd" -->
-				<option value="bd" SELECTED>camaiu</option>
+				<option value="bd" selected="selected">camaiu</option>
 			<!-- TMPL_ELSE -->
 				<option value="bd">camaiu</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8be" -->
-				<option value="be" SELECTED>heliogravure</option>
+				<option value="be" selected="selected">heliogravure</option>
 			<!-- TMPL_ELSE -->
 				<option value="be">heliogravure</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8bf" -->
-				<option value="bf" SELECTED>chromolithography</option>
+				<option value="bf" selected="selected">chromolithography</option>
 			<!-- TMPL_ELSE -->
 				<option value="bf">chromolithography</option>
 			<!-- /TMPL_IF -->
 
 
 			<!-- TMPL_IF name="f8bg" -->
-				<option value="bg" SELECTED>lino-cut</option>
+				<option value="bg" selected="selected">lino-cut</option>
 			<!-- TMPL_ELSE -->
 				<option value="bg">lino-cut</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8bh" -->
-				<option value="bh" SELECTED>etching</option>
+				<option value="bh" selected="selected">etching</option>
 			<!-- TMPL_ELSE -->
 				<option value="bh">etching</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8bi" -->
-				<option value="bi" SELECTED>lithography</option>
+				<option value="bi" selected="selected">lithography</option>
 			<!-- TMPL_ELSE -->
 				<option value="bi">lithography</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8bj" -->
-				<option value="bj" SELECTED>photolithography</option>
+				<option value="bj" selected="selected">photolithography</option>
 			<!-- TMPL_ELSE -->
 				<option value="bj">photolithography</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8bk" -->
-				<option value="bk" SELECTED>zincography</option>
+				<option value="bk" selected="selected">zincography</option>
 			<!-- TMPL_ELSE -->
 				<option value="bk">zincography</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8bl" -->
-				<option value="bl" SELECTED>algraphy</option>
+				<option value="bl" selected="selected">algraphy</option>
 			<!-- TMPL_ELSE -->
 				<option value="bl">algraphy</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8bm" -->
-				<option value="bm" SELECTED>aquatint</option>
+				<option value="bm" selected="selected">aquatint</option>
 			<!-- TMPL_ELSE -->
 				<option value="bm">aquatint</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8bn" -->
-				<option value="bn" SELECTED>reservage (sugar aquatint)</option>
+				<option value="bn" selected="selected">reservage (sugar aquatint)</option>
 			<!-- TMPL_ELSE -->
 				<option value="bn">reservage (sugar aquatint)</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8ca" -->
-				<option value="ca" SELECTED>vernis-mou (soft ground etching or tracing)</option>
+				<option value="ca" selected="selected">vernis-mou (soft ground etching or tracing)</option>
 			<!-- TMPL_ELSE -->
 				<option value="ca">vernis-mou (soft ground etching or tracing)</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8cb" -->
-				<option value="cb" SELECTED>engraving</option>
+				<option value="cb" selected="selected">engraving</option>
 			<!-- TMPL_ELSE -->
 				<option value="cb">engraving</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8cc" -->
-				<option value="cc" SELECTED>engraving in the crayon manner</option>
+				<option value="cc" selected="selected">engraving in the crayon manner</option>
 			<!-- TMPL_ELSE -->
 				<option value="cc">engraving in the crayon manner</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8cd" -->
-				<option value="cd" SELECTED>Burin</option>
+				<option value="cd" selected="selected">Burin</option>
 			<!-- TMPL_ELSE -->
 				<option value="cd">Burin</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8ce" -->
-				<option value="ce" SELECTED>drypoint</option>
+				<option value="ce" selected="selected">drypoint</option>
 			<!-- TMPL_ELSE -->
 				<option value="ce">drypoint</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8cf" -->
-				<option value="cf" SELECTED>mezzotinta (mezzotint)</option>
+				<option value="cf" selected="selected">mezzotinta (mezzotint)</option>
 			<!-- TMPL_ELSE -->
 				<option value="cf">Mezzoteinte</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8cg" -->
-				<option value="cg" SELECTED>monotype</option>
+				<option value="cg" selected="selected">monotype</option>
 			<!-- TMPL_ELSE -->
 				<option value="cg">monotype</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8ch" -->
-				<option value="ch" SELECTED>silkscreen</option>
+				<option value="ch" selected="selected">silkscreen</option>
 			<!-- TMPL_ELSE -->
 				<option value="ch">silkscreen</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8ci" -->
-				<option value="ci" SELECTED>steel engraving</option>
+				<option value="ci" selected="selected">steel engraving</option>
 			<!-- TMPL_ELSE -->
 				<option value="ci">steel engraving</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8cj" -->
-				<option value="cj" SELECTED>computer graphics</option>
+				<option value="cj" selected="selected">computer graphics</option>
 			<!-- TMPL_ELSE -->
 				<option value="cj">computer graphics</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8ck" -->
-				<option value="ck" SELECTED>photocopying</option>
+				<option value="ck" selected="selected">photocopying</option>
 			<!-- TMPL_ELSE -->
 				<option value="ck">photocopying</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8uu" -->
-				<option value="uu" SELECTED>unknown</option>
+				<option value="uu" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="uu">unknown</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8vv" -->
-				<option value="vv" SELECTED>mixed</option>
+				<option value="vv" selected="selected">mixed</option>
 			<!-- TMPL_ELSE -->
 				<option value="vv">mixed</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8xx" -->
-				<option value="xx" SELECTED>not applicable</option>
+				<option value="xx" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="xx">not applicable</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8zz" -->
-				<option value="zz" SELECTED>other</option>
+				<option value="zz" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="zz">other</option>
 			<!-- /TMPL_IF -->
@@ -1082,194 +1079,194 @@
 
         </tr>
 	<tr>
-		<td>Technique (Prints) 2</td>
+		<td><label for="f9">Technique (Prints) 2</label></td>
 		<td>
-			<select name="f9" size="1">
+			<select name="f9" id="f9" size="1">
 			<!-- TMPL_IF name="f9|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
+            	<option value="|" selected="selected">|- Filling character</option>
             <!-- TMPL_ELSE -->
             	<option value="|">|- Filling character</option>
             <!-- /TMPL_IF -->
             
 			<!-- TMPL_IF name="f9  " -->
-				<option value="  " SELECTED>non required value</option>
+				<option value="  " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value="  ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9ba" -->
-				<option value="ba" SELECTED>woodcut</option>
+				<option value="ba" selected="selected">woodcut</option>
 			<!-- TMPL_ELSE -->
 				<option value="ba">woodcut</option>
 	
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9bb" -->
-				<option value="bb" SELECTED>chiaroscuro woodcut</option>
+				<option value="bb" selected="selected">chiaroscuro woodcut</option>
 			<!-- TMPL_ELSE -->
 				<option value="bb">chiaroscuro woodcut</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9bc" -->
-				<option value="bc" SELECTED>white-line woodcut</option>
+				<option value="bc" selected="selected">white-line woodcut</option>
 			<!-- TMPL_ELSE -->
 				<option value="bc">white-line woodcut</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9bd" -->
-				<option value="bd" SELECTED>camaiu</option>
+				<option value="bd" selected="selected">camaiu</option>
 			<!-- TMPL_ELSE -->
 				<option value="bd">camaiu</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9be" -->
-				<option value="be" SELECTED>heliogravure</option>
+				<option value="be" selected="selected">heliogravure</option>
 			<!-- TMPL_ELSE -->
 				<option value="be">heliogravure</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9bf" -->
-				<option value="bf" SELECTED>chromolithography</option>
+				<option value="bf" selected="selected">chromolithography</option>
 			<!-- TMPL_ELSE -->
 				<option value="bf">chromolithography</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9bg" -->
-				<option value="bg" SELECTED>lino-cut</option>
+				<option value="bg" selected="selected">lino-cut</option>
 			<!-- TMPL_ELSE -->
 				<option value="bg">lino-cut</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9bh" -->
-				<option value="bh" SELECTED>etching</option>
+				<option value="bh" selected="selected">etching</option>
 			<!-- TMPL_ELSE -->
 				<option value="bh">etching</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9bi" -->
-				<option value="bi" SELECTED>lithography/option>
+				<option value="bi" selected="selected">lithography/option>
 			<!-- TMPL_ELSE -->
 				<option value="bi">lithography</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9bj" -->
-				<option value="bj" SELECTED>photolithography</option>
+				<option value="bj" selected="selected">photolithography</option>
 			<!-- TMPL_ELSE -->
 				<option value="bj">photolithography</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9bk" -->
-				<option value="bk" SELECTED>zincography</option>
+				<option value="bk" selected="selected">zincography</option>
 			<!-- TMPL_ELSE -->
 				<option value="bk">zincography</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9bl" -->
-				<option value="bl" SELECTED>algraphy</option>
+				<option value="bl" selected="selected">algraphy</option>
 			<!-- TMPL_ELSE -->
 				<option value="bl">algraphy</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9bm" -->
-				<option value="bm" SELECTED>aquatint</option>
+				<option value="bm" selected="selected">aquatint</option>
 			<!-- TMPL_ELSE -->
 				<option value="bm">aquatint</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9bn" -->
-				<option value="bn" SELECTED>reservage (sugar aquatint)</option>
+				<option value="bn" selected="selected">reservage (sugar aquatint)</option>
 			<!-- TMPL_ELSE -->
 				<option value="bn">reservage (sugar aquatint)</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9ca" -->
-				<option value="ca" SELECTED>vernis-mou (soft ground etching or tracing)</option>
+				<option value="ca" selected="selected">vernis-mou (soft ground etching or tracing)</option>
 			<!-- TMPL_ELSE -->
 				<option value="ca">vernis-mou (soft ground etching or tracing)</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9cb" -->
-				<option value="cb" SELECTED>engraving</option>
+				<option value="cb" selected="selected">engraving</option>
 			<!-- TMPL_ELSE -->
 				<option value="cb">engraving</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9cc" -->
-				<option value="cc" SELECTED>engraving in the crayon manner</option>
+				<option value="cc" selected="selected">engraving in the crayon manner</option>
 			<!-- TMPL_ELSE -->
 				<option value="cc">engraving in the crayon manner</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9cd" -->
-				<option value="cd" SELECTED>Burin</option>
+				<option value="cd" selected="selected">Burin</option>
 			<!-- TMPL_ELSE -->
 				<option value="cd">Burin</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9ce" -->
-				<option value="ce" SELECTED>drypoint</option>
+				<option value="ce" selected="selected">drypoint</option>
 			<!-- TMPL_ELSE -->
 				<option value="ce">drypoint</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9cf" -->
-				<option value="cf" SELECTED>mezzotinta (mezzotint)</option>
+				<option value="cf" selected="selected">mezzotinta (mezzotint)</option>
 			<!-- TMPL_ELSE -->
 				<option value="cf">Mezzoteinte</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9cg" -->
-				<option value="cg" SELECTED>monotype</option>
+				<option value="cg" selected="selected">monotype</option>
 			<!-- TMPL_ELSE -->
 				<option value="cg">monotype</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9ch" -->
-				<option value="ch" SELECTED>silkscreen</option>
+				<option value="ch" selected="selected">silkscreen</option>
 			<!-- TMPL_ELSE -->
 				<option value="ch">silkscreen</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9ci" -->
-				<option value="ci" SELECTED>steel engraving</option>
+				<option value="ci" selected="selected">steel engraving</option>
 			<!-- TMPL_ELSE -->
 				<option value="ci">steel engraving</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9cj" -->
-				<option value="cj" SELECTED>computer graphics</option>
+				<option value="cj" selected="selected">computer graphics</option>
 			<!-- TMPL_ELSE -->
 				<option value="cj">computer graphics</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9ck" -->
-				<option value="ck" SELECTED>photocopying</option>
+				<option value="ck" selected="selected">photocopying</option>
 			<!-- TMPL_ELSE -->
 				<option value="ck">photocopying</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9uu" -->
-				<option value="uu" SELECTED>unknown</option>
+				<option value="uu" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="uu">unknown</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9vv" -->
-				<option value="vv" SELECTED>mixed</option>
+				<option value="vv" selected="selected">mixed</option>
 			<!-- TMPL_ELSE -->
 				<option value="vv">mixed</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9xx" -->
-				<option value="xx" SELECTED>not applicable</option>
+				<option value="xx" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="xx">not applicable</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9zz" -->
-				<option value="zz" SELECTED>other</option>
+				<option value="zz" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="zz">other</option>
 			<!-- /TMPL_IF -->
@@ -1278,191 +1275,191 @@
 		</td>
         </tr>
 	<tr>
-		<td>Technique (Prints) 3</td>
+		<td><label for="f10">Technique (Prints) 3</label></td>
 		<td>
-			<select name="f10" size="1">
+			<select name="f10" id="f10" size="1">
 			<!-- TMPL_IF name="f10|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
+            	<option value="|" selected="selected">|- Filling character</option>
             <!-- TMPL_ELSE -->
             	<option value="|">|- Filling character</option>
             <!-- /TMPL_IF -->
             
 			<!-- TMPL_IF name="f10  " -->
-				<option value="  " SELECTED>non required value</option>
+				<option value="  " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value="  ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ba" -->
-				<option value="ba" SELECTED>woodcut</option>
+				<option value="ba" selected="selected">woodcut</option>
 			<!-- TMPL_ELSE -->
 				<option value="ba">woodcut</option>
 	
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10bb" -->
-				<option value="bb" SELECTED>chiaroscuro woodcut</option>
+				<option value="bb" selected="selected">chiaroscuro woodcut</option>
 			<!-- TMPL_ELSE -->
 				<option value="bb">chiaroscuro woodcut</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10bc" -->
-				<option value="bc" SELECTED>white-line woodcut</option>
+				<option value="bc" selected="selected">white-line woodcut</option>
 			<!-- TMPL_ELSE -->
 				<option value="bc">white-line woodcut</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10bd" -->
-				<option value="bd" SELECTED>camaiu</option>
+				<option value="bd" selected="selected">camaiu</option>
 			<!-- TMPL_ELSE -->
 				<option value="bd">camaiu</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10be" -->
-				<option value="be" SELECTED>heliogravure</option>
+				<option value="be" selected="selected">heliogravure</option>
 			<!-- TMPL_ELSE -->
 				<option value="be">heliogravure</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10bf" -->
-				<option value="bf" SELECTED>chromolithography</option>
+				<option value="bf" selected="selected">chromolithography</option>
 			<!-- TMPL_ELSE -->
 				<option value="bf">chromolithography</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10bg" -->
-				<option value="bg" SELECTED>lino-cut</option>
+				<option value="bg" selected="selected">lino-cut</option>
 			<!-- TMPL_ELSE -->
 				<option value="bg">lino-cut</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10bh" -->
-				<option value="bh" SELECTED>etching</option>
+				<option value="bh" selected="selected">etching</option>
 			<!-- TMPL_ELSE -->
 				<option value="bh">etching</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10bi" -->
-				<option value="bi" SELECTED>lithography/option>
+				<option value="bi" selected="selected">lithography/option>
 			<!-- TMPL_ELSE -->
 				<option value="bi">lithography</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10bj" -->
-				<option value="bj" SELECTED>photolithography</option>
+				<option value="bj" selected="selected">photolithography</option>
 			<!-- TMPL_ELSE -->
 				<option value="bj">photolithography</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10bk" -->
-				<option value="bk" SELECTED>zincography</option>
+				<option value="bk" selected="selected">zincography</option>
 			<!-- TMPL_ELSE -->
 				<option value="bk">zincography</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10bl" -->
-				<option value="bl" SELECTED>algraphy</option>
+				<option value="bl" selected="selected">algraphy</option>
 			<!-- TMPL_ELSE -->
 				<option value="bl">algraphy</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10bm" -->
-				<option value="bm" SELECTED>aquatint</option>
+				<option value="bm" selected="selected">aquatint</option>
 			<!-- TMPL_ELSE -->
 				<option value="bm">aquatint</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10bn" -->
-				<option value="bn" SELECTED>reservage (sugar aquatint)</option>
+				<option value="bn" selected="selected">reservage (sugar aquatint)</option>
 			<!-- TMPL_ELSE -->
 				<option value="bn">reservage (sugar aquatint)</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ca" -->
-				<option value="ca" SELECTED>vernis-mou (soft ground etching or tracing)</option>
+				<option value="ca" selected="selected">vernis-mou (soft ground etching or tracing)</option>
 			<!-- TMPL_ELSE -->
 				<option value="ca">vernis-mou (soft ground etching or tracing)</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10cb" -->
-				<option value="cb" SELECTED>engraving</option>
+				<option value="cb" selected="selected">engraving</option>
 			<!-- TMPL_ELSE -->
 				<option value="cb">engraving</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10cc" -->
-				<option value="cc" SELECTED>engraving in the crayon manner</option>
+				<option value="cc" selected="selected">engraving in the crayon manner</option>
 			<!-- TMPL_ELSE -->
 				<option value="cc">engraving in the crayon manner</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10cd" -->
-				<option value="cd" SELECTED>burin engraving</option>
+				<option value="cd" selected="selected">burin engraving</option>
 			<!-- TMPL_ELSE -->
 				<option value="cd">burin engraving</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ce" -->
-				<option value="ce" SELECTED>drypoint</option>
+				<option value="ce" selected="selected">drypoint</option>
 			<!-- TMPL_ELSE -->
 				<option value="ce">drypoint</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10cf" -->
-				<option value="cf" SELECTED>mezzotinta (mezzotint)</option>
+				<option value="cf" selected="selected">mezzotinta (mezzotint)</option>
 			<!-- TMPL_ELSE -->
 				<option value="cf">Mezzoteinte</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10cg" -->
-				<option value="cg" SELECTED>monotype</option>
+				<option value="cg" selected="selected">monotype</option>
 			<!-- TMPL_ELSE -->
 				<option value="cg">monotype</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ch" -->
-				<option value="ch" SELECTED>silkscreen</option>
+				<option value="ch" selected="selected">silkscreen</option>
 			<!-- TMPL_ELSE -->
 				<option value="ch">silkscreen</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ci" -->
-				<option value="ci" SELECTED>steel engraving</option>
+				<option value="ci" selected="selected">steel engraving</option>
 			<!-- TMPL_ELSE -->
 				<option value="ci">steel engraving</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10cj" -->
-				<option value="cj" SELECTED>computer graphics</option>
+				<option value="cj" selected="selected">computer graphics</option>
 			<!-- TMPL_ELSE -->
 				<option value="cj">computer graphics</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ck" -->
-				<option value="ck" SELECTED>photocopying</option>
+				<option value="ck" selected="selected">photocopying</option>
 			<!-- TMPL_ELSE -->
 				<option value="ck">photocopying</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10uu" -->
-				<option value="uu" SELECTED>unknown</option>
+				<option value="uu" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="uu">unknown</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10vv" -->
-				<option value="vv" SELECTED>mixed</option>
+				<option value="vv" selected="selected">mixed</option>
 			<!-- TMPL_ELSE -->
 				<option value="vv">mixed</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10xx" -->
-				<option value="xx" SELECTED>not applicable</option>
+				<option value="xx" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="xx">not applicable</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10zz" -->
-				<option value="zz" SELECTED>other</option>
+				<option value="zz" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="zz">other</option>
 			<!-- /TMPL_IF -->
@@ -1472,113 +1469,113 @@
         </tr>
 
 	<tr>
-		<td>Functional Designation</td>
+		<td><label for="f11">Functional Designation</label></td>
 		<td>
-			<select name="f11" size="1">
+			<select name="f11" id="f11" size="1">
 			<!-- TMPL_IF name="f11|" -->
-                            <option value="|" SELECTED>|- Filling character</option>
+                            <option value="|" selected="selected">|- Filling character</option>
                         <!-- TMPL_ELSE -->
                             <option value="|">|- Filling character</option>
                         <!-- /TMPL_IF -->
                         
 			<!-- TMPL_IF name="f11aa" -->
-				<option value="aa" SELECTED>aa- architectural drawing</option>
+				<option value="aa" selected="selected">aa- architectural drawing</option>
 			<!-- TMPL_ELSE -->
 				<option value="aa">aa- architectural drawing</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f11ab" -->
-				<option value="ab" SELECTED>ab- item cover</option>
+				<option value="ab" selected="selected">ab- item cover</option>
 			<!-- TMPL_ELSE -->
 				<option value="ab">ab- item cover</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f11ac" -->
-				<option value="ac" SELECTED>ac- sticker</option>
+				<option value="ac" selected="selected">ac- sticker</option>
 			<!-- TMPL_ELSE -->
 				<option value="ac">ac- sticker</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f11ad" -->
-				<option value="ad" SELECTED>ad- poster</option>
+				<option value="ad" selected="selected">ad- poster</option>
 			<!-- TMPL_ELSE -->
 				<option value="ad">ad- poster</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f11ae" -->
-				<option value="ae" SELECTED>ae- postcard</option>
+				<option value="ae" selected="selected">ae- postcard</option>
 			<!-- TMPL_ELSE -->
 				<option value="ae">ae- postcard</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f11af" -->
-				<option value="af" SELECTED>af- greetings card</option>
+				<option value="af" selected="selected">af- greetings card</option>
 			<!-- TMPL_ELSE -->
 				<option value="af">af- greetings card</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f11ag" -->
-				<option value="ag" SELECTED>ag- chart</option>
+				<option value="ag" selected="selected">ag- chart</option>
 			<!-- TMPL_ELSE -->
 				<option value="ag">ag- chart</option>
 			<!-- /TMPL_IF -->
 			
 			<!-- TMPL_IF name="f11ah" -->
-				<option value="ah" SELECTED>ah- playing cards</option>
+				<option value="ah" selected="selected">ah- playing cards</option>
 			<!-- TMPL_ELSE -->
 				<option value="ah">ah- playing cards</option>
 			<!-- /TMPL_IF -->
 			
 			<!-- TMPL_IF name="f11ai" -->
-				<option value="ai" SELECTED>ai- flash card</option>
+				<option value="ai" selected="selected">ai- flash card</option>
 			<!-- TMPL_ELSE -->
 				<option value="ai">ai- flash card</option>
 			<!-- /TMPL_IF -->
 		
 			<!-- TMPL_IF name="f11aj" -->
-				<option value="aj" SELECTED>aj- ephemera</option>
+				<option value="aj" selected="selected">aj- ephemera</option>
 			<!-- TMPL_ELSE -->
 				<option value="aj">aj- ephemera</option>
 			<!-- /TMPL_IF -->
 			
 			<!-- TMPL_IF name="f11an" -->
-				<option value="an" SELECTED>an- calendar</option>
+				<option value="an" selected="selected">an- calendar</option>
 			<!-- TMPL_ELSE -->
 				<option value="an">an- calendar</option>
 			<!-- /TMPL_IF -->
 			
 			<!-- TMPL_IF name="f11as" -->
-				<option value="as" SELECTED>as- place card</option>
+				<option value="as" selected="selected">as- place card</option>
 			<!-- TMPL_ELSE -->
 				<option value="as">as- place card</option>
 			<!-- /TMPL_IF -->
 			
 			<!-- TMPL_IF name="f11au" -->
-				<option value="au" SELECTED>au- santino</option>
+				<option value="au" selected="selected">au- santino</option>
 			<!-- TMPL_ELSE -->
 				<option value="au">au- santino</option>
 			<!-- /TMPL_IF -->
 			
 			<!-- TMPL_IF name="f11uu" -->
-				<option value="uu" SELECTED>uu- unknown</option>
+				<option value="uu" selected="selected">uu- unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="uu">uu- unknown</option>
 			<!-- /TMPL_IF -->
 			
 			<!-- TMPL_IF name="f11vv" -->
-				<option value="vv" SELECTED>vv- mixed</option>
+				<option value="vv" selected="selected">vv- mixed</option>
 			<!-- TMPL_ELSE -->
 				<option value="vv">vv- mixed</option>
 			<!-- /TMPL_IF -->
 			
 			<!-- TMPL_IF name="f11xx" -->
-				<option value="xx" SELECTED>xx- not applicable</option>
+				<option value="xx" selected="selected">xx- not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="xx">xx- not applicable</option>
 			<!-- /TMPL_IF -->
 			
 			<!-- TMPL_IF name="f11zz" -->
-				<option value="zz" SELECTED>zz- other</option>
+				<option value="zz" selected="selected">zz- other</option>
 			<!-- TMPL_ELSE -->
 				<option value="zz">zz- other</option>
 			<!-- /TMPL_IF -->
@@ -1586,11 +1583,11 @@
 				</select>
 		</td>
         </tr>
-	
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
+//<![CDATA[
 	function report() {
 	    var doc   = opener.document; 
         var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
@@ -1598,6 +1595,7 @@
 		self.close();
 		return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_117.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_117.tmpl
index 00c93e9..6d6f590 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_117.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_117.tmpl
@@ -1,216 +1,213 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 117 builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 117 builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 117 builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Specific Material Designation</td>
+		<td><label for="f1">Specific Material Designation</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
 			<!-- TMPL_IF name="f1|" -->
-            	           <option value="|" SELECTED>|- Filling character</option>
+            	           <option value="|" selected="selected">|- Filling character</option>
                         <!-- TMPL_ELSE -->
                             <option value="|">|- Filling character</option>
                         <!-- /TMPL_IF -->
             
 			<!-- TMPL_IF name="f1aa" -->
-				<option value="aa" SELECTED>study kit</option>
+				<option value="aa" selected="selected">study kit</option>
 			<!-- TMPL_ELSE -->
 				<option value="aa">study kit</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ab" -->
-				<option value="ab" SELECTED>laboratory and construction kits</option>
+				<option value="ab" selected="selected">laboratory and construction kits</option>
 			<!-- TMPL_ELSE -->
 				<option value="ab">laboratory and construction kits</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ac" -->
-				<option value="ac" SELECTED>specimens (biological etc.)</option>
+				<option value="ac" selected="selected">specimens (biological etc.)</option>
 			<!-- TMPL_ELSE -->
 				<option value="ac">specimens (biological etc.)</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ad" -->
-				<option value="ad" SELECTED>fauna</option>
+				<option value="ad" selected="selected">fauna</option>
 			<!-- TMPL_ELSE -->
 				<option value="ad">fauna</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ae" -->
-				<option value="ae" SELECTED>flora</option>
+				<option value="ae" selected="selected">flora</option>
 			<!-- TMPL_ELSE -->
 				<option value="ae">flora</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1af" -->
-				<option value="af" SELECTED>minerals</option>
+				<option value="af" selected="selected">minerals</option>
 			<!-- TMPL_ELSE -->
 				<option value="af">minerals</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ag" -->
-				<option value="ag" SELECTED>microscope slides</option>
+				<option value="ag" selected="selected">microscope slides</option>
 			<!-- TMPL_ELSE -->
 				<option value="ag">microscope slides</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ah" -->
-				<option value="ah" SELECTED>jigsaws</option>
+				<option value="ah" selected="selected">jigsaws</option>
 			<!-- TMPL_ELSE -->
 				<option value="ah">jigsaws</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ai" -->
-				<option value="ai" SELECTED>tools and equipment</option>
+				<option value="ai" selected="selected">tools and equipment</option>
 			<!-- TMPL_ELSE -->
 				<option value="ai">tools and equipment</option>	
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f1aj" -->
-				<option value="aj" SELECTED>arms</option>
+				<option value="aj" selected="selected">arms</option>
 			<!-- TMPL_ELSE -->
 				<option value="aj">arms</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ak" -->
-				<option value="ak" SELECTED>containers</option>
+				<option value="ak" selected="selected">containers</option>
 			<!-- TMPL_ELSE -->
 				<option value="ak">containers</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1al" -->
-				<option value="al" SELECTED>furniture</option>
+				<option value="al" selected="selected">furniture</option>
 			<!-- TMPL_ELSE -->
 				<option value="al">furniture</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1be" -->
-				<option value="be" SELECTED>industrial production</option>
+				<option value="be" selected="selected">industrial production</option>
 			<!-- TMPL_ELSE -->
 				<option value="be">industrial production</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1bf" -->
-				<option value="bf" SELECTED>machines</option>
+				<option value="bf" selected="selected">machines</option>
 			<!-- TMPL_ELSE -->
 				<option value="bf">machines</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1bg" -->
-				<option value="bg" SELECTED>coins</option>
+				<option value="bg" selected="selected">coins</option>
 			<!-- TMPL_ELSE -->
 				<option value="bg">coins</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1bh" -->
-				<option value="bh" SELECTED>medals</option>
+				<option value="bh" selected="selected">medals</option>
 			<!-- TMPL_ELSE -->
 				<option value="bh">medals</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1bi" -->
-				<option value="bi" SELECTED>jewellery</option>
+				<option value="bi" selected="selected">jewellery</option>
 			<!-- TMPL_ELSE -->
 				<option value="bi">jewellery</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1am" -->
-				<option value="am" SELECTED>transport</option>
+				<option value="am" selected="selected">transport</option>
 			<!-- TMPL_ELSE -->
 				<option value="am">transport</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1an" -->
-				<option value="an" SELECTED>textiles</option>
+				<option value="an" selected="selected">textiles</option>
 			<!-- TMPL_ELSE -->
 				<option value="an">textiles</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ao" -->
-				<option value="ao" SELECTED>clothes</option>
+				<option value="ao" selected="selected">clothes</option>
 			<!-- TMPL_ELSE -->
 				<option value="ao">clothes</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ap" -->
-				<option value="ap" SELECTED>games and recreation</option>
+				<option value="ap" selected="selected">games and recreation</option>
 			<!-- TMPL_ELSE -->
 				<option value="ap">games and recreation</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1aq" -->
-				<option value="aq" SELECTED>toys</option>
+				<option value="aq" selected="selected">toys</option>
 			<!-- TMPL_ELSE -->
 				<option value="aq">toys</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ar" -->
-				<option value="ar" SELECTED>dolls</option>
+				<option value="ar" selected="selected">dolls</option>
 			<!-- TMPL_ELSE -->
 				<option value="ar">dolls</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1as" -->
-				<option value="as" SELECTED>models</option>
+				<option value="as" selected="selected">models</option>
 			<!-- TMPL_ELSE -->
 				<option value="as">models</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1at" -->
-				<option value="at" SELECTED>models for making</option>
+				<option value="at" selected="selected">models for making</option>
 			<!-- TMPL_ELSE -->
 				<option value="at">models for making</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ba" -->
-				<option value="ba" SELECTED>dioramas</option>
+				<option value="ba" selected="selected">dioramas</option>
 			<!-- TMPL_ELSE -->
 				<option value="ba">dioramas</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1bb" -->
-				<option value="bb" SELECTED>replicas</option>
+				<option value="bb" selected="selected">replicas</option>
 			<!-- TMPL_ELSE -->
 				<option value="bb">replicas</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1bc" -->
-				<option value="bc" SELECTED>sculptures</option>
+				<option value="bc" selected="selected">sculptures</option>
 			<!-- TMPL_ELSE -->
 				<option value="bc">sculptures</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1bd" -->
-				<option value="bd" SELECTED>design objects</option>
+				<option value="bd" selected="selected">design objects</option>
 			<!-- TMPL_ELSE -->
 				<option value="bd">design objects</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1bj" -->
-				<option value="bj" SELECTED>artefacts</option>
+				<option value="bj" selected="selected">artefacts</option>
 			<!-- TMPL_ELSE -->
 				<option value="bj">artefacts</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1uu" -->
-				<option value="uu" SELECTED>unknown</option>
+				<option value="uu" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="uu">unknown</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1vv" -->
-				<option value="vv" SELECTED>mixed</option>
+				<option value="vv" selected="selected">mixed</option>
 			<!-- TMPL_ELSE -->
 				<option value="vv">mixed</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1zz" -->
-				<option value="zz" SELECTED>other</option>
+				<option value="zz" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="zz">other</option>
 	
@@ -220,176 +217,176 @@
 		</td>
 	</tr>
 	<tr>
-		<td>Material 1</td>
+		<td><label for="f2">Material 1</label></td>
 		<td>
-			<select name="f2" size="1">
+			<select name="f2" id="f2" size="1">
 			<!-- TMPL_IF name="f2|" -->
-                            <option value="|" SELECTED>|- Filling character</option>
+                            <option value="|" selected="selected">|- Filling character</option>
                         <!-- TMPL_ELSE -->
                             <option value="|">|- Filling character</option>
                         <!-- /TMPL_IF -->
             
 			<!-- TMPL_IF name="f2  " -->
-				<option value="  " SELECTED>non required value</option>
+				<option value="  " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value="  ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2aa" -->
-				<option value="aa" SELECTED>terra-cotta</option>
+				<option value="aa" selected="selected">terra-cotta</option>
 			<!-- TMPL_ELSE -->
 				<option value="aa">terra-cotta</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2ab" -->
-				<option value="ab" SELECTED>wax</option>
+				<option value="ab" selected="selected">wax</option>
 			<!-- TMPL_ELSE -->
 				<option value="ab">wax</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2ac" -->
-				<option value="ac" SELECTED>clay</option>
+				<option value="ac" selected="selected">clay</option>
 			<!-- TMPL_ELSE -->
 				<option value="ac">clay</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2ad" -->
-				<option value="ad" SELECTED>majolica</option>
+				<option value="ad" selected="selected">majolica</option>
 			<!-- TMPL_ELSE -->
 				<option value="ad">majolica</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2ae" -->
-				<option value="ae" SELECTED>porcelain</option>
+				<option value="ae" selected="selected">porcelain</option>
 			<!-- TMPL_ELSE -->
 				<option value="ae">porcelain</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2af" -->
-				<option value="af" SELECTED>ceramic</option>
+				<option value="af" selected="selected">ceramic</option>
 			<!-- TMPL_ELSE -->
 				<option value="af">ceramic</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2ag" -->
-				<option value="ag" SELECTED>plaster</option>
+				<option value="ag" selected="selected">plaster</option>
 			<!-- TMPL_ELSE -->
 				<option value="ag">plaster</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2ah" -->
-				<option value="ah" SELECTED>glass</option>
+				<option value="ah" selected="selected">glass</option>
 			<!-- TMPL_ELSE -->
 				<option value="ah">glass</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2ba" -->
-				<option value="ba" SELECTED>wood</option>
+				<option value="ba" selected="selected">wood</option>
 			<!-- TMPL_ELSE -->
 				<option value="ba">wood</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2ca" -->
-				<option value="ca" SELECTED>ivory</option>
+				<option value="ca" selected="selected">ivory</option>
 			<!-- TMPL_ELSE -->
 				<option value="ca">ivory</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2da" -->
-				<option value="da" SELECTED>stone</option>
+				<option value="da" selected="selected">stone</option>
 			<!-- TMPL_ELSE -->
 				<option value="da">stone</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2db" -->
-				<option value="db" SELECTED>precious stones</option>
+				<option value="db" selected="selected">precious stones</option>
 			<!-- TMPL_ELSE -->
 				<option value="db">precious stones</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2dc" -->
-				<option value="dc" SELECTED>marble</option>
+				<option value="dc" selected="selected">marble</option>
 			<!-- TMPL_ELSE -->
 				<option value="dc">marble</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2dd" -->
-				<option value="dd" SELECTED>basalt</option>
+				<option value="dd" selected="selected">basalt</option>
 			<!-- TMPL_ELSE -->
 				<option value="dd">basalt</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2df" -->
-				<option value="df" SELECTED>porphyry</option>
+				<option value="df" selected="selected">porphyry</option>
 			<!-- TMPL_ELSE -->
 				<option value="df">porphyry</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2ea" -->
-				<option value="ea" SELECTED>paper</option>
+				<option value="ea" selected="selected">paper</option>
 			<!-- TMPL_ELSE -->
 				<option value="ea">paper</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2eb" -->
-				<option value="eb" SELECTED>cardboard</option>
+				<option value="eb" selected="selected">cardboard</option>
 			<!-- TMPL_ELSE -->
 				<option value="eb">cardboard</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2fa" -->
-				<option value="fa" SELECTED>precious metals</option>
+				<option value="fa" selected="selected">precious metals</option>
 			<!-- TMPL_ELSE -->
 				<option value="fa">precious metals</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2fb" -->
-				<option value="fb" SELECTED>metal</option>
+				<option value="fb" selected="selected">metal</option>
 			<!-- TMPL_ELSE -->
 				<option value="fb">metal</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2fc" -->
-				<option value="fc" SELECTED>bronze</option>
+				<option value="fc" selected="selected">bronze</option>
 			<!-- TMPL_ELSE -->
 				<option value="fc">bronze</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2fd" -->
-				<option value="fd" SELECTED>copper</option>
+				<option value="fd" selected="selected">copper</option>
 			<!-- TMPL_ELSE -->
 				<option value="fd">copper</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2ga" -->
-				<option value="ga" SELECTED>synthetics</option>
+				<option value="ga" selected="selected">synthetics</option>
 			<!-- TMPL_ELSE -->
 				<option value="ga">synthetics</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2ha" -->
-				<option value="ha" SELECTED>textile</option>
+				<option value="ha" selected="selected">textile</option>
 			<!-- TMPL_ELSE -->
 				<option value="ha">textile</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2ia" -->
-				<option value="ia" SELECTED>plastic</option>
+				<option value="ia" selected="selected">plastic</option>
 			<!-- TMPL_ELSE -->
 				<option value="ia">plastic</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2uu" -->
-				<option value="uu" SELECTED>unknown</option>
+				<option value="uu" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="uu">unknown</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2vv" -->
-				<option value="vv" SELECTED>mixed</option>
+				<option value="vv" selected="selected">mixed</option>
 			<!-- TMPL_ELSE -->
 				<option value="vv">mixed</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2zz" -->
-				<option value="zz" SELECTED>other</option>
+				<option value="zz" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="zz">other</option>
 	
@@ -399,177 +396,177 @@
 		</td>
 	</tr>
 	<tr>
-		<td>Material 2</td>
+		<td><label for="f3">Material 2</label></td>
 		<td>
-			<select name="f3" size="1">
+			<select name="f3" id="f3" size="1">
 			<!-- TMPL_IF name="f3|" -->
-                            <option value="|" SELECTED>|- Filling character</option>
+                            <option value="|" selected="selected">|- Filling character</option>
                         <!-- TMPL_ELSE -->
                             <option value="|">|- Filling character</option>
                         <!-- /TMPL_IF -->
             
 			<!-- TMPL_IF name="f3  " -->
-				<option value="  " SELECTED>non required value</option>
+				<option value="  " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value="  ">non required value</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f3aa" -->
-				<option value="aa" SELECTED>terra-cotta</option>
+				<option value="aa" selected="selected">terra-cotta</option>
 			<!-- TMPL_ELSE -->
 				<option value="aa">terra-cotta</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3ab" -->
-				<option value="ab" SELECTED>wax</option>
+				<option value="ab" selected="selected">wax</option>
 			<!-- TMPL_ELSE -->
 				<option value="ab">wax</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3ac" -->
-				<option value="ac" SELECTED>clay</option>
+				<option value="ac" selected="selected">clay</option>
 			<!-- TMPL_ELSE -->
 				<option value="ac">clay</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3ad" -->
-				<option value="ad" SELECTED>majolica</option>
+				<option value="ad" selected="selected">majolica</option>
 			<!-- TMPL_ELSE -->
 				<option value="ad">majolica</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3ae" -->
-				<option value="ae" SELECTED>porcelain</option>
+				<option value="ae" selected="selected">porcelain</option>
 			<!-- TMPL_ELSE -->
 				<option value="ae">porcelain</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3af" -->
-				<option value="af" SELECTED>ceramic</option>
+				<option value="af" selected="selected">ceramic</option>
 			<!-- TMPL_ELSE -->
 				<option value="af">ceramic</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3ag" -->
-				<option value="ag" SELECTED>plaster</option>
+				<option value="ag" selected="selected">plaster</option>
 			<!-- TMPL_ELSE -->
 				<option value="ag">plaster</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3ah" -->
-				<option value="ah" SELECTED>glass</option>
+				<option value="ah" selected="selected">glass</option>
 			<!-- TMPL_ELSE -->
 				<option value="ah">glass</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3ba" -->
-				<option value="ba" SELECTED>wood</option>
+				<option value="ba" selected="selected">wood</option>
 			<!-- TMPL_ELSE -->
 				<option value="ba">wood</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3ca" -->
-				<option value="ca" SELECTED>ivory</option>
+				<option value="ca" selected="selected">ivory</option>
 			<!-- TMPL_ELSE -->
 				<option value="ca">ivory</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3da" -->
-				<option value="da" SELECTED>stone</option>
+				<option value="da" selected="selected">stone</option>
 			<!-- TMPL_ELSE -->
 				<option value="da">stone</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3db" -->
-				<option value="db" SELECTED>precious stones</option>
+				<option value="db" selected="selected">precious stones</option>
 			<!-- TMPL_ELSE -->
 				<option value="db">precious stones</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3dc" -->
-				<option value="dc" SELECTED>marble</option>
+				<option value="dc" selected="selected">marble</option>
 			<!-- TMPL_ELSE -->
 				<option value="dc">marble</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3dd" -->
-				<option value="dd" SELECTED>basalt</option>
+				<option value="dd" selected="selected">basalt</option>
 			<!-- TMPL_ELSE -->
 				<option value="dd">basalt</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3df" -->
-				<option value="df" SELECTED>porphyry</option>
+				<option value="df" selected="selected">porphyry</option>
 			<!-- TMPL_ELSE -->
 				<option value="df">porphyry</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3ea" -->
-				<option value="ea" SELECTED>paper</option>
+				<option value="ea" selected="selected">paper</option>
 			<!-- TMPL_ELSE -->
 				<option value="ea">paper</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3eb" -->
-				<option value="eb" SELECTED>cardboard</option>
+				<option value="eb" selected="selected">cardboard</option>
 			<!-- TMPL_ELSE -->
 				<option value="eb">cardboard</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3fa" -->
-				<option value="fa" SELECTED>precious metals</option>
+				<option value="fa" selected="selected">precious metals</option>
 			<!-- TMPL_ELSE -->
 				<option value="fa">precious metals</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3fb" -->
-				<option value="fb" SELECTED>metal</option>
+				<option value="fb" selected="selected">metal</option>
 			<!-- TMPL_ELSE -->
 				<option value="fb">metal</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3fc" -->
-				<option value="fc" SELECTED>bronze</option>
+				<option value="fc" selected="selected">bronze</option>
 			<!-- TMPL_ELSE -->
 				<option value="fc">bronze</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3fd" -->
-				<option value="fd" SELECTED>copper</option>
+				<option value="fd" selected="selected">copper</option>
 			<!-- TMPL_ELSE -->
 				<option value="fd">copper</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3ga" -->
-				<option value="ga" SELECTED>synthetics</option>
+				<option value="ga" selected="selected">synthetics</option>
 			<!-- TMPL_ELSE -->
 				<option value="ga">synthetics</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3ha" -->
-				<option value="ha" SELECTED>textile</option>
+				<option value="ha" selected="selected">textile</option>
 			<!-- TMPL_ELSE -->
 				<option value="ha">textile</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3ia" -->
-				<option value="ia" SELECTED>plastic</option>
+				<option value="ia" selected="selected">plastic</option>
 			<!-- TMPL_ELSE -->
 				<option value="ia">plastic</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3uu" -->
-				<option value="uu" SELECTED>unknown</option>
+				<option value="uu" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="uu">unknown</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3vv" -->
-				<option value="vv" SELECTED>mixed</option>
+				<option value="vv" selected="selected">mixed</option>
 			<!-- TMPL_ELSE -->
 				<option value="vv">mixed</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3zz" -->
-				<option value="zz" SELECTED>other</option>
+				<option value="zz" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="zz">other</option>
 	
@@ -579,175 +576,175 @@
 		</td>
 	</tr>
 	<tr>
-		<td>Material 3</td>
+		<td><label for="f4">Material 3</label></td>
 		<td>
-			<select name="f4" size="1">
+			<select name="f4" id="f4" size="1">
 			<!-- TMPL_IF name="f4|" -->
-                            <option value="|" SELECTED>|- Filling character</option>
+                            <option value="|" selected="selected">|- Filling character</option>
                         <!-- TMPL_ELSE -->
                             <option value="|">|- Filling character</option>
                         <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="f4  " -->
-                                <option value="  " SELECTED>non required value</option>
+                                <option value="  " selected="selected">non required value</option>
                         <!-- TMPL_ELSE -->
                                 <option value="  ">non required value</option>
                         <!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4aa" -->
-				<option value="aa" SELECTED>terra-cotta</option>
+				<option value="aa" selected="selected">terra-cotta</option>
 			<!-- TMPL_ELSE -->
 				<option value="aa">terra-cotta</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4ab" -->
-				<option value="ab" SELECTED>wax</option>
+				<option value="ab" selected="selected">wax</option>
 			<!-- TMPL_ELSE -->
 				<option value="ab">wax</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4ac" -->
-				<option value="ac" SELECTED>clay</option>
+				<option value="ac" selected="selected">clay</option>
 			<!-- TMPL_ELSE -->
 				<option value="ac">clay</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4ad" -->
-				<option value="ad" SELECTED>majolica</option>
+				<option value="ad" selected="selected">majolica</option>
 			<!-- TMPL_ELSE -->
 				<option value="ad">majolica</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4ae" -->
-				<option value="ae" SELECTED>porcelain</option>
+				<option value="ae" selected="selected">porcelain</option>
 			<!-- TMPL_ELSE -->
 				<option value="ae">porcelain</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4af" -->
-				<option value="af" SELECTED>ceramic</option>
+				<option value="af" selected="selected">ceramic</option>
 			<!-- TMPL_ELSE -->
 				<option value="af">ceramic</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4ag" -->
-				<option value="ag" SELECTED>plaster</option>
+				<option value="ag" selected="selected">plaster</option>
 			<!-- TMPL_ELSE -->
 				<option value="ag">plaster</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4ah" -->
-				<option value="ah" SELECTED>glass</option>
+				<option value="ah" selected="selected">glass</option>
 			<!-- TMPL_ELSE -->
 				<option value="ah">glass</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4ba" -->
-				<option value="ba" SELECTED>wood</option>
+				<option value="ba" selected="selected">wood</option>
 			<!-- TMPL_ELSE -->
 				<option value="ba">wood</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4ca" -->
-				<option value="ca" SELECTED>ivory</option>
+				<option value="ca" selected="selected">ivory</option>
 			<!-- TMPL_ELSE -->
 				<option value="ca">ivory</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4da" -->
-				<option value="da" SELECTED>stone</option>
+				<option value="da" selected="selected">stone</option>
 			<!-- TMPL_ELSE -->
 				<option value="da">stone</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4db" -->
-				<option value="db" SELECTED>precious stones</option>
+				<option value="db" selected="selected">precious stones</option>
 			<!-- TMPL_ELSE -->
 				<option value="db">precious stones</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4dc" -->
-				<option value="dc" SELECTED>marble</option>
+				<option value="dc" selected="selected">marble</option>
 			<!-- TMPL_ELSE -->
 				<option value="dc">marble</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4dd" -->
-				<option value="dd" SELECTED>basalt</option>
+				<option value="dd" selected="selected">basalt</option>
 			<!-- TMPL_ELSE -->
 				<option value="dd">basalt</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4df" -->
-				<option value="df" SELECTED>porphyry</option>
+				<option value="df" selected="selected">porphyry</option>
 			<!-- TMPL_ELSE -->
 				<option value="df">porphyry</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4ea" -->
-				<option value="ea" SELECTED>paper</option>
+				<option value="ea" selected="selected">paper</option>
 			<!-- TMPL_ELSE -->
 				<option value="ea">paper</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4eb" -->
-				<option value="eb" SELECTED>cardboard</option>
+				<option value="eb" selected="selected">cardboard</option>
 			<!-- TMPL_ELSE -->
 				<option value="eb">cardboard</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4fa" -->
-				<option value="fa" SELECTED>precious metals</option>
+				<option value="fa" selected="selected">precious metals</option>
 			<!-- TMPL_ELSE -->
 				<option value="fa">precious metals</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4fb" -->
-				<option value="fb" SELECTED>metal</option>
+				<option value="fb" selected="selected">metal</option>
 			<!-- TMPL_ELSE -->
 				<option value="fb">metal</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4fc" -->
-				<option value="fc" SELECTED>bronze</option>
+				<option value="fc" selected="selected">bronze</option>
 			<!-- TMPL_ELSE -->
 				<option value="fc">bronze</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4fd" -->
-				<option value="fd" SELECTED>copper</option>
+				<option value="fd" selected="selected">copper</option>
 			<!-- TMPL_ELSE -->
 				<option value="fd">copper</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4ga" -->
-				<option value="ga" SELECTED>synthetics</option>
+				<option value="ga" selected="selected">synthetics</option>
 			<!-- TMPL_ELSE -->
 				<option value="ga">synthetics</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4ha" -->
-				<option value="ha" SELECTED>textile</option>
+				<option value="ha" selected="selected">textile</option>
 			<!-- TMPL_ELSE -->
 				<option value="ha">textile</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4ia" -->
-				<option value="ia" SELECTED>plastic</option>
+				<option value="ia" selected="selected">plastic</option>
 			<!-- TMPL_ELSE -->
 				<option value="ia">plastic</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4uu" -->
-				<option value="uu" SELECTED>unknown</option>
+				<option value="uu" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="uu">unknown</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4vv" -->
-				<option value="vv" SELECTED>mixed</option>
+				<option value="vv" selected="selected">mixed</option>
 			<!-- TMPL_ELSE -->
 				<option value="vv">mixed</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4zz" -->
-				<option value="zz" SELECTED>other</option>
+				<option value="zz" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="zz">other</option>
 			<!-- /TMPL_IF -->
@@ -757,62 +754,63 @@
 	</tr>
 
 	<tr>
-		<td>Colour</td>
+		<td><label for="f5">Color</label></td>
 		<td>
-	<select name="f5" size="1">
+	<select name="f5" id="f5" size="1">
                         <!-- TMPL_IF name="f5|" -->
-                            <option value="|" SELECTED>|- Filling character</option>
+                            <option value="|" selected="selected">|- Filling character</option>
                         <!-- TMPL_ELSE -->
                             <option value="|">|- Filling character</option>
                         <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5a" -->
-				<option value="a" SELECTED>one-colour, monochrome</option>
+				<option value="a" selected="selected">one-colour, monochrome</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">one-colour, monochrome</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5b" -->
-				<option value="b" SELECTED>black-and-white</option>
+				<option value="b" selected="selected">black-and-white</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">black-and-white</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5c" -->
-				<option value="c" SELECTED>multicoloured</option>
+				<option value="c" selected="selected">multicoloured</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">multicoloured</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5d" -->
-				<option value="d" SELECTED>hand coloured</option>
+				<option value="d" selected="selected">hand coloured</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">hand coloured</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5v" -->
-				<option value="v" SELECTED>mixed</option>
+				<option value="v" selected="selected">mixed</option>
 			<!-- TMPL_ELSE -->
 				<option value="v">mixed</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5x" -->
-				<option value="x" SELECTED>not applicable</option>
+				<option value="x" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not applicable</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
 				</select>
 		</td>
 	</tr>
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
+//<![CDATA[
 	function report() {
 	    var doc   = opener.document; 
             var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
@@ -820,6 +818,7 @@
 	    self.close();
 	    return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_120.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_120.tmpl
index ba33d95..997402a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_120.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_120.tmpl
@@ -1,141 +1,138 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 120 builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 120 builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 120 builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Colour indicator</td>
+		<td><label for="f1">Color indicator</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
 			<!-- TMPL_IF name="f1a" -->
-				<option value="a" SELECTED>one colour</option>
+				<option value="a" selected="selected">one color</option>
 			<!-- TMPL_ELSE -->
-				<option value="a">one colour</option>
+				<option value="a">one color</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1b" -->
-				<option value="b" SELECTED>multi-colour</option>
+				<option value="b" selected="selected">multi-color</option>
 			<!-- TMPL_ELSE -->
-				<option value="b">multi-colour</option>
+				<option value="b">multi-color</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr><tr>
-		<td>Index indicator</td>
+		<td><label for="f2">Index indicator</label></td>
 		<td>
-			<select name="f2" size="1">
+			<select name="f2" id="f2" size="1">
 			<!-- TMPL_IF name="f2a" -->
-				<option value="a" SELECTED>index or name list on cartographic item itself</option>
+				<option value="a" selected="selected">index or name list on cartographic item itself</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">index or name list on cartographic item itself</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2b" -->
-				<option value="b" SELECTED>   index or name list accompanying cartographic item in booklet...</option>
+				<option value="b" selected="selected">   index or name list accompanying cartographic item in booklet...</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">   index or name list accompanying cartographic item in booklet...</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2c" -->
-				<option value="c" SELECTED>index or name list present but location not specified</option>
+				<option value="c" selected="selected">index or name list present but location not specified</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">index or name list present but location not specified</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2y" -->
-				<option value="y" SELECTED>no index or name lis</option>
+				<option value="y" selected="selected">no index or name lis</option>
 			<!-- TMPL_ELSE -->
 				<option value="y">no index or name lis</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr><tr>
-		<td>Narrative text indicator</td>
+		<td><label for="f3">Narrative text indicator</label></td>
 		<td>
-			<select name="f3" size="1">
+			<select name="f3" id="f3" size="1">
 
 			<!-- TMPL_IF name="f3a" -->
-				<option value="a" SELECTED>text on cartographic item itself</option>
+				<option value="a" selected="selected">text on cartographic item itself</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">text on cartographic item itself</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3b" -->
-				<option value="b" SELECTED>text accompanying cartographic item in booklet, pamphlet...</option>
+				<option value="b" selected="selected">text accompanying cartographic item in booklet, pamphlet...</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">text accompanying cartographic item in booklet, pamphlet...</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3y" -->
-				<option value="y" SELECTED>no narrative tex</option>
+				<option value="y" selected="selected">no narrative tex</option>
 			<!-- TMPL_ELSE -->
 				<option value="y">no narrative tex</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr><tr>
-		<td>Relief codes 1:</td>
+		<td><label for="f4">Relief codes 1:</label></td>
 		<td>
-			<select name="f4" size="1">
+			<select name="f4" id="f4" size="1">
 			<!-- TMPL_IF name="f4 " -->
-				<option value=" " SELECTED>non required value</option>
+				<option value=" " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4a" -->
-				<option value="a" SELECTED>contours</option>
+				<option value="a" selected="selected">contours</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">contours</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4b" -->
-				<option value="b" SELECTED>continuous tone shaded relief</option>
+				<option value="b" selected="selected">continuous tone shaded relief</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">continuous tone shaded relief</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4c" -->
-				<option value="c" SELECTED>hypsometric tints - layer method</option>
+				<option value="c" selected="selected">hypsometric tints - layer method</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">hypsometric tints - layer method</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4d" -->
-				<option value="d" SELECTED>hachures</option>
+				<option value="d" selected="selected">hachures</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">hachures</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4e" -->
-				<option value="e" SELECTED>bathymetry - soundings</option>
+				<option value="e" selected="selected">bathymetry - soundings</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">bathymetry - soundings</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4f" -->
-				<option value="f" SELECTED>form lines</option>
+				<option value="f" selected="selected">form lines</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">form lines</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4g" -->
-				<option value="g" SELECTED>spot heights</option>
+				<option value="g" selected="selected">spot heights</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">spot heights</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4h" -->
-				<option value="h" SELECTED>other methods in colour</option>
+				<option value="h" selected="selected">other methods in color</option>
 			<!-- TMPL_ELSE -->
-				<option value="h">other methods in colour</option>
+				<option value="h">other methods in color</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4i" -->
-				<option value="i" SELECTED>pictorially</option>
+				<option value="i" selected="selected">pictorially</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">pictorially</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4j" -->
-				<option value="j" SELECTED>landforms</option>
+				<option value="j" selected="selected">landforms</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">landforms</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4k" -->
-				<option value="k" SELECTED>bathymetry - isolines</option>
+				<option value="k" selected="selected">bathymetry - isolines</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">bathymetry - isolines</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4x" -->
-				<option value="x" SELECTED>not applicable</option>
+				<option value="x" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not applicable</option>
 			<!-- /TMPL_IF -->
@@ -148,71 +145,71 @@
 			</select>
 		</td>
 	</tr><tr>
-		<td>Relief codes 2:</td>
+		<td><label for="f5">Relief codes 2:</label></td>
 		<td>
-			<select name="f5" size="1">
+			<select name="f5" id="f5" size="1">
 			<!-- TMPL_IF name="f5 " -->
-				<option value=" " SELECTED>non required value</option>
+				<option value=" " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5a" -->
-				<option value="a" SELECTED>contours</option>
+				<option value="a" selected="selected">contours</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">contours</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5b" -->
-				<option value="b" SELECTED>continuous tone shaded relief</option>
+				<option value="b" selected="selected">continuous tone shaded relief</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">continuous tone shaded relief</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5c" -->
-				<option value="c" SELECTED>hypsometric tints - layer method</option>
+				<option value="c" selected="selected">hypsometric tints - layer method</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">hypsometric tints - layer method</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5d" -->
-				<option value="d" SELECTED>hachures</option>
+				<option value="d" selected="selected">hachures</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">hachures</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5e" -->
-				<option value="e" SELECTED>bathymetry - soundings</option>
+				<option value="e" selected="selected">bathymetry - soundings</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">bathymetry - soundings</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5f" -->
-				<option value="f" SELECTED>form lines</option>
+				<option value="f" selected="selected">form lines</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">form lines</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5g" -->
-				<option value="g" SELECTED>spot heights</option>
+				<option value="g" selected="selected">spot heights</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">spot heights</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5h" -->
-				<option value="h" SELECTED>other methods in colour</option>
+				<option value="h" selected="selected">other methods in color</option>
 			<!-- TMPL_ELSE -->
-				<option value="h">other methods in colour</option>
+				<option value="h">other methods in color</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5i" -->
-				<option value="i" SELECTED>pictorially</option>
+				<option value="i" selected="selected">pictorially</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">pictorially</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5j" -->
-				<option value="j" SELECTED>landforms</option>
+				<option value="j" selected="selected">landforms</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">landforms</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5k" -->
-				<option value="k" SELECTED>bathymetry - isolines</option>
+				<option value="k" selected="selected">bathymetry - isolines</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">bathymetry - isolines</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5x" -->
-				<option value="x" SELECTED>not applicable</option>
+				<option value="x" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not applicable</option>
 			<!-- /TMPL_IF -->
@@ -225,73 +222,73 @@
 			</select>
 		</td>
 	</tr><tr>
-		<td>Relief codes 3:</td>
+		<td><label for="f6">Relief codes 3:</label></td>
 		<td>
-			<select name="f6" size="1">
+			<select name="f6" id="f6" size="1">
                         
                         <!-- TMPL_IF name="f6 " -->
-                                <option value=" " SELECTED>non required value</option>
+                                <option value=" " selected="selected">non required value</option>
                         <!-- TMPL_ELSE -->
                                 <option value=" ">non required value</option>
                         <!-- /TMPL_IF -->
                         
 			<!-- TMPL_IF name="f6a" -->
-				<option value="a" SELECTED>contours</option>
+				<option value="a" selected="selected">contours</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">contours</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6b" -->
-				<option value="b" SELECTED>continuous tone shaded relief</option>
+				<option value="b" selected="selected">continuous tone shaded relief</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">continuous tone shaded relief</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6c" -->
-				<option value="c" SELECTED>hypsometric tints - layer method</option>
+				<option value="c" selected="selected">hypsometric tints - layer method</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">hypsometric tints - layer method</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6d" -->
-				<option value="d" SELECTED>hachures</option>
+				<option value="d" selected="selected">hachures</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">hachures</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6e" -->
-				<option value="e" SELECTED>bathymetry - soundings</option>
+				<option value="e" selected="selected">bathymetry - soundings</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">bathymetry - soundings</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6f" -->
-				<option value="f" SELECTED>form lines</option>
+				<option value="f" selected="selected">form lines</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">form lines</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6g" -->
-				<option value="g" SELECTED>spot heights</option>
+				<option value="g" selected="selected">spot heights</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">spot heights</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6h" -->
-				<option value="h" SELECTED>other methods in colour</option>
+				<option value="h" selected="selected">other methods in color</option>
 			<!-- TMPL_ELSE -->
-				<option value="h">other methods in colour</option>
+				<option value="h">other methods in color</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6i" -->
-				<option value="i" SELECTED>pictorially</option>
+				<option value="i" selected="selected">pictorially</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">pictorially</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6j" -->
-				<option value="j" SELECTED>landforms</option>
+				<option value="j" selected="selected">landforms</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">landforms</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6k" -->
-				<option value="k" SELECTED>bathymetry - isolines</option>
+				<option value="k" selected="selected">bathymetry - isolines</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">bathymetry - isolines</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6x" -->
-				<option value="x" SELECTED>not applicable</option>
+				<option value="x" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not applicable</option>
 			<!-- /TMPL_IF -->
@@ -304,72 +301,72 @@
 			</select>
 		</td>
 	</tr><tr>
-		<td>Relief codes 4:</td>
+		<td><label for="f7">Relief codes 4:</label></td>
 		<td>
-			<select name="f7" size="1">
+			<select name="f7" id="f7" size="1">
                         <!-- TMPL_IF name="f7 " -->
-                                <option value=" " SELECTED>non required value</option>
+                                <option value=" " selected="selected">non required value</option>
                         <!-- TMPL_ELSE -->
                                 <option value=" ">non required value</option>
                         <!-- /TMPL_IF -->
                         
 			<!-- TMPL_IF name="f7a" -->
-				<option value="a" SELECTED>contours</option>
+				<option value="a" selected="selected">contours</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">contours</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7b" -->
-				<option value="b" SELECTED>continuous tone shaded relief</option>
+				<option value="b" selected="selected">continuous tone shaded relief</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">continuous tone shaded relief</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7c" -->
-				<option value="c" SELECTED>hypsometric tints - layer method</option>
+				<option value="c" selected="selected">hypsometric tints - layer method</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">hypsometric tints - layer method</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7d" -->
-				<option value="d" SELECTED>hachures</option>
+				<option value="d" selected="selected">hachures</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">hachures</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7e" -->
-				<option value="e" SELECTED>bathymetry - soundings</option>
+				<option value="e" selected="selected">bathymetry - soundings</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">bathymetry - soundings</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7f" -->
-				<option value="f" SELECTED>form lines</option>
+				<option value="f" selected="selected">form lines</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">form lines</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7g" -->
-				<option value="g" SELECTED>spot heights</option>
+				<option value="g" selected="selected">spot heights</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">spot heights</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7h" -->
-				<option value="h" SELECTED>other methods in colour</option>
+				<option value="h" selected="selected">other methods in color</option>
 			<!-- TMPL_ELSE -->
-				<option value="h">other methods in colour</option>
+				<option value="h">other methods in color</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7i" -->
-				<option value="i" SELECTED>pictorially</option>
+				<option value="i" selected="selected">pictorially</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">pictorially</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7j" -->
-				<option value="j" SELECTED>landforms</option>
+				<option value="j" selected="selected">landforms</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">landforms</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7k" -->
-				<option value="k" SELECTED>bathymetry - isolines</option>
+				<option value="k" selected="selected">bathymetry - isolines</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">bathymetry - isolines</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7x" -->
-				<option value="x" SELECTED>not applicable</option>
+				<option value="x" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not applicable</option>
 			<!-- /TMPL_IF -->
@@ -382,57 +379,57 @@
 			</select>
 		</td>
 	</tr>
-	<tr>		<td>Map projection</td>
+	<tr>		<td><label for="f8">Map projection</label></td>
 		<td>
-			<select name="f8" size="1">
+			<select name="f8" id="f8" size="1">
 
 			<!-- TMPL_IF name="f8aa" -->
-				<option value="aa" SELECTED>Aitoff</option>
+				<option value="aa" selected="selected">Aitoff</option>
 			<!-- TMPL_ELSE -->
 				<option value="aa">Aitoff</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8bb" -->
-				<option value="bb" SELECTED>gnomonic</option>
+				<option value="bb" selected="selected">gnomonic</option>
 			<!-- TMPL_ELSE -->
 				<option value="bb">gnomonic</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8ac" -->
-				<option value="ac" SELECTED>Lambert's azimuthal equal area</option>
+				<option value="ac" selected="selected">Lambert's azimuthal equal area</option>
 			<!-- TMPL_ELSE -->
 				<option value="ac">Lambert's azimuthal equal area</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8ad" -->
-				<option value="ad" SELECTED>orthographic</option>
+				<option value="ad" selected="selected">orthographic</option>
 			<!-- TMPL_ELSE -->
 				<option value="ad">orthographic</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8ae" -->
-				<option value="ae" SELECTED>azimuthal equidistant</option>
+				<option value="ae" selected="selected">azimuthal equidistant</option>
 			<!-- TMPL_ELSE -->
 				<option value="ae">azimuthal equidistant</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8af" -->
-				<option value="af" SELECTED>stereographic</option>
+				<option value="af" selected="selected">stereographic</option>
 			<!-- TMPL_ELSE -->
 				<option value="af">stereographic</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8ag" -->
-				<option value="ag" SELECTED>azimuthal equal area</option>
+				<option value="ag" selected="selected">azimuthal equal area</option>
 			<!-- TMPL_ELSE -->
 				<option value="ag">azimuthal equal area</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8au" -->
-				<option value="au" SELECTED>azimuthal, specific type unknown</option>
+				<option value="au" selected="selected">azimuthal, specific type unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="au">azimuthal, specific type unknown</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8az" -->
-				<option value="az" SELECTED>azimuthal, other known specific type</option>
+				<option value="az" selected="selected">azimuthal, other known specific type</option>
 			<!-- TMPL_ELSE -->
 				<option value="az">azimuthal, other known specific type</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8ba" -->
-				<option value="ba" SELECTED>Gall</option>
+				<option value="ba" selected="selected">Gall</option>
 			<!-- TMPL_ELSE -->
 				<option value="ba">Gall</option>
 			<!-- /TMPL_IF -->
@@ -443,7 +440,7 @@
 				<option value="bb">Goode's homolographic</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8ca" -->
-				<option value="ca" SELECTED>Albers equal area</option>
+				<option value="ca" selected="selected">Albers equal area</option>
 			<!-- TMPL_ELSE -->
 				<option value="ca">Albers equal area</option>
 			<!-- /TMPL_IF -->
@@ -455,25 +452,25 @@
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8cc" -->
-				<option value="cc" SELECTED>Lambert's conformal conict</option>
+				<option value="cc" selected="selected">Lambert's conformal conict</option>
 			<!-- TMPL_ELSE -->
 				<option value="cc">Lambert's conformal conic</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8cd" -->
-				<option value="cd" SELECTED>conic (simple)</option>
+				<option value="cd" selected="selected">conic (simple)</option>
 			<!-- TMPL_ELSE -->
 				<option value="cd">conic (simple)</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8ce" -->
-				<option value="ce" SELECTED>Miller's bipolar oblique conformal conic</option>
+				<option value="ce" selected="selected">Miller's bipolar oblique conformal conic</option>
 			<!-- TMPL_ELSE -->
 				<option value="ce">Miller's bipolar oblique conformal conic</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8cf" -->
-				<option value="cf" SELECTED>De Lisle</option>
+				<option value="cf" selected="selected">De Lisle</option>
 			<!-- TMPL_ELSE -->
 				<option value="cf">De Lisle</option>
 			<!-- /TMPL_IF -->
@@ -485,102 +482,102 @@
 				<option value="cg">projection of the International Map of the World</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8ch" -->
-				<option value="ch" SELECTED>Tissot's conformal conic</option>
+				<option value="ch" selected="selected">Tissot's conformal conic</option>
 			<!-- TMPL_ELSE -->
 				<option value="ch">Tissot's conformal conic</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8cp" -->
-				<option value="cp" SELECTED>polyconic</option>
+				<option value="cp" selected="selected">polyconic</option>
 			<!-- TMPL_ELSE -->
 				<option value="cp">polyconic</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8cu" -->
-				<option value="cu" SELECTED>conic, specific type unknown</option>
+				<option value="cu" selected="selected">conic, specific type unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="cu">conic, specific type unknown</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8cz" -->
-				<option value="cz" SELECTED>conic, other known specific type</option>
+				<option value="cz" selected="selected">conic, other known specific type</option>
 			<!-- TMPL_ELSE -->
 				<option value="cz">conic, other known specific type</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8da" -->
-				<option value="da" SELECTED>armadillo</option>
+				<option value="da" selected="selected">armadillo</option>
 			<!-- TMPL_ELSE -->
 				<option value="da">armadillo</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8db" -->
-				<option value="db" SELECTED>butterfly</option>
+				<option value="db" selected="selected">butterfly</option>
 			<!-- TMPL_ELSE -->
 				<option value="db">butterfly</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8bc" -->
-				<option value="bc" SELECTED>Lambert's cylindrical equal area</option>
+				<option value="bc" selected="selected">Lambert's cylindrical equal area</option>
 			<!-- TMPL_ELSE -->
 				<option value="bc">Lambert's cylindrical equal area</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8bd" -->
-				<option value="bd" SELECTED>Mercator</option>
+				<option value="bd" selected="selected">Mercator</option>
 			<!-- TMPL_ELSE -->
 				<option value="bd">Mercator</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8be" -->
-				<option value="be" SELECTED>Miller</option>
+				<option value="be" selected="selected">Miller</option>
 			<!-- TMPL_ELSE -->
 				<option value="be">Miller</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8bf" -->
-				<option value="bf" SELECTED>Mollweide</option>
+				<option value="bf" selected="selected">Mollweide</option>
 			<!-- TMPL_ELSE -->
 				<option value="bf">Mollweide</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8bg" -->
-				<option value="bg" SELECTED>sinusoidal</option>
+				<option value="bg" selected="selected">sinusoidal</option>
 			<!-- TMPL_ELSE -->
 				<option value="bg">sinusoidal</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8bh" -->
-				<option value="bh" SELECTED>transverse Mercator</option>
+				<option value="bh" selected="selected">transverse Mercator</option>
 			<!-- TMPL_ELSE -->
 				<option value="bh">transverse Mercator</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8bi" -->
-				<option value="bi" SELECTED>Gauss</option>
+				<option value="bi" selected="selected">Gauss</option>
 			<!-- TMPL_ELSE -->
 				<option value="bi">Gauss</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8bj" -->
-				<option value="bj" SELECTED>Plate Carree</option>
+				<option value="bj" selected="selected">Plate Carree</option>
 			<!-- TMPL_ELSE -->
 				<option value="bj">Plate Carree</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8bk" -->
-				<option value="bk" SELECTED>Cassini's</option>
+				<option value="bk" selected="selected">Cassini's</option>
 			<!-- TMPL_ELSE -->
 				<option value="bk">Cassini's</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8bl" -->
-				<option value="bl" SELECTED>Laborde</option>
+				<option value="bl" selected="selected">Laborde</option>
 			<!-- TMPL_ELSE -->
 				<option value="bl">Laborde</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8bm" -->
-				<option value="bm" SELECTED>Oblique Mercator</option>
+				<option value="bm" selected="selected">Oblique Mercator</option>
 			<!-- TMPL_ELSE -->
 				<option value="bm">Oblique Mercator</option>
 			<!-- /TMPL_IF -->
@@ -600,72 +597,72 @@
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8dc" -->
-				<option value="dc" SELECTED>Eckert</option>
+				<option value="dc" selected="selected">Eckert</option>
 			<!-- TMPL_ELSE -->
 				<option value="dc">Eckert</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8dd" -->
-				<option value="dd" SELECTED>Goode's homolosine</option>
+				<option value="dd" selected="selected">Goode's homolosine</option>
 			<!-- TMPL_ELSE -->
 				<option value="dd">Goode's homolosine</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8de" -->
-				<option value="de" SELECTED>Miller's bipolar</option>
+				<option value="de" selected="selected">Miller's bipolar</option>
 			<!-- TMPL_ELSE -->
 				<option value="de">Miller's bipolar</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8df" -->
-				<option value="df" SELECTED>Van der Griten</option>
+				<option value="df" selected="selected">Van der Griten</option>
 			<!-- TMPL_ELSE -->
 				<option value="df">Van der Griten</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8dg" -->
-				<option value="dg" SELECTED>dimaxion</option>
+				<option value="dg" selected="selected">dimaxion</option>
 			<!-- TMPL_ELSE -->
 				<option value="dg">dimaxion</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8dh" -->
-				<option value="dh" SELECTED>cordiform</option>
+				<option value="dh" selected="selected">cordiform</option>
 			<!-- TMPL_ELSE -->
 				<option value="dh">cordiform</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8di" -->
-				<option value="di" SELECTED>polyhedric</option>
+				<option value="di" selected="selected">polyhedric</option>
 			<!-- TMPL_ELSE -->
 				<option value="di">polyhedric</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8uu" -->
-				<option value="uu" SELECTED>type of projection unknown</option>
+				<option value="uu" selected="selected">type of projection unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="uu">type of projection unknown</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8xx" -->
-				<option value="xx" SELECTED>not applicable</option>
+				<option value="xx" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="xx">not applicable</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8zz" -->
-				<option value="zz" SELECTED>other known type</option>
+				<option value="zz" selected="selected">other known type</option>
 			<!-- TMPL_ELSE -->
 				<option value="zz">other known type</option>
 			<!-- /TMPL_IF -->
 
 			</select>
 
-		</td></tr><tr><td>Prime meridian 1:</td>
+		</td></tr><tr><td><label for="f9">Prime meridian 1:</label></td>
 		<td>
-			<select name="f9" size="1">
+			<select name="f9" id="f9" size="1">
 			<!-- TMPL_IF name="f9  " -->
-				<option value="  " SELECTED>non required value</option>
+				<option value="  " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value="  ">non required value</option>
 			<!-- /TMPL_IF -->
@@ -677,57 +674,57 @@
 				<option value="aa">Greenwich, United Kingdom</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9ab" -->
-				<option value="ab" SELECTED>Amsterdam, Netherlands</option>
+				<option value="ab" selected="selected">Amsterdam, Netherlands</option>
 			<!-- TMPL_ELSE -->
 				<option value="ab">Amsterdam, Netherlands</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9ac" -->
-				<option value="ac" SELECTED>Athens, Greece</option>
+				<option value="ac" selected="selected">Athens, Greece</option>
 			<!-- TMPL_ELSE -->
 				<option value="ac">Athens, Greece</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9ad" -->
-				<option value="ad" SELECTED>Batavia (Djakarta), Indonesia</option>
+				<option value="ad" selected="selected">Batavia (Djakarta), Indonesia</option>
 			<!-- TMPL_ELSE -->
 				<option value="ad">Batavia (Djakarta), Indonesia</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9ae" -->
-				<option value="ae" SELECTED>Berne, Switzerland</option>
+				<option value="ae" selected="selected">Berne, Switzerland</option>
 			<!-- TMPL_ELSE -->
 				<option value="ae">Berne, Switzerland</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9af" -->
-				<option value="af" SELECTED>Bogota, Colombia</option>
+				<option value="af" selected="selected">Bogota, Colombia</option>
 			<!-- TMPL_ELSE -->
 				<option value="af">Bogota, Colombia</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9ag" -->
-				<option value="ag" SELECTED>Bombay, India</option>
+				<option value="ag" selected="selected">Bombay, India</option>
 			<!-- TMPL_ELSE -->
 				<option value="ag">Bombay, India</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9ah" -->
-				<option value="ah" SELECTED>Brussels, Belgium</option>
+				<option value="ah" selected="selected">Brussels, Belgium</option>
 			<!-- TMPL_ELSE -->
 				<option value="ah">Brussels, Belgium</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9ai" -->
-				<option value="ai" SELECTED>Cadiz, Spain</option>
+				<option value="ai" selected="selected">Cadiz, Spain</option>
 			<!-- TMPL_ELSE -->
 				<option value="ai">Cadiz, Spain</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9aj" -->
-				<option value="aj" SELECTED>Capetown, South Africa</option>
+				<option value="aj" selected="selected">Capetown, South Africa</option>
 			<!-- TMPL_ELSE -->
 				<option value="aj">Capetown, South Africa</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9ak" -->
-				<option value="ak" SELECTED>Caracas, Venezuela</option>
+				<option value="ak" selected="selected">Caracas, Venezuela</option>
 			<!-- TMPL_ELSE -->
 				<option value="ak">Caracas, Venezuela</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9al" -->
-				<option value="al" SELECTED>Copenhagen, Denmark</option>
+				<option value="al" selected="selected">Copenhagen, Denmark</option>
 			<!-- TMPL_ELSE -->
 				<option value="al">Copenhagen, Denmark</option>
 			<!-- /TMPL_IF -->
@@ -738,19 +735,19 @@
 				<option value="am">Cordoba, Argentina</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9an" -->
-				<option value="an" SELECTED>Ferro, Canary Islands</option>
+				<option value="an" selected="selected">Ferro, Canary Islands</option>
 			<!-- TMPL_ELSE -->
 				<option value="an">Ferro, Canary Islands</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9ao" -->
-				<option value="ao" SELECTED>Helsinki, Finland</option>
+				<option value="ao" selected="selected">Helsinki, Finland</option>
 			<!-- TMPL_ELSE -->
 				<option value="ao">Helsinki, Finland</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9ap" -->
-				<option value="ap" SELECTED>Istanbul, Turkey</option>
+				<option value="ap" selected="selected">Istanbul, Turkey</option>
 			<!-- TMPL_ELSE -->
 				<option value="ap">Istanbul, Turkey</option>
 			<!-- /TMPL_IF -->
@@ -762,65 +759,65 @@
 				<option value="aq">Julianehaab, Greenland</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9ar" -->
-				<option value="ar" SELECTED>Lisbon, Portugal</option>
+				<option value="ar" selected="selected">Lisbon, Portugal</option>
 			<!-- TMPL_ELSE -->
 				<option value="ar">Lisbon, Portugal</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9as" -->
-				<option value="as" SELECTED>London, United Kingdom</option>
+				<option value="as" selected="selected">London, United Kingdom</option>
 			<!-- TMPL_ELSE -->
 				<option value="as">London, United Kingdom</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9at" -->
-				<option value="at" SELECTED>Madras, India</option>
+				<option value="at" selected="selected">Madras, India</option>
 			<!-- TMPL_ELSE -->
 				<option value="at">Madras, India</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9ba" -->
-				<option value="ba" SELECTED>Madrid, Spain</option>
+				<option value="ba" selected="selected">Madrid, Spain</option>
 			<!-- TMPL_ELSE -->
 				<option value="ba">Madrid, Spain</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9bb" -->
-				<option value="bb" SELECTED>Mexico City, Mexico</option>
+				<option value="bb" selected="selected">Mexico City, Mexico</option>
 			<!-- TMPL_ELSE -->
 				<option value="bb">Mexico City, Mexico</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9bc" -->
-				<option value="bc" SELECTED>Moscow, Russia</option>
+				<option value="bc" selected="selected">Moscow, Russia</option>
 			<!-- TMPL_ELSE -->
 				<option value="bc">Moscow, Russia</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9bd" -->
-				<option value="bd" SELECTED>Munich, Germany</option>
+				<option value="bd" selected="selected">Munich, Germany</option>
 			<!-- TMPL_ELSE -->
 				<option value="bd">Munich, Germany</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9be" -->
-				<option value="be" SELECTED>Naples, Italy</option>
+				<option value="be" selected="selected">Naples, Italy</option>
 			<!-- TMPL_ELSE -->
 				<option value="be">Naples, Italy</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9bf" -->
-				<option value="bf" SELECTED>Oslo (Christiania), Norway</option>
+				<option value="bf" selected="selected">Oslo (Christiania), Norway</option>
 			<!-- TMPL_ELSE -->
 				<option value="bf">Oslo (Christiania), Norway</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9bg" -->
-				<option value="bg" SELECTED>Paris, France</option>
+				<option value="bg" selected="selected">Paris, France</option>
 			<!-- TMPL_ELSE -->
 				<option value="bg">Paris, France</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9bh" -->
-				<option value="bh" SELECTED>Peking, People's Republic of China</option>
+				<option value="bh" selected="selected">Peking, People's Republic of China</option>
 			<!-- TMPL_ELSE -->
 				<option value="bh">Peking, People's Republic of China</option>
 			<!-- /TMPL_IF -->
@@ -833,79 +830,79 @@
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9bj" -->
-				<option value="bj" SELECTED>Pulkova (Leningrad), Russia</option>
+				<option value="bj" selected="selected">Pulkova (Leningrad), Russia</option>
 			<!-- TMPL_ELSE -->
 				<option value="bj">Pulkova (Leningrad), Russia</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9bk" -->
-				<option value="bk" SELECTED>Rio de Janeiro, Brazil</option>
+				<option value="bk" selected="selected">Rio de Janeiro, Brazil</option>
 			<!-- TMPL_ELSE -->
 				<option value="bk">Rio de Janeiro, Brazil</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9bl" -->
-				<option value="bl" SELECTED>Rome, Italy</option>
+				<option value="bl" selected="selected">Rome, Italy</option>
 			<!-- TMPL_ELSE -->
 				<option value="bl">Rome, Italy</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9bm" -->
-				<option value="bm" SELECTED>Santiago, Chile</option>
+				<option value="bm" selected="selected">Santiago, Chile</option>
 			<!-- TMPL_ELSE -->
 				<option value="bm">Santiago, Chile</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9bn" -->
-				<option value="bn" SELECTED>Stockholm, Sweden</option>
+				<option value="bn" selected="selected">Stockholm, Sweden</option>
 			<!-- TMPL_ELSE -->
 				<option value="bn">Stockholm, Sweden</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9bo" -->
-				<option value="bo" SELECTED>Sydney, Australia</option>
+				<option value="bo" selected="selected">Sydney, Australia</option>
 			<!-- TMPL_ELSE -->
 				<option value="bo">Sydney, Australia</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9bp" -->
-				<option value="bp" SELECTED>Tirana, Albania</option>
+				<option value="bp" selected="selected">Tirana, Albania</option>
 			<!-- TMPL_ELSE -->
 				<option value="bp">Tirana, Albania</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9bq" -->
-				<option value="bq" SELECTED>Tokyo, Japan</option>
+				<option value="bq" selected="selected">Tokyo, Japan</option>
 			<!-- TMPL_ELSE -->
 				<option value="bq">Tokyo, Japan</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9br" -->
-				<option value="br" SELECTED>Washington, DC, USA</option>
+				<option value="br" selected="selected">Washington, DC, USA</option>
 			<!-- TMPL_ELSE -->
 				<option value="br">Washington, DC, USA</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9uu" -->
-				<option value="uu" SELECTED>unknown</option>
+				<option value="uu" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="uu">unknown</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9zz" -->
-				<option value="zz" SELECTED>other</option>
+				<option value="zz" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="zz">other</option>
 			<!-- /TMPL_IF -->
 
 			</select>
 
-		</td></tr><tr>		<td>Prime meridian 2:</td>
+		</td></tr><tr>		<td><label for="f10">Prime meridian 2:</label></td>
 		<td>
-			<select name="f10" size="1">
+			<select name="f10" id="f10" size="1">
             
 			<!-- TMPL_IF name="f10  " -->
-				<option value="  " SELECTED>non required value</option>
+				<option value="  " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">non required value</option>
 			<!-- /TMPL_IF -->
@@ -917,57 +914,57 @@
 				<option value="aa">Greenwich, United Kingdom</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ab" -->
-				<option value="ab" SELECTED>Amsterdam, Netherlands</option>
+				<option value="ab" selected="selected">Amsterdam, Netherlands</option>
 			<!-- TMPL_ELSE -->
 				<option value="ab">Amsterdam, Netherlands</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ac" -->
-				<option value="ac" SELECTED>Athens, Greece</option>
+				<option value="ac" selected="selected">Athens, Greece</option>
 			<!-- TMPL_ELSE -->
 				<option value="ac">Athens, Greece</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ad" -->
-				<option value="ad" SELECTED>Batavia (Djakarta), Indonesia</option>
+				<option value="ad" selected="selected">Batavia (Djakarta), Indonesia</option>
 			<!-- TMPL_ELSE -->
 				<option value="ad">Batavia (Djakarta), Indonesia</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ae" -->
-				<option value="ae" SELECTED>Berne, Switzerland</option>
+				<option value="ae" selected="selected">Berne, Switzerland</option>
 			<!-- TMPL_ELSE -->
 				<option value="ae">Berne, Switzerland</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10af" -->
-				<option value="af" SELECTED>Bogota, Colombia</option>
+				<option value="af" selected="selected">Bogota, Colombia</option>
 			<!-- TMPL_ELSE -->
 				<option value="af">Bogota, Colombia</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ag" -->
-				<option value="ag" SELECTED>Bombay, India</option>
+				<option value="ag" selected="selected">Bombay, India</option>
 			<!-- TMPL_ELSE -->
 				<option value="ag">Bombay, India</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ah" -->
-				<option value="ah" SELECTED>Brussels, Belgium</option>
+				<option value="ah" selected="selected">Brussels, Belgium</option>
 			<!-- TMPL_ELSE -->
 				<option value="ah">Brussels, Belgium</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ai" -->
-				<option value="ai" SELECTED>Cadiz, Spain</option>
+				<option value="ai" selected="selected">Cadiz, Spain</option>
 			<!-- TMPL_ELSE -->
 				<option value="ai">Cadiz, Spain</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10aj" -->
-				<option value="aj" SELECTED>Capetown, South Africa</option>
+				<option value="aj" selected="selected">Capetown, South Africa</option>
 			<!-- TMPL_ELSE -->
 				<option value="aj">Capetown, South Africa</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ak" -->
-				<option value="ak" SELECTED>Caracas, Venezuela</option>
+				<option value="ak" selected="selected">Caracas, Venezuela</option>
 			<!-- TMPL_ELSE -->
 				<option value="ak">Caracas, Venezuela</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10al" -->
-				<option value="al" SELECTED>Copenhagen, Denmark</option>
+				<option value="al" selected="selected">Copenhagen, Denmark</option>
 			<!-- TMPL_ELSE -->
 				<option value="al">Copenhagen, Denmark</option>
 			<!-- /TMPL_IF -->
@@ -978,19 +975,19 @@
 				<option value="am">Cordoba, Argentina</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10an" -->
-				<option value="an" SELECTED>Ferro, Canary Islands</option>
+				<option value="an" selected="selected">Ferro, Canary Islands</option>
 			<!-- TMPL_ELSE -->
 				<option value="an">Ferro, Canary Islands</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10ao" -->
-				<option value="ao" SELECTED>Helsinki, Finland</option>
+				<option value="ao" selected="selected">Helsinki, Finland</option>
 			<!-- TMPL_ELSE -->
 				<option value="ao">Helsinki, Finland</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10ap" -->
-				<option value="ap" SELECTED>Istanbul, Turkey</option>
+				<option value="ap" selected="selected">Istanbul, Turkey</option>
 			<!-- TMPL_ELSE -->
 				<option value="ap">Istanbul, Turkey</option>
 			<!-- /TMPL_IF -->
@@ -1002,65 +999,65 @@
 				<option value="aq">Julianehaab, Greenland</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ar" -->
-				<option value="ar" SELECTED>Lisbon, Portugal</option>
+				<option value="ar" selected="selected">Lisbon, Portugal</option>
 			<!-- TMPL_ELSE -->
 				<option value="ar">Lisbon, Portugal</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10as" -->
-				<option value="as" SELECTED>London, United Kingdom</option>
+				<option value="as" selected="selected">London, United Kingdom</option>
 			<!-- TMPL_ELSE -->
 				<option value="as">London, United Kingdom</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10at" -->
-				<option value="at" SELECTED>Madras, India</option>
+				<option value="at" selected="selected">Madras, India</option>
 			<!-- TMPL_ELSE -->
 				<option value="at">Madras, India</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10ba" -->
-				<option value="ba" SELECTED>Madrid, Spain</option>
+				<option value="ba" selected="selected">Madrid, Spain</option>
 			<!-- TMPL_ELSE -->
 				<option value="ba">Madrid, Spain</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10bb" -->
-				<option value="bb" SELECTED>Mexico City, Mexico</option>
+				<option value="bb" selected="selected">Mexico City, Mexico</option>
 			<!-- TMPL_ELSE -->
 				<option value="bb">Mexico City, Mexico</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10bc" -->
-				<option value="bc" SELECTED>Moscow, Russia</option>
+				<option value="bc" selected="selected">Moscow, Russia</option>
 			<!-- TMPL_ELSE -->
 				<option value="bc">Moscow, Russia</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10bd" -->
-				<option value="bd" SELECTED>Munich, Germany</option>
+				<option value="bd" selected="selected">Munich, Germany</option>
 			<!-- TMPL_ELSE -->
 				<option value="bd">Munich, Germany</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10be" -->
-				<option value="be" SELECTED>Naples, Italy</option>
+				<option value="be" selected="selected">Naples, Italy</option>
 			<!-- TMPL_ELSE -->
 				<option value="be">Naples, Italy</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10bf" -->
-				<option value="bf" SELECTED>Oslo (Christiania), Norway</option>
+				<option value="bf" selected="selected">Oslo (Christiania), Norway</option>
 			<!-- TMPL_ELSE -->
 				<option value="bf">Oslo (Christiania), Norway</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10bg" -->
-				<option value="bg" SELECTED>Paris, France</option>
+				<option value="bg" selected="selected">Paris, France</option>
 			<!-- TMPL_ELSE -->
 				<option value="bg">Paris, France</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10bh" -->
-				<option value="bh" SELECTED>Peking, People's Republic of China</option>
+				<option value="bh" selected="selected">Peking, People's Republic of China</option>
 			<!-- TMPL_ELSE -->
 				<option value="bh">Peking, People's Republic of China</option>
 			<!-- /TMPL_IF -->
@@ -1073,77 +1070,77 @@
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10bj" -->
-				<option value="bj" SELECTED>Pulkova (Leningrad), Russia</option>
+				<option value="bj" selected="selected">Pulkova (Leningrad), Russia</option>
 			<!-- TMPL_ELSE -->
 				<option value="bj">Pulkova (Leningrad), Russia</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10bk" -->
-				<option value="bk" SELECTED>Rio de Janeiro, Brazil</option>
+				<option value="bk" selected="selected">Rio de Janeiro, Brazil</option>
 			<!-- TMPL_ELSE -->
 				<option value="bk">Rio de Janeiro, Brazil</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10bl" -->
-				<option value="bl" SELECTED>Rome, Italy</option>
+				<option value="bl" selected="selected">Rome, Italy</option>
 			<!-- TMPL_ELSE -->
 				<option value="bl">Rome, Italy</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10bm" -->
-				<option value="bm" SELECTED>Santiago, Chile</option>
+				<option value="bm" selected="selected">Santiago, Chile</option>
 			<!-- TMPL_ELSE -->
 				<option value="bm">Santiago, Chile</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10bn" -->
-				<option value="bn" SELECTED>Stockholm, Sweden</option>
+				<option value="bn" selected="selected">Stockholm, Sweden</option>
 			<!-- TMPL_ELSE -->
 				<option value="bn">Stockholm, Sweden</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10bo" -->
-				<option value="bo" SELECTED>Sydney, Australia</option>
+				<option value="bo" selected="selected">Sydney, Australia</option>
 			<!-- TMPL_ELSE -->
 				<option value="bo">Sydney, Australia</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10bp" -->
-				<option value="bp" SELECTED>Tirana, Albania</option>
+				<option value="bp" selected="selected">Tirana, Albania</option>
 			<!-- TMPL_ELSE -->
 				<option value="bp">Tirana, Albania</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10bq" -->
-				<option value="bq" SELECTED>Tokyo, Japan</option>
+				<option value="bq" selected="selected">Tokyo, Japan</option>
 			<!-- TMPL_ELSE -->
 				<option value="bq">Tokyo, Japan</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10br" -->
-				<option value="br" SELECTED>Washington, DC, USA</option>
+				<option value="br" selected="selected">Washington, DC, USA</option>
 			<!-- TMPL_ELSE -->
 				<option value="br">Washington, DC, USA</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10uu" -->
-				<option value="uu" SELECTED>unknown</option>
+				<option value="uu" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="uu">unknown</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10zz" -->
-				<option value="zz" SELECTED>other</option>
+				<option value="zz" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="zz">other</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
-
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
+//<![CDATA[
 	function report() {
 	    var doc   = opener.document; 
             var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
@@ -1151,6 +1148,7 @@
 	    self.close();
 	    return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_121a.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_121a.tmpl
index aa27595..40f62f7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_121a.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_121a.tmpl
@@ -1,293 +1,294 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 121a builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 121a builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 121a builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Physical dimension</td>
+		<td><label for="f1">Physical dimension</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
 
 			<!-- TMPL_IF name="f1a" -->
-				<option value="a" SELECTED>2-dimensional</option>
+				<option value="a" selected="selected">2-dimensional</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">2-dimensional</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1b" -->
-				<option value="b" SELECTED>2-dimensional</option>
+				<option value="b" selected="selected">2-dimensional</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">2-dimensional</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr><tr>
-		<td>Primary cartographic image 1:</td>
+		<td><label for="f2">Primary cartographic image 1:</label></td>
 		<td>
-			<select name="f2" size="1">
+			<select name="f2" id="f2" size="1">
             
 			<!-- TMPL_IF name="f2 " -->
-				<option value=" " SELECTED>non required value</option>
+				<option value=" " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2a" -->
-				<option value="a" SELECTED>manually and plotted</option>
+				<option value="a" selected="selected">manually and plotted</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">manually and plotted</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2b" -->
-				<option value="b" SELECTED>photographically</option>
+				<option value="b" selected="selected">photographically</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">photographically</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2c" -->
-				<option value="c" SELECTED>by computer</option>
+				<option value="c" selected="selected">by computer</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">by computer</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2d" -->
-				<option value="d" SELECTED>by active remote sensing techniqu</option>
+				<option value="d" selected="selected">by active remote sensing techniqu</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">by active remote sensing techniqu</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2e" -->
-				<option value="e" SELECTED>by passive remote sensing techniques</option>
+				<option value="e" selected="selected">by passive remote sensing techniques</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">by passive remote sensing techniques</option>
 			<!-- /TMPL_IF -->
 			</select>
-		</td><td>Primary cartographic image 2:</td>
+		</td>
+		</tr>
+		<tr>
+		<td><label for="f3">Primary cartographic image 2:</label></td>
 		<td>
-			<select name="f3" size="1">
+			<select name="f3" id="f3" size="1">
                         <!-- TMPL_IF name="f3 " -->
-                                <option value=" " SELECTED>non required value</option>
+                                <option value=" " selected="selected">non required value</option>
                         <!-- TMPL_ELSE -->
                                 <option value=" ">non required value</option>
                         <!-- /TMPL_IF -->
                         
 			<!-- TMPL_IF name="f3a" -->
-				<option value="a" SELECTED>manually and plotted</option>
+				<option value="a" selected="selected">manually and plotted</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">manually and plotted</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3b" -->
-				<option value="b" SELECTED>photographically</option>
+				<option value="b" selected="selected">photographically</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">photographically</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3c" -->
-				<option value="c" SELECTED>by computer</option>
+				<option value="c" selected="selected">by computer</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">by computer</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3d" -->
-				<option value="d" SELECTED>by active remote sensing techniques</option>
+				<option value="d" selected="selected">by active remote sensing techniques</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">by active remote sensing techniques</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3e" -->
-				<option value="e" SELECTED>by passive remote sensing techniques</option>
+				<option value="e" selected="selected">by passive remote sensing techniques</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">by passive remote sensing techniques</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr><tr>
-		<td>Physical medium</td>
+		<td><label for="f4">Physical medium</label></td>
 		<td>
-			<select name="f4" size="1">
+			<select name="f4" id="f4" size="1">
 			<!-- TMPL_IF name="f4aa" -->
-				<option value="aa" SELECTED>paper</option>
+				<option value="aa" selected="selected">paper</option>
 			<!-- TMPL_ELSE -->
 				<option value="aa">paper</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4ab" -->
-				<option value="ab" SELECTED>wood</option>
+				<option value="ab" selected="selected">wood</option>
 			<!-- TMPL_ELSE -->
 				<option value="ab">wood</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4ac" -->
-				<option value="ac" SELECTED>stone</option>
+				<option value="ac" selected="selected">stone</option>
 			<!-- TMPL_ELSE -->
 				<option value="ac">stone</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4ad" -->
-				<option value="ad" SELECTED>metal</option>
+				<option value="ad" selected="selected">metal</option>
 			<!-- TMPL_ELSE -->
 				<option value="ad">metal</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4ae" -->
-				<option value="ae" SELECTED>synthetics (e.g. plastics, vinyl)</option>
+				<option value="ae" selected="selected">synthetics (e.g. plastics, vinyl)</option>
 			<!-- TMPL_ELSE -->
 				<option value="ae">synthetics (e.g. plastics, vinyl)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4af" -->
-				<option value="af" SELECTED>skin (e.g. parchment, vellum)</option>
+				<option value="af" selected="selected">skin (e.g. parchment, vellum)</option>
 			<!-- TMPL_ELSE -->
 				<option value="af">skin (e.g. parchment, vellum)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4ag" -->
-				<option value="ag" SELECTED>     textile including manmade fibre textiles (e.g. silk, cloth, nylon)</option>
+				<option value="ag" selected="selected">     textile including manmade fibre textiles (e.g. silk, cloth, nylon)</option>
 			<!-- TMPL_ELSE -->
 				<option value="ag">     textile including manmade fibre textiles (e.g. silk, cloth, nylon)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4ah" -->
-				<option value="ah" SELECTED>magnetic storage medium - computer compatible</option>
+				<option value="ah" selected="selected">magnetic storage medium - computer compatible</option>
 			<!-- TMPL_ELSE -->
 				<option value="ah">magnetic storage medium - computer compatible</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4ai" -->
-				<option value="ai" SELECTED>magnetic storage medium - not computer compatible</option>
+				<option value="ai" selected="selected">magnetic storage medium - not computer compatible</option>
 			<!-- TMPL_ELSE -->
 				<option value="ai">magnetic storage medium - not computer compatible</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4aj" -->
-				<option value="aj" SELECTED>tracing paper</option>
+				<option value="aj" selected="selected">tracing paper</option>
 			<!-- TMPL_ELSE -->
 				<option value="aj">tracing paper</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4ak" -->
-				<option value="ak" SELECTED>cardboard</option>
+				<option value="ak" selected="selected">cardboard</option>
 			<!-- TMPL_ELSE -->
 				<option value="ak">cardboard</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4ap" -->
-				<option value="ap" SELECTED>plaster</option>
+				<option value="ap" selected="selected">plaster</option>
 			<!-- TMPL_ELSE -->
 				<option value="ap">plaster</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4au" -->
-				<option value="au" SELECTED>unknown</option>
+				<option value="au" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="au">unknown</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4az" -->
-				<option value="az" SELECTED>other non photographic medium</option>
+				<option value="az" selected="selected">other non photographic medium</option>
 			<!-- TMPL_ELSE -->
 				<option value="az">other non photographic medium</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4ba" -->
-				<option value="ba" SELECTED> transparent or opaque flexible base positive</option>
+				<option value="ba" selected="selected"> transparent or opaque flexible base positive</option>
 			<!-- TMPL_ELSE -->
 				<option value="ba"> transparent or opaque flexible base positive</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4bb" -->
-				<option value="bb" SELECTED>transparent or opaque flexible base negative</option>
+				<option value="bb" selected="selected">transparent or opaque flexible base negative</option>
 			<!-- TMPL_ELSE -->
 				<option value="bb">transparent or opaque flexible base negative</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4bc" -->
-				<option value="bc" SELECTED>transparent or opaque non-flexible base positive</option>
+				<option value="bc" selected="selected">transparent or opaque non-flexible base positive</option>
 			<!-- TMPL_ELSE -->
 				<option value="bc">transparent or opaque non-flexible base positive</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4bd" -->
-				<option value="bd" SELECTED>transparent or opaque non-flexible base negative</option>
+				<option value="bd" selected="selected">transparent or opaque non-flexible base negative</option>
 			<!-- TMPL_ELSE -->
 				<option value="bd">transparent or opaque non-flexible base negative</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4bz" -->
-				<option value="bz" SELECTED>other photographic medium</option>
+				<option value="bz" selected="selected">other photographic medium</option>
 			<!-- TMPL_ELSE -->
 				<option value="bz">other photographic medium</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr><tr>
-		<td>Creation technique</td>
+		<td><label for="f5">Creation technique</label></td>
 		<td>
-			<select name="f5" size="1">
+			<select name="f5" id="f5" size="1">
 			<!-- TMPL_IF name="f5a" -->
-				<option value="a" SELECTED>manuscript</option>
+				<option value="a" selected="selected">manuscript</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">manuscript</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5b" -->
-				<option value="b" SELECTED>printing</option>
+				<option value="b" selected="selected">printing</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">printing</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5c" -->
-				<option value="c" SELECTED>photocopying</option>
+				<option value="c" selected="selected">photocopying</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">photocopying</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5d" -->
-				<option value="d" SELECTED>microphotography</option>
+				<option value="d" selected="selected">microphotography</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">microphotography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5y" -->
-				<option value="y" SELECTED>the cartographic item is not a final produc</option>
+				<option value="y" selected="selected">the cartographic item is not a final produc</option>
 			<!-- TMPL_ELSE -->
 				<option value="y">the cartographic item is not a final produc</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td>
 	</tr><tr>
-		<td>Form of reproduction</td>
+		<td><label for="f6">Form of reproduction</label></td>
 		<td>
-			<select name="f6" size="1">
+			<select name="f6" id="f6" size="1">
 			<!-- TMPL_IF name="f6a" -->
-				<option value="a" SELECTED>by hand</option>
+				<option value="a" selected="selected">by hand</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">by hand</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6b" -->
-				<option value="b" SELECTED>printed</option>
+				<option value="b" selected="selected">printed</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">printed</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6c" -->
-				<option value="c" SELECTED>photography</option>
+				<option value="c" selected="selected">photography</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">photography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6d" -->
-				<option value="d" SELECTED>transfer line print</option>
+				<option value="d" selected="selected">transfer line print</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">transfer line print</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6y" -->
-				<option value="y" SELECTED>not a reproduction</option>
+				<option value="y" selected="selected">not a reproduction</option>
 			<!-- TMPL_ELSE -->
 				<option value="y">not a reproduction</option>
 			<!-- /TMPL_IF -->
+			</select>
 		</td>
 	</tr><tr>
-		<td>Geodetic adjustment</td>
+		<td><label for="f7">Geodetic adjustment</label></td>
 		<td>
-			<select name="f7" size="1">
+			<select name="f7" id="f7" size="1">
 			<!-- TMPL_IF name="f7a" -->
-				<option value="a" SELECTED>a- no adjustment</option>
+				<option value="a" selected="selected">a- no adjustment</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">a- no adjustment</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7b" -->
-				<option value="b" SELECTED>b- adjusted but without grid system</option>
+				<option value="b" selected="selected">b- adjusted but without grid system</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">b- adjusted but without grid system</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7c" -->
-				<option value="c" SELECTED>c- adjusted with grid system</option>
+				<option value="c" selected="selected">c- adjusted with grid system</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">c- adjusted with grid system</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7x" -->
-				<option value="x" SELECTED>x- not applicable</option>
+				<option value="x" selected="selected">x- not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">x- not applicable</option>
 			<!-- /TMPL_IF -->
@@ -295,46 +296,47 @@
 		</td>
 	</tr>
 <tr>
-		<td>Physical form of publication</td>
+		<td><label for="f8">Physical form of publication</label></td>
 		<td>
-			<select name="f8" size="1">
+			<select name="f8" id="f8" size="1">
 			<!-- TMPL_IF name="f8a" -->
-				<option value="a" SELECTED>single</option>
+				<option value="a" selected="selected">single</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">single</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8b" -->
-				<option value="b" SELECTED>in parts</option>
+				<option value="b" selected="selected">in parts</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">in parts</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8c" -->
-				<option value="c" SELECTED>atlas including loose-leaf published atlas</option>
+				<option value="c" selected="selected">atlas including loose-leaf published atlas</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">atlas including loose-leaf published atlas</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8d" -->
-				<option value="d" SELECTED>as a separate supplement to a journal, monograph, etc.</option>
+				<option value="d" selected="selected">as a separate supplement to a journal, monograph, etc.</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">as a separate supplement to a journal, monograph, etc.</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8e" -->
-				<option value="e" SELECTED>bound into a journal, monograph, etc.</option>
+				<option value="e" selected="selected">bound into a journal, monograph, etc.</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">bound into a journal, monograph, etc.</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td>
 	</tr>
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
-<script>
+<script type="text/javascript">
+//<![CDATA[
 	function report() {
 
             var doc   = opener.document; 
@@ -344,6 +346,7 @@
 		self.close();
 		return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_121b.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_121b.tmpl
index 54bd4d4..b5e51d0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_121b.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_121b.tmpl
@@ -1,253 +1,251 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 121b builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 121b builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 121b builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Altitude of Sensor</td>
+		<td><label for="f1">Altitude of Sensor</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
 			<!-- TMPL_IF name="f1a" -->
-				<option value="a" SELECTED>terrestrial</option>
+				<option value="a" selected="selected">terrestrial</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">terrestrial</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1b" -->
-				<option value="b" SELECTED>aerial</option>
+				<option value="b" selected="selected">aerial</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">aerial</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1c" -->
-				<option value="c" SELECTED>space</option>
+				<option value="c" selected="selected">space</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">space</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr><tr>
-		<td>Attitude of sensor</td>
+		<td><label for="f2">Attitude of sensor</label></td>
 		<td>
-			<select name="f2" size="1">
+			<select name="f2" id="f2" size="1">
                         
 			<!-- TMPL_IF name="f2a" -->
-				<option value="a" SELECTED>low oblique</option>
+				<option value="a" selected="selected">low oblique</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">low oblique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2b" -->
-				<option value="b" SELECTED>high oblique</option>
+				<option value="b" selected="selected">high oblique</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">high oblique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2c" -->
-				<option value="c" SELECTED>vertical</option>
+				<option value="c" selected="selected">vertical</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">vertical</option>
 			<!-- /TMPL_IF -->
-		</td></tr><tr>		<td>Spectral bands : 01 to 99 = number of bands, xx = not applicable</td>
-		   <td><input type="text" name="f3" maxlength=2 size=3
-		   value="<!-- TMPL_VAR name="f3" -->">
+			</select>
+		</td></tr>
+		<tr>		<td><label for="f3">Spectral bands : 01 to 99 = number of bands, xx = not applicable</label></td>
+		   <td><input type="text" name="f3" id="f3" maxlength="2" size="3" value="<!-- TMPL_VAR name="f3" -->" />
 		</td></tr>
 <tr>
-		<td>Quality of image</td>
+		<td><label for="f4">Quality of image</label></td>
 		<td>
-			<select name="f4" size="1">
+			<select name="f4" id="f4" size="1">
 			
 			<!-- TMPL_IF name="f4a" -->
-				<option value="a" SELECTED>poor</option>
+				<option value="a" selected="selected">poor</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">poor</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4b" -->
-				<option value="b" SELECTED>fair</option>
+				<option value="b" selected="selected">fair</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">fair</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4c" -->
-				<option value="c" SELECTED>good</option>
+				<option value="c" selected="selected">good</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">good</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4d" -->
-				<option value="d" SELECTED>very good</option>
+				<option value="d" selected="selected">very good</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">very good</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr><tr>
-		<td>Cloud cover</td>
+		<td><label for="f5">Cloud cover</label></td>
 		<td>
-			<select name="f5" size="1">
+			<select name="f5" id="f5" size="1">
 
-			<!-- TMPL_IF name="f51" -->
-				<option value="1" SELECTED>1/8</option>
+			<!-- TMPL_IF name="f51" id="f51" -->
+				<option value="1" selected="selected">1/8</option>
 			<!-- TMPL_ELSE -->
 				<option value="1">1/8</option>
 			<!-- /TMPL_IF -->
-			<!-- TMPL_IF name="f52" -->
-				<option value="2" SELECTED>2/8</option>
+			<!-- TMPL_IF name="f52" id="f52" -->
+				<option value="2" selected="selected">2/8</option>
 			<!-- TMPL_ELSE -->
 				<option value="2">2/8</option>
 			<!-- /TMPL_IF -->
-			<!-- TMPL_IF name="f53" -->
-				<option value="3" SELECTED>3/8</option>
+			<!-- TMPL_IF name="f53" id="f53" -->
+				<option value="3" selected="selected">3/8</option>
 			<!-- TMPL_ELSE -->
 				<option value="3">3/8</option>
 			<!-- /TMPL_IF -->
-			<!-- TMPL_IF name="f54" -->
-				<option value="4" SELECTED>4/8</option>
+			<!-- TMPL_IF name="f54" id="f54" -->
+				<option value="4" selected="selected">4/8</option>
 			<!-- TMPL_ELSE -->
 				<option value="4">4/8</option>
 			<!-- /TMPL_IF -->
-			<!-- TMPL_IF name="f55" -->
-				<option value="5" SELECTED>5/8</option>
+			<!-- TMPL_IF name="f55" id="f55" -->
+				<option value="5" selected="selected">5/8</option>
 			<!-- TMPL_ELSE -->
 				<option value="5">5/8</option>
 			<!-- /TMPL_IF -->
-			<!-- TMPL_IF name="f56" -->
-				<option value="6" SELECTED>6/8</option>
+			<!-- TMPL_IF name="f56" id="f56" -->
+				<option value="6" selected="selected">6/8</option>
 			<!-- TMPL_ELSE -->
 				<option value="6">6/8</option>
 			<!-- /TMPL_IF -->
-			<!-- TMPL_IF name="f57" -->
-				<option value="7" SELECTED>7/8</option>
+			<!-- TMPL_IF name="f57" id="f57" -->
+				<option value="7" selected="selected">7/8</option>
 			<!-- TMPL_ELSE -->
 				<option value="7">7/8</option>
 			<!-- /TMPL_IF -->
-			<!-- TMPL_IF name="f58" -->
-				<option value="8" SELECTED>completely covered by clouds</option>
+			<!-- TMPL_IF name="f58" id="f58" -->
+				<option value="8" selected="selected">completely covered by clouds</option>
 			<!-- TMPL_ELSE -->
 				<option value="8">completely covered by clouds</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr><tr>
 
-		       <td>Mean value of ground resolution</td>
+		       <td><label for="f6">Mean value of ground resolution</label></td>
                 <td>
-                        <select name="f6" size="1">
+                        <select name="f6" id="f6" size="1">
                         <!-- TMPL_IF name="f6-" -->
-                                <option value="-" SELECTED>less than 1 centimetre</option>
+                                <option value="-" selected="selected">less than 1 centimetre</option>
                         <!-- TMPL_ELSE -->
                                 <option value="-">less than 1 centimetre</option>
                         <!-- /TMPL_IF -->
                         
-                        <!-- TMPL_IF name="f61" -->
-                                <option value="1" SELECTED>1</option>
+                        <!-- TMPL_IF name="f61" id="f61" -->
+                                <option value="1" selected="selected">1</option>
                         <!-- TMPL_ELSE -->
                                 <option value="1">1</option>
                         <!-- /TMPL_IF -->
-                        <!-- TMPL_IF name="f62" -->
+                        <!-- TMPL_IF name="f62" id="f62" -->
                                 <option value="2"
-                SELECTED>1</option>
+                selected="selected">1</option>
                         <!-- TMPL_ELSE -->
                                 <option value="2">2</option>
                         <!-- /TMPL_IF -->
-                        <!-- TMPL_IF name="f63" -->
+                        <!-- TMPL_IF name="f63" id="f63" -->
                                 <option value="3"
-                SELECTED>1</option>
+                selected="selected">1</option>
                         <!-- TMPL_ELSE -->
                                 <option value="3">3</option>
                         <!-- /TMPL_IF -->
-                        <!-- TMPL_IF name="f64" -->
+                        <!-- TMPL_IF name="f64" id="f64" -->
                                 <option value="4"
-                SELECTED>1</option>
+                selected="selected">1</option>
                         <!-- TMPL_ELSE -->
                                 <option value="4">4</option>
                         <!-- /TMPL_IF -->
-                        <!-- TMPL_IF name="f51" -->
+                        <!-- TMPL_IF name="f51" id="f51" -->
                                 <option value="5"
-                SELECTED>1</option>
+                selected="selected">1</option>
                         <!-- TMPL_ELSE -->
                                 <option value="5">5</option>
                         <!-- /TMPL_IF -->
-                        <!-- TMPL_IF name="f66" -->
+                        <!-- TMPL_IF name="f66" id="f66" -->
                                 <option value="6"
-                SELECTED>1</option>
+                selected="selected">1</option>
                         <!-- TMPL_ELSE -->
                                 <option value="6">6</option>
                         <!-- /TMPL_IF -->
-                        <!-- TMPL_IF name="f71" -->
+                        <!-- TMPL_IF name="f71" id="f71" -->
                                 <option value="7"
-                SELECTED>1</option>
+                selected="selected">1</option>
                         <!-- TMPL_ELSE -->
                                 <option value="7">7</option>
                         <!-- /TMPL_IF -->
-                        <!-- TMPL_IF name="f68" -->
+                        <!-- TMPL_IF name="f68" id="f68" -->
                                 <option value="8"
-                SELECTED>1</option>
+                selected="selected">1</option>
                         <!-- TMPL_ELSE -->
                                 <option value="8">8</option>
                         <!-- /TMPL_IF -->
-                        <!-- TMPL_IF name="f69" -->
+                        <!-- TMPL_IF name="f69" id="f69" -->
                                 <option value="9"
-                SELECTED>1</option>
+                selected="selected">1</option>
                         <!-- TMPL_ELSE -->
                                 <option value="9">9</option>
                         <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="f6+" -->
                                 <option value="+"
-                SELECTED>greater than 9 kilometres</option>
+                selected="selected">greater than 9 kilometres</option>
                         <!-- TMPL_ELSE -->
                                 <option value="+">greater than 9 kilometres</option>
                         <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="f6x" -->
                                 <option value="x"
-                SELECTED>not applicable</option>
+                selected="selected">not applicable</option>
                         <!-- TMPL_ELSE -->
                                 <option value="x">not applicable</option>
                         <!-- /TMPL_IF -->
                         </select>
                 
-			<select name="f7" size="1">
+			<select name="f7" id="f7" size="1">
 			
 			<!-- TMPL_IF name="f7c" -->
-				<option value="c" SELECTED>Centimetres</option>
+				<option value="c" selected="selected">Centimetres</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">Centimetres</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7i" -->
-				<option value="i" SELECTED>Decimetres</option>
+				<option value="i" selected="selected">Decimetres</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">Decimetres</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7m" -->
-				<option value="m" SELECTED>Metres</option>
+				<option value="m" selected="selected">Metres</option>
 			<!-- TMPL_ELSE -->
 				<option value="m">Metres</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7d" -->
-				<option value="d" SELECTED>Decametres</option>
+				<option value="d" selected="selected">Decametres</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">Decametres</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7h" -->
-				<option value="h" SELECTED>Hectametres</option>
+				<option value="h" selected="selected">Hectametres</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">Hectametres</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7k" -->
-				<option value="k" SELECTED>Kilometres</option>
+				<option value="k" selected="selected">Kilometres</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">Kilometres</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7x" -->
-				<option value="x" SELECTED>not applicable</option>
+				<option value="x" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not applicable</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td>
 	</tr>
-
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
-<script>
+<script type="text/javascript">
+//<![CDATA[
 	function report() {
 
 document.f_pop.f3.value=document.f_pop.f3.value+'  ';
@@ -263,6 +261,7 @@ document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);
 		self.close();
 		return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_122.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_122.tmpl
index 9e0f32f..67d00eb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_122.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_122.tmpl
@@ -1,25 +1,22 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 122 builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 122 builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 122 builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Era identifier</td>
-		<td>
-		<select name="f1" size="1">
+		<td><label for="f1">Era identifier</label></td>
+		<td colspan="7">
+		<select name="f1" id="f1" size="1">
                     <!-- TMPL_IF name="f1c" -->
-                            <option value="c" SELECTED>   date falls before the year 1 in the Gregorian calendar, i.e. B.C.</option>
+                            <option value="c" selected="selected">   date falls before the year 1 in the Gregorian calendar, i.e. B.C.</option>
                     <!-- TMPL_ELSE -->
                             <option value="c">   date falls before the year 1 in the Gregorian calendar, i.e. B.C.</option>
                     <!-- /TMPL_IF -->
                     <!-- TMPL_IF name="f1d" -->
-                            <option value="d" SELECTED>date falls after the year 1 in the Gregorian calendar, i.e. A.D.</option>
+                            <option value="d" selected="selected">date falls after the year 1 in the Gregorian calendar, i.e. A.D.</option>
                     <!-- TMPL_ELSE -->
                             <option value="d">date falls after the year 1 in the Gregorian calendar, i.e. A.D.</option>
                     <!-- /TMPL_IF -->
@@ -28,30 +25,22 @@
 		</td>
                 </tr>
                 <tr>
-                <td>Year</td>
-		   <td><input type="text" name="f2" maxlength=4 size=5
-		   value="<!-- TMPL_VAR name="f2" -->">
+                <td><label for="f2">Year</label></td>
+		   <td><input type="text" name="f2" id="f2" maxlength="4" size="5" value="<!-- TMPL_VAR name="f2" -->" />
 		</td>
 
-		<td>Month</td>
-		         <td><input type="text" name="f3" maxlength=2
-		         size=3
-                   value="<!-- TMPL_VAR name="f3" -->"></td>
-		<td>Day</td>
-		         <td><input type="text" name="f4" maxlength=2
-		         size=3
-                   value="<!-- TMPL_VAR name="f4" -->"></td>
-
-		<td>Time</td>
-		         <td><input type="text" name="f5" maxlength=2
-		         size=3
-                   value="<!-- TMPL_VAR name="f5" -->"></td>
+		<td><label for="f3">Month</label></td>
+		         <td><input type="text" name="f3" id="f3" maxlength="2" size="3" value="<!-- TMPL_VAR name="f3" -->" /></td>
+		<td><label for="f4">Day</label></td>
+		         <td><input type="text" name="f4" id="f4" maxlength="2" size="3" value="<!-- TMPL_VAR name="f4" -->" /></td>
+		<td><label for="f5">Time</label></td>
+		         <td><input type="text" name="f5" id="f5" maxlength="2" size="3" value="<!-- TMPL_VAR name="f5" -->" /></td>
 		</tr>
-
-	<tr><td colspan=2><input type="button" value="OK"  onclick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
+//<![CDATA[
     function report() {
         document.f_pop.f2.value=document.f_pop.f2.value+'    ';
         document.f_pop.f3.value=document.f_pop.f3.value+'  ';
@@ -69,6 +58,7 @@
         window.close();
         return false;
 }
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123a.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123a.tmpl
index 9a15cf2..999ba63 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123a.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123a.tmpl
@@ -1,47 +1,46 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 123a builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 123a builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 123a builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Type of Scale:</td>
+		<td><label for="f1">Type of Scale:</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
 			<!-- TMPL_IF name="f1a" -->
-				<option value="a" SELECTED>linear scale</option>
+				<option value="a" selected="selected">linear scale</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">linear scale</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1b" -->
-				<option value="b" SELECTED>angular scale</option>
+				<option value="b" selected="selected">angular scale</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">angular scale</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1z" -->
-				<option value="z" SELECTED>other type of scale (e.g., time scale, quantitative statistical scale)</option>
+				<option value="z" selected="selected">other type of scale (e.g., time scale, quantitative statistical scale)</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other type of scale (e.g., time scale, quantitative statistical scale)</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
-
-	<tr><td colspan=2><input type="button" value="OK"  onclick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
-	function report() {
+//<![CDATA[
+function report() {
 	    var doc   = opener.document; 
             var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
             field.value =  document.f_pop.f1.value;
 	    self.close();
 	    return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123d.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123d.tmpl
index 49b0462..45d95e3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123d.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123d.tmpl
@@ -1,63 +1,53 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 123d builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 123d builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 123d builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Hemisphere:</td>
+		<td><label for="f1">Hemisphere:</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
 
 			<!-- TMPL_IF name="f1w" -->
-				<option value="w" SELECTED>west</option>
+				<option value="w" selected="selected">west</option>
 			<!-- TMPL_ELSE -->
 				<option value="w">west</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1e" -->
-				<option value="e" SELECTED>east</option>
+				<option value="e" selected="selected">east</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">east</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1n" -->
-				<option value="n" SELECTED>north</option>
+				<option value="n" selected="selected">north</option>
 			<!-- TMPL_ELSE -->
 				<option value="n">north</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1s" -->
-				<option value="s" SELECTED>south</option>
+				<option value="s" selected="selected">south</option>
 			<!-- TMPL_ELSE -->
 				<option value="s">south</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 
-<tr>          <td>Degree (complete with 0):</td>
-                         <td><input type="text" name="f2" maxlength=3
-                         size=4
-                   value="<!-- TMPL_VAR name="f2" -->"></td>
+<tr>          <td><label for="f2">Degree (complete with 0):</label></td>
+                         <td><input type="text" name="f2" id="f2" maxlength="3" size="4" value="<!-- TMPL_VAR name="f2" -->" /></td>
 </tr>
-<tr>          <td>Minute (complete with 0):</td>
-                         <td><input type="text" name="f3" maxlength=2
-                         size=3
-                   value="<!-- TMPL_VAR name="f3" -->"></td>
+<tr>          <td><label for="f3">Minute (complete with 0):</label></td>
+                         <td><input type="text" name="f3" id="f3" maxlength="2" size="3" value="<!-- TMPL_VAR name="f3" -->" /></td>
 </tr>
-<tr>          <td>Second (complete with 0):</td>
-                         <td><input type="text" name="f4" maxlength=2
-                         size=3
-                   value="<!-- TMPL_VAR name="f4" -->"></td>
+<tr>          <td><label for="f4">Second (complete with 0):</label></td>
+                         <td><input type="text" name="f4" id="f4" maxlength="2" size="3" value="<!-- TMPL_VAR name="f4" -->" /></td>
 </tr>
-
-
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
+//<![CDATA[
 	function report() {
             document.f_pop.f2.value=document.f_pop.f2.value+'   ';
             document.f_pop.f3.value=document.f_pop.f3.value+'  ';
@@ -73,6 +63,7 @@
 	    window.close();
 	    return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123e.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123e.tmpl
index ea3cfce..d37f979 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123e.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123e.tmpl
@@ -1,63 +1,53 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 123e builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 123e builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 123e builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Hemisphere:</td>
+		<td><label for="f1">Hemisphere:</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
             
 			<!-- TMPL_IF name="f1w" -->
-				<option value="w" SELECTED>west</option>
+				<option value="w" selected="selected">west</option>
 			<!-- TMPL_ELSE -->
 				<option value="w">west</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1e" -->
-				<option value="e" SELECTED>east</option>
+				<option value="e" selected="selected">east</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">east</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1n" -->
-				<option value="n" SELECTED>north</option>
+				<option value="n" selected="selected">north</option>
 			<!-- TMPL_ELSE -->
 				<option value="n">north</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1s" -->
-				<option value="s" SELECTED>south</option>
+				<option value="s" selected="selected">south</option>
 			<!-- TMPL_ELSE -->
 				<option value="s">south</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 
-<tr>          <td>Degree (complete with 0):</td>
-                         <td><input type="text" name="f2" maxlength=3
-                         size=4
-                   value="<!-- TMPL_VAR name="f2" -->"></td>
+<tr>          <td><label for="f2">Degree (complete with 0):</label></td>
+                         <td><input type="text" name="f2" id="f2" maxlength="3" size="4" value="<!-- TMPL_VAR name="f2" -->" /></td>
 </tr>
-<tr>          <td>Minute (complete with 0):</td>
-                         <td><input type="text" name="f3" maxlength=2
-                         size=3
-                   value="<!-- TMPL_VAR name="f3" -->"></td>
+<tr>          <td><label for="f3">Minute (complete with 0):</label></td>
+                         <td><input type="text" name="f3" id="f3" maxlength="2" size="3" value="<!-- TMPL_VAR name="f3" -->" /></td>
 </tr>
-<tr>          <td>Second (complete with 0):</td>
-                         <td><input type="text" name="f4" maxlength=2
-                         size=3
-                   value="<!-- TMPL_VAR name="f4" -->"></td>
+<tr>          <td><label for="f4">Second (complete with 0):</label></td>
+                         <td><input type="text" name="f4" id="f4" maxlength="2" size="3" value="<!-- TMPL_VAR name="f4" -->" /></td>
 </tr>
-
-
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
+//<![CDATA[
 	function report() {
             document.f_pop.f2.value=document.f_pop.f2.value+'   ';
             document.f_pop.f3.value=document.f_pop.f3.value+'  ';
@@ -73,6 +63,7 @@
 	    window.close();
 	    return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123f.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123f.tmpl
index 6a8dd21..cdb03b9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123f.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123f.tmpl
@@ -1,74 +1,69 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 123f builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 123f builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 123f builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Hemisphere:</td>
+		<td><label for="f1">Hemisphere:</label></td>
 		<td>
-			<select name="f1" size="1">            
+			<select name="f1" id="f1" size="1">
+            
 			<!-- TMPL_IF name="f1w" -->
-				<option value="w" SELECTED>west</option>
+				<option value="w" selected="selected">west</option>
 			<!-- TMPL_ELSE -->
 				<option value="w">west</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1e" -->
-				<option value="e" SELECTED>east</option>
+				<option value="e" selected="selected">east</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">east</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1n" -->
-				<option value="n" SELECTED>north</option>
+				<option value="n" selected="selected">north</option>
 			<!-- TMPL_ELSE -->
 				<option value="n">north</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1s" -->
-				<option value="s" SELECTED>south</option>
+				<option value="s" selected="selected">south</option>
 			<!-- TMPL_ELSE -->
 				<option value="s">south</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 
-<tr>          <td>Degree (complete with 0):</td>
-                         <td><input type="text" name="f2" maxlength=3
-                         size=4
-                   value="<!-- TMPL_VAR name="f2" -->"></td>
+<tr>          <td><label for="f2">Degree (complete with 0):</label></td>
+                         <td><input type="text" name="f2" id="f2" maxlength="3" size="4" value="<!-- TMPL_VAR name="f2" -->" /></td>
 </tr>
-<tr>          <td>Minute (complete with 0):</td>
-                         <td><input type="text" name="f3" maxlength=2
-                         size=3
-                   value="<!-- TMPL_VAR name="f3" -->"></td>
+<tr>          <td><label for="f3">Minute (complete with 0):</label></td>
+                         <td><input type="text" name="f3" id="f3" maxlength="2" size="3" value="<!-- TMPL_VAR name="f3" -->" /></td>
 </tr>
-<tr>          <td>Second (complete with 0):</td>
-                         <td><input type="text" name="f4" maxlength=2
-                         size=3
-                   value="<!-- TMPL_VAR name="f4" -->"></td>
+<tr>          <td><label for="f4">Second (complete with 0):</label></td>
+                         <td><input type="text" name="f4" id="f4" maxlength="2" size="3" value="<!-- TMPL_VAR name="f4" -->" /></td>
 </tr>
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
-    function report() {
-        document.f_pop.f2.value=document.f_pop.f2.value+'   ';
-        document.f_pop.f3.value=document.f_pop.f3.value+'  ';
-        document.f_pop.f4.value=document.f_pop.f4.value+'  ';
-        document.f_pop.f2.value=document.f_pop.f2.value.substring(0,3);
-        document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);
-        document.f_pop.f4.value=document.f_pop.f4.value.substring(0,2);
+//<![CDATA[
+	function report() {
+            document.f_pop.f2.value=document.f_pop.f2.value+'   ';
+            document.f_pop.f3.value=document.f_pop.f3.value+'  ';
+            document.f_pop.f4.value=document.f_pop.f4.value+'  ';
+            document.f_pop.f2.value=document.f_pop.f2.value.substring(0,3);
+            document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);
+            document.f_pop.f4.value=document.f_pop.f4.value.substring(0,2);
 
-        var doc   = opener.document; 
-        var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
-        field.value =  document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value;
-        window.close();
-        return false;
-    }
+            var doc   = opener.document; 
+            var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
+        
+            field.value =  document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value;
+	    window.close();
+	    return false;
+	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123g.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123g.tmpl
index e824432..7cc1c0a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123g.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123g.tmpl
@@ -1,63 +1,53 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_constructeur champ 123g</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 123g builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 123g builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Hemisphere:</td>
+		<td><label for="f1">Hemisphere:</label></td>
 		<td>
-			<select name="f1" size="1">
-
+			<select name="f1" id="f1" size="1">
+            
 			<!-- TMPL_IF name="f1w" -->
-				<option value="w" SELECTED>west</option>
+				<option value="w" selected="selected">west</option>
 			<!-- TMPL_ELSE -->
 				<option value="w">west</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1e" -->
-				<option value="e" SELECTED>east</option>
+				<option value="e" selected="selected">east</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">east</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1n" -->
-				<option value="n" SELECTED>north</option>
+				<option value="n" selected="selected">north</option>
 			<!-- TMPL_ELSE -->
 				<option value="n">north</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1s" -->
-				<option value="s" SELECTED>south</option>
+				<option value="s" selected="selected">south</option>
 			<!-- TMPL_ELSE -->
 				<option value="s">south</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 
-<tr>          <td>Degree (complete with 0):</td>
-                         <td><input type="text" name="f2" maxlength=3
-                         size=4
-                   value="<!-- TMPL_VAR name="f2" -->"></td>
+<tr>          <td><label for="f2">Degree (complete with 0):</label></td>
+                         <td><input type="text" name="f2" id="f2" maxlength="3" size="4" value="<!-- TMPL_VAR name="f2" -->" /></td>
 </tr>
-<tr>          <td>Minute (complete with 0):</td>
-                         <td><input type="text" name="f3" maxlength=2
-                         size=3
-                   value="<!-- TMPL_VAR name="f3" -->"></td>
+<tr>          <td><label for="f3">Minute (complete with 0):</label></td>
+                         <td><input type="text" name="f3" id="f3" maxlength="2" size="3" value="<!-- TMPL_VAR name="f3" -->" /></td>
 </tr>
-<tr>          <td>Second (complete with 0):</td>
-                         <td><input type="text" name="f4" maxlength=2
-                         size=3
-                   value="<!-- TMPL_VAR name="f4" -->"></td>
+<tr>          <td><label for="f4">Second (complete with 0):</label></td>
+                         <td><input type="text" name="f4" id="f4" maxlength="2" size="3" value="<!-- TMPL_VAR name="f4" -->" /></td>
 </tr>
-
-
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
+//<![CDATA[
 	function report() {
             document.f_pop.f2.value=document.f_pop.f2.value+'   ';
             document.f_pop.f3.value=document.f_pop.f3.value+'  ';
@@ -68,10 +58,12 @@
 
             var doc   = opener.document; 
             var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
+        
             field.value =  document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value;
 	    window.close();
 	    return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124a.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124a.tmpl
index 2f2d54a..99cac1e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124a.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124a.tmpl
@@ -1,39 +1,37 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 124a builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 124a builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 124a builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Character of Image:</td>
+		<td><label for="f1">Character of Image:</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
 			<!-- TMPL_IF name="f1a" -->
-				<option value="a" SELECTED>non-photographic image</option>
+				<option value="a" selected="selected">non-photographic image</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">non-photographic image</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1b" -->
-				<option value="b" SELECTED>photographic image</option>
+				<option value="b" selected="selected">photographic image</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">photographic image</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1c" -->
-				<option value="c" SELECTED>remote sensing image</option>
+				<option value="c" selected="selected">remote sensing image</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">remote sensing image</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
+//<![CDATA[
 	function report() {
             var doc   = opener.document; 
             var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
@@ -42,6 +40,7 @@
 	    self.close();
 	    return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124b.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124b.tmpl
index 2438388..5497d56 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124b.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124b.tmpl
@@ -1,80 +1,78 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 124b builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 124b builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 124b builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Form of Cartographic Item:</td>
+		<td><label for="f1">Form of Cartographic Item:</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
             
 			<!-- TMPL_IF name="f1a" -->
-				<option value="a" SELECTED>atlas</option>
+				<option value="a" selected="selected">atlas</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">atlas</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1b" -->
-				<option value="b" SELECTED>diagram</option>
+				<option value="b" selected="selected">diagram</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">diagram</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1c" -->
-				<option value="c" SELECTED>globe</option>
+				<option value="c" selected="selected">globe</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">globe</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1d" -->
-				<option value="d" SELECTED>map</option>
+				<option value="d" selected="selected">map</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">map</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1e" -->
-				<option value="e" SELECTED>model</option>
+				<option value="e" selected="selected">model</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">model</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1f" -->
-				<option value="f" SELECTED>profile</option>
+				<option value="f" selected="selected">profile</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">profile</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1g" -->
-				<option value="g" SELECTED>remote sensing image</option>
+				<option value="g" selected="selected">remote sensing image</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">remote sensing image</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1h" -->
-				<option value="h" SELECTED>section</option>
+				<option value="h" selected="selected">section</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">section</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1i" -->
-				<option value="i" SELECTED>view</option>
+				<option value="i" selected="selected">view</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">view</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1j" -->
-				<option value="j" SELECTED>plan</option>
+				<option value="j" selected="selected">plan</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">plan</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
+//<![CDATA[
 	function report() {
             var doc   = opener.document; 
             var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
@@ -83,6 +81,7 @@
 	    self.close();
 	    return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124c.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124c.tmpl
index 92ea74c..256f1d5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124c.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124c.tmpl
@@ -1,135 +1,133 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 124c builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 124c builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 124c builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>  Presentation Technique for Photographic or Non-Photographic Image:</td>
+		<td><label for="f1">  Presentation Technique for Photographic or Non-Photographic Image:</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
 
 			<!-- TMPL_IF name="f1aa" -->
-				<option value="aa" SELECTED>anaglyphic</option>
+				<option value="aa" selected="selected">anaglyphic</option>
 			<!-- TMPL_ELSE -->
 				<option value="aa">anaglyphic</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ab" -->
-				<option value="ab" SELECTED>polarized</option>
+				<option value="ab" selected="selected">polarized</option>
 			<!-- TMPL_ELSE -->
 				<option value="ab">polarized</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ac" -->
-				<option value="ac" SELECTED>planimetric</option>
+				<option value="ac" selected="selected">planimetric</option>
 			<!-- TMPL_ELSE -->
 				<option value="ac">planimetric</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ad" -->
-				<option value="ad" SELECTED>diagram map</option>
+				<option value="ad" selected="selected">diagram map</option>
 			<!-- TMPL_ELSE -->
 				<option value="ad">diagram map</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ae" -->
-				<option value="ae" SELECTED>flowline map, flow map</option>
+				<option value="ae" selected="selected">flowline map, flow map</option>
 			<!-- TMPL_ELSE -->
 				<option value="ae">flowline map, flow map</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1af" -->
-				<option value="af" SELECTED>dot map</option>
+				<option value="af" selected="selected">dot map</option>
 			<!-- TMPL_ELSE -->
 				<option value="af">dot map</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ag" -->
-				<option value="ag" SELECTED>diagrammatric map</option>
+				<option value="ag" selected="selected">diagrammatric map</option>
 			<!-- TMPL_ELSE -->
 				<option value="ag">diagrammatric map</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ah" -->
-				<option value="ah" SELECTED>choropleth</option>
+				<option value="ah" selected="selected">choropleth</option>
 			<!-- TMPL_ELSE -->
 				<option value="ah">choropleth</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ai" -->
-				<option value="ai" SELECTED>chorochromatic</option>
+				<option value="ai" selected="selected">chorochromatic</option>
 			<!-- TMPL_ELSE -->
 				<option value="ai">chorochromatic</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1aj" -->
-				<option value="aj" SELECTED>dasymetric</option>
+				<option value="aj" selected="selected">dasymetric</option>
 			<!-- TMPL_ELSE -->
 				<option value="aj">dasymetric</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ak" -->
-				<option value="ak" SELECTED>isopleth</option>
+				<option value="ak" selected="selected">isopleth</option>
 			<!-- TMPL_ELSE -->
 				<option value="ak">isopleth</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1am" -->
-				<option value="am" SELECTED>anamorphic</option>
+				<option value="am" selected="selected">anamorphic</option>
 			<!-- TMPL_ELSE -->
 				<option value="am">anamorphic</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1an" -->
-				<option value="an" SELECTED>pictorial map</option>
+				<option value="an" selected="selected">pictorial map</option>
 			<!-- TMPL_ELSE -->
 				<option value="an">pictorial map</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ao" -->
-				<option value="ao" SELECTED>spatial model on two dimensional surface</option>
+				<option value="ao" selected="selected">spatial model on two dimensional surface</option>
 			<!-- TMPL_ELSE -->
 				<option value="ao">spatial model on two dimensional surface</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ap" -->
-				<option value="ap" SELECTED>mental or cognitive map</option>
+				<option value="ap" selected="selected">mental or cognitive map</option>
 			<!-- TMPL_ELSE -->
 				<option value="ap">mental or cognitive map</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1aq" -->
-				<option value="aq" SELECTED>views with horizon showing</option>
+				<option value="aq" selected="selected">views with horizon showing</option>
 			<!-- TMPL_ELSE -->
 				<option value="aq">views with horizon showing</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ar" -->
-				<option value="ar" SELECTED>views without horizon showing</option>
+				<option value="ar" selected="selected">views without horizon showing</option>
 			<!-- TMPL_ELSE -->
 				<option value="ar">views without horizon showing</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1as" -->
-				<option value="as" SELECTED>map view</option>
+				<option value="as" selected="selected">map view</option>
 			<!-- TMPL_ELSE -->
 				<option value="as">map view</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1da" -->
-				<option value="da" SELECTED>picto map</option>
+				<option value="da" selected="selected">picto map</option>
 			<!-- TMPL_ELSE -->
 				<option value="da">picto map</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1db" -->
-				<option value="db" SELECTED>random dot map</option>
+				<option value="db" selected="selected">random dot map</option>
 			<!-- TMPL_ELSE -->
 				<option value="db">random dot map</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1dc" -->
-				<option value="dc" SELECTED>screened</option>
+				<option value="dc" selected="selected">screened</option>
 			<!-- TMPL_ELSE -->
 				<option value="dc">screened</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1dd" -->
-				<option value="dd" SELECTED>not screened</option>
+				<option value="dd" selected="selected">not screened</option>
 			<!-- TMPL_ELSE -->
 				<option value="dd">not screened</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
+//<![CDATA[
 	function report() {
             var doc   = opener.document; 
             var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
@@ -137,6 +135,7 @@
 	    window.close();
 	    return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124d.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124d.tmpl
index db96601..735d37b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124d.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124d.tmpl
@@ -1,39 +1,37 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 124d builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 124d builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 124d builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Position of Platform for Photographic or Remote Sensing Image:</td>
+		<td><label for="f1">Position of Platform for Photographic or Remote Sensing Image:</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
 			<!-- TMPL_IF name="f1a" -->
-				<option value="a" SELECTED>terrestrial</option>
+				<option value="a" selected="selected">terrestrial</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">terrestrial</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1b" -->
-				<option value="b" SELECTED>aerial</option>
+				<option value="b" selected="selected">aerial</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">aerial</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1c" -->
-				<option value="c" SELECTED>space</option>
+				<option value="c" selected="selected">space</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">space</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
+//<![CDATA[
 	function report() {
             var doc   = opener.document; 
             var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
@@ -41,6 +39,7 @@
 	    window.close();
 	    return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124e.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124e.tmpl
index 6762425..dd966cf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124e.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124e.tmpl
@@ -1,40 +1,38 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 124e builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 124e builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 124e builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Category of Satellite for Remote Sensing Image:</td>
+		<td><label for="f1">Category of Satellite for Remote Sensing Image:</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
 
 			<!-- TMPL_IF name="f1a" -->
-				<option value="a" SELECTED>meteorological</option>
+				<option value="a" selected="selected">meteorological</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">meteorological</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1b" -->
-				<option value="b" SELECTED>earth resources</option>
+				<option value="b" selected="selected">earth resources</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">earth resources</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1c" -->
-				<option value="c" SELECTED>space observing</option>
+				<option value="c" selected="selected">space observing</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">space observing</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
-	<tr><td colspan=2><input type="button" value="OK"  onclick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
+//<![CDATA[
 	function report() {
 	    var doc     = opener.document; 
             var field   = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
@@ -42,6 +40,7 @@
 	    window.close();
 	    return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124f.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124f.tmpl
index aba2bf3..50e2e53 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124f.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124f.tmpl
@@ -1,114 +1,112 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 124f builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 124f builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 124f builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Name of Satellite for Remote Sensing Image:</td>
+		<td><label for="f1">Name of Satellite for Remote Sensing Image:</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
 			<!-- TMPL_IF name="f1aa" -->
-				<option value="aa" SELECTED>Tiros</option>
+				<option value="aa" selected="selected">Tiros</option>
 			<!-- TMPL_ELSE -->
 				<option value="aa">Tiros</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ab" -->
-				<option value="ab" SELECTED>ATS</option>
+				<option value="ab" selected="selected">ATS</option>
 			<!-- TMPL_ELSE -->
 				<option value="ab">ATS</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ac" -->
-				<option value="ac" SELECTED>NOAA</option>
+				<option value="ac" selected="selected">NOAA</option>
 			<!-- TMPL_ELSE -->
 				<option value="ac">NOAA</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ad" -->
-				<option value="ad" SELECTED>Nimbus</option>
+				<option value="ad" selected="selected">Nimbus</option>
 			<!-- TMPL_ELSE -->
 				<option value="ad">Nimbus</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ae" -->
-				<option value="ae" SELECTED>METEOSAT</option>
+				<option value="ae" selected="selected">METEOSAT</option>
 			<!-- TMPL_ELSE -->
 				<option value="ae">METEOSAT</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ma" -->
-				<option value="ma" SELECTED>Explorer I</option>
+				<option value="ma" selected="selected">Explorer I</option>
 			<!-- TMPL_ELSE -->
 				<option value="ma">Explorer I</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1mb" -->
-				<option value="mb" SELECTED>Explorer II</option>
+				<option value="mb" selected="selected">Explorer II</option>
 			<!-- TMPL_ELSE -->
 				<option value="mb">Explorer II</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ga" -->
-				<option value="ga" SELECTED>ERTS</option>
+				<option value="ga" selected="selected">ERTS</option>
 			<!-- TMPL_ELSE -->
 				<option value="ga">ERTS</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1gb" -->
-				<option value="gb" SELECTED>Landsat I</option>
+				<option value="gb" selected="selected">Landsat I</option>
 			<!-- TMPL_ELSE -->
 				<option value="gb">Landsat I</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1gc" -->
-				<option value="gc" SELECTED>Landsat II</option>
+				<option value="gc" selected="selected">Landsat II</option>
 			<!-- TMPL_ELSE -->
 				<option value="gc">Landsat II</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1gd" -->
-				<option value="gd" SELECTED>Landsat III</option>
+				<option value="gd" selected="selected">Landsat III</option>
 			<!-- TMPL_ELSE -->
 				<option value="gd">Landsat III</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ge" -->
-				<option value="ge" SELECTED>Seasat</option>
+				<option value="ge" selected="selected">Seasat</option>
 			<!-- TMPL_ELSE -->
 				<option value="ge">Seasat</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1gf" -->
-				<option value="gf" SELECTED>Skylab</option>
+				<option value="gf" selected="selected">Skylab</option>
 			<!-- TMPL_ELSE -->
 				<option value="gf">Skylab</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1gg" -->
-				<option value="gg" SELECTED>Spacelab</option>
+				<option value="gg" selected="selected">Spacelab</option>
 			<!-- TMPL_ELSE -->
 				<option value="gg">Spacelab</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1gk" -->
-				<option value="gk" SELECTED>Spot 1</option>
+				<option value="gk" selected="selected">Spot 1</option>
 			<!-- TMPL_ELSE -->
 				<option value="gk">Spot 1</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1gl" -->
-				<option value="gl" SELECTED>Spot 2</option>
+				<option value="gl" selected="selected">Spot 2</option>
 			<!-- TMPL_ELSE -->
 				<option value="gl">Spot 2</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1gm" -->
-				<option value="gm" SELECTED>Spot 3</option>
+				<option value="gm" selected="selected">Spot 3</option>
 			<!-- TMPL_ELSE -->
 				<option value="gm">Spot 3</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1gz" -->
-				<option value="gz" SELECTED>other</option>
+				<option value="gz" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="gz">other</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
+//<![CDATA[
 	function report() {
             var doc   = opener.document; 
             var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
@@ -116,6 +114,7 @@
 	    self.close();
 	    return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124g.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124g.tmpl
index fbb3a7b..2d8e9af 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124g.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124g.tmpl
@@ -1,75 +1,73 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 124g builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 124g builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 124g builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Recording Technique for Remote Sensing Image:</td>
+		<td><label for="f1">Recording Technique for Remote Sensing Image:</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
 
 			<!-- TMPL_IF name="f1aa" -->
-				<option value="aa" SELECTED>video recording</option>
+				<option value="aa" selected="selected">video recording</option>
 			<!-- TMPL_ELSE -->
 				<option value="aa">video recording</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ab" -->
-				<option value="ab" SELECTED>false colour photography</option>
+				<option value="ab" selected="selected">false colour photography</option>
 			<!-- TMPL_ELSE -->
 				<option value="ab">false colour photography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ac" -->
-				<option value="ac" SELECTED>multispectral photography</option>
+				<option value="ac" selected="selected">multispectral photography</option>
 			<!-- TMPL_ELSE -->
 				<option value="ac">multispectral photography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ad" -->
-				<option value="ad" SELECTED>multispectral scanning</option>
+				<option value="ad" selected="selected">multispectral scanning</option>
 			<!-- TMPL_ELSE -->
 				<option value="ad">multispectral scanning</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1av" -->
-				<option value="av" SELECTED>combination of various light emission techniques</option>
+				<option value="av" selected="selected">combination of various light emission techniques</option>
 			<!-- TMPL_ELSE -->
 				<option value="av">combination of various light emission techniques</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1da" -->
-				<option value="da" SELECTED>infrared line scanning</option>
+				<option value="da" selected="selected">infrared line scanning</option>
 			<!-- TMPL_ELSE -->
 				<option value="da">infrared line scanning</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1dv" -->
-				<option value="dv" SELECTED>combination of various thermal infrared scanning</option>
+				<option value="dv" selected="selected">combination of various thermal infrared scanning</option>
 			<!-- TMPL_ELSE -->
 				<option value="dv">combination of various thermal infrared scanning</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ga" -->
-				<option value="ga" SELECTED>Sidelooking Airbone Radar</option>
+				<option value="ga" selected="selected">Sidelooking Airbone Radar</option>
 			<!-- TMPL_ELSE -->
 				<option value="ga">Sidelooking Airbone Radar</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1gb" -->
-				<option value="gb" SELECTED>Synthetic Aperture Radar</option>
+				<option value="gb" selected="selected">Synthetic Aperture Radar</option>
 			<!-- TMPL_ELSE -->
 				<option value="gb">Synthetic Aperture Radar</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1gc" -->
-				<option value="gc" SELECTED>passive microwave mapping</option>
+				<option value="gc" selected="selected">passive microwave mapping</option>
 			<!-- TMPL_ELSE -->
 				<option value="gc">passive microwave mapping</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
+//<![CDATA[
 	function report() {
             var doc   = opener.document; 
             var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
@@ -77,6 +75,7 @@
 	    window.close();
 	    return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125a.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125a.tmpl
index 1321972..edd78af 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125a.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125a.tmpl
@@ -1,142 +1,140 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 125a builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 125a builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 125a builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Type of Score:</td>
+		<td><label for="f1">Type of Score:</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
 			<!-- TMPL_IF name="f1a" -->
-				<option value="a" SELECTED>full score, graphic score</option>
+				<option value="a" selected="selected">full score, graphic score</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">full score, graphic score</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1b" -->
-				<option value="b" SELECTED>score (miniature or study size)</option>
+				<option value="b" selected="selected">score (miniature or study size)</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">score (miniature or study size)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1c" -->
-				<option value="c" SELECTED>vocal score, accompaniment reduced for keyboard</option>
+				<option value="c" selected="selected">vocal score, accompaniment reduced for keyboard</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">vocal score, accompaniment reduced for keyboard</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1d" -->
-				<option value="d" SELECTED>voice score, chorus score, accompaniment has been dropped</option>
+				<option value="d" selected="selected">voice score, chorus score, accompaniment has been dropped</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">voice score, chorus score, accompaniment has been dropped</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1e" -->
-				<option value="e" SELECTED>condensed score, pianoconductor score</option>
+				<option value="e" selected="selected">condensed score, pianoconductor score</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">condensed score, pianoconductor score</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1f" -->
-				<option value="f" SELECTED>graphic score</option>
+				<option value="f" selected="selected">graphic score</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">graphic score</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1g" -->
-				<option value="g" SELECTED>close score (e.g. hymnals)</option>
+				<option value="g" selected="selected">close score (e.g. hymnals)</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">close score (e.g. hymnals)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1h" -->
-				<option value="h" SELECTED>tablature</option>
+				<option value="h" selected="selected">tablature</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">tablature</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1i" -->
-				<option value="i" SELECTED>choir-book</option>
+				<option value="i" selected="selected">choir-book</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">choir-book</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1j" -->
-				<option value="j" SELECTED>compressed score</option>
+				<option value="j" selected="selected">compressed score</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">compressed score</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1k" -->
-				<option value="k" SELECTED>pseudo-score</option>
+				<option value="k" selected="selected">pseudo-score</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">pseudo-score</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1l" -->
-				<option value="l" SELECTED>solo part</option>
+				<option value="l" selected="selected">solo part</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">solo part</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1m" -->
-				<option value="m" SELECTED>multiple formats</option>
+				<option value="m" selected="selected">multiple formats</option>
 			<!-- TMPL_ELSE -->
 				<option value="m">multiple formats</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1x" -->
-				<option value="x" SELECTED>not applicable, not a score</option>
+				<option value="x" selected="selected">not applicable, not a score</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not applicable, not a score</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 	<tr>
-		<td>Parts Indicator:</td>
+		<td><label for="f2">Parts Indicator:</label></td>
 		<td>
-			<select name="f2" size="1">
+			<select name="f2" id="f2" size="1">
 
 			<!-- TMPL_IF name="f2a" -->
-				<option value="a" SELECTED>parts exist (vocal and instrumental)</option>
+				<option value="a" selected="selected">parts exist (vocal and instrumental)</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">parts exist (vocal and instrumental)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2b" -->
-				<option value="b" SELECTED>instrumental parts</option>
+				<option value="b" selected="selected">instrumental parts</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">instrumental parts</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2c" -->
-				<option value="c" SELECTED>vocal parts</option>
+				<option value="c" selected="selected">vocal parts</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">vocal parts</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2x" -->
-				<option value="x" SELECTED>not applicable</option>
+				<option value="x" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not applicable</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2y" -->
-				<option value="y" SELECTED>parts not present</option>
+				<option value="y" selected="selected">parts not present</option>
 			<!-- TMPL_ELSE -->
 				<option value="y">parts not present</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 
 <script type="text/javascript">
+//<![CDATA[
 	function report() {
             var doc   = opener.document; 
             var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
@@ -144,7 +142,8 @@
 	    window.close();
 	    return false;
 	}
+//]]>
 </script>
 
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125b.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125b.tmpl
index c3188b4..520a13d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125b.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125b.tmpl
@@ -1,134 +1,132 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 125b builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 125b builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 125b builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Literary Text Indicator:</td>
+		<td><label for="f1">Literary Text Indicator:</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
 			<!-- TMPL_IF name="f1 " -->
-				<option value=" " SELECTED>non required value</option>
+				<option value=" " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1a" -->
-				<option value="a" SELECTED>poetry</option>
+				<option value="a" selected="selected">poetry</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">poetry</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1b" -->
-				<option value="b" SELECTED>drama</option>
+				<option value="b" selected="selected">drama</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">drama</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1c" -->
-				<option value="c" SELECTED>fiction</option>
+				<option value="c" selected="selected">fiction</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">fiction</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1d" -->
-				<option value="d" SELECTED>history</option>
+				<option value="d" selected="selected">history</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">history</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1e" -->
-				<option value="e" SELECTED>lectures, speeches</option>
+				<option value="e" selected="selected">lectures, speeches</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">lectures, speeches</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1f" -->
-				<option value="f" SELECTED>instructions</option>
+				<option value="f" selected="selected">instructions</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">instructions</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1g" -->
-				<option value="g" SELECTED>sounds</option>
+				<option value="g" selected="selected">sounds</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">sounds</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1h" -->
-				<option value="h" SELECTED>autobiography</option>
+				<option value="h" selected="selected">autobiography</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">autobiography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1i" -->
-				<option value="i" SELECTED>biography</option>
+				<option value="i" selected="selected">biography</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">biography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1j" -->
-				<option value="j" SELECTED>essays</option>
+				<option value="j" selected="selected">essays</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">essays</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1k" -->
-				<option value="k" SELECTED>reporting</option>
+				<option value="k" selected="selected">reporting</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">reporting</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1l" -->
-				<option value="l" SELECTED>memoirs</option>
+				<option value="l" selected="selected">memoirs</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">memoirs</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1m" -->
-				<option value="m" SELECTED>rehearsals</option>
+				<option value="m" selected="selected">rehearsals</option>
 			<!-- TMPL_ELSE -->
 				<option value="m">rehearsals</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1n" -->
-				<option value="n" SELECTED>interviews</option>
+				<option value="n" selected="selected">interviews</option>
 			<!-- TMPL_ELSE -->
 				<option value="n">interviews</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1o" -->
-				<option value="o" SELECTED>advertising texts</option>
+				<option value="o" selected="selected">advertising texts</option>
 			<!-- TMPL_ELSE -->
 				<option value="o">advertising texts</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1p" -->
-				<option value="p" SELECTED>instruction (language)</option>
+				<option value="p" selected="selected">instruction (language)</option>
 			<!-- TMPL_ELSE -->
 				<option value="p">instruction (language)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1q" -->
-				<option value="q" SELECTED>conference proceedings</option>
+				<option value="q" selected="selected">conference proceedings</option>
 			<!-- TMPL_ELSE -->
 				<option value="q">conference proceedings</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1r" -->
-				<option value="r" SELECTED>comedy</option>
+				<option value="r" selected="selected">comedy</option>
 			<!-- TMPL_ELSE -->
 				<option value="r">comedy</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1s" -->
-				<option value="s" SELECTED>folktales</option>
+				<option value="s" selected="selected">folktales</option>
 			<!-- TMPL_ELSE -->
 				<option value="s">folktales</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1t" -->
-				<option value="t" SELECTED>sacred texts</option>
+				<option value="t" selected="selected">sacred texts</option>
 			<!-- TMPL_ELSE -->
 				<option value="t">sacred texts</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1z" -->
-				<option value="z" SELECTED>other types of literary text</option>
+				<option value="z" selected="selected">other types of literary text</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other types of literary text</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
+//<![CDATA[
 	function report() {
             var doc   = opener.document; 
             var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
@@ -137,6 +135,7 @@
 	    window.close();
 	    return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126a.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126a.tmpl
index dd57f32..5ab4812 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126a.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126a.tmpl
@@ -1,1035 +1,1033 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 126a builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 126a builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 126a builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Form of release:</td>
+		<td><label for="f1">Form of release:</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
 
 			<!-- TMPL_IF name="f1a" -->
-				<option value="a" SELECTED>disc</option>
+				<option value="a" selected="selected">disc</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">disc</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1b" -->
-				<option value="b" SELECTED>tape (open reel)</option>
+				<option value="b" selected="selected">tape (open reel)</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">tape (open reel)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1c" -->
-				<option value="c" SELECTED>tape (cassette)</option>
+				<option value="c" selected="selected">tape (cassette)</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">tape (cassette)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1d" -->
-				<option value="d" SELECTED>tape (cartridge)</option>
+				<option value="d" selected="selected">tape (cartridge)</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">tape (cartridge)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1e" -->
-				<option value="e" SELECTED>wire recording</option>
+				<option value="e" selected="selected">wire recording</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">wire recording</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1f" -->
-				<option value="f" SELECTED>cylinder</option>
+				<option value="f" selected="selected">cylinder</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">cylinder</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1g" -->
-				<option value="g" SELECTED>roll</option>
+				<option value="g" selected="selected">roll</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">roll</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1h" -->
-				<option value="h" SELECTED>film (sound film)</option>
+				<option value="h" selected="selected">film (sound film)</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">film (sound film)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 	<tr>
-		<td>Speed:</td>
+		<td><label for="f2">Speed:</label></td>
 		<td>
-			<select name="f2" size="1">
+			<select name="f2" id="f2" size="1">
 			<!-- TMPL_IF name="f2u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2x" -->
-				<option value="x" SELECTED>not applicable</option>
+				<option value="x" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not applicable</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2a" -->
-				<option value="a" SELECTED>16 2/3 rpm</option>
+				<option value="a" selected="selected">16 2/3 rpm</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">16 2/3 rpm</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2b" -->
-				<option value="b" SELECTED>33 1/3 rpm</option>
+				<option value="b" selected="selected">33 1/3 rpm</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">33 1/3 rpm</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2c" -->
-				<option value="c" SELECTED>45 rpm</option>
+				<option value="c" selected="selected">45 rpm</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">45 rpm</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2d" -->
-				<option value="d" SELECTED>78 rpm</option>
+				<option value="d" selected="selected">78 rpm</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">78 rpm</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2e" -->
-				<option value="e" SELECTED>8 rpm</option>
+				<option value="e" selected="selected">8 rpm</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">8 rpm</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2g" -->
-				<option value="g" SELECTED>1.4 m/sec(compact discs)</option>
+				<option value="g" selected="selected">1.4 m/sec(compact discs)</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">1.4 m/sec(compact discs)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2h" -->
-				<option value="h" SELECTED>120 rpm</option>
+				<option value="h" selected="selected">120 rpm</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">120 rpm</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2i" -->
-				<option value="i" SELECTED>160 rpm</option>
+				<option value="i" selected="selected">160 rpm</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">160 rpm</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2k" -->
-				<option value="k" SELECTED>1 7/8 in. per second</option>
+				<option value="k" selected="selected">1 7/8 in. per second</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">1 7/8 in. per second</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2l" -->
-				<option value="l" SELECTED>15/16 in. per second</option>
+				<option value="l" selected="selected">15/16 in. per second</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">15/16 in. per second</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2m" -->
-				<option value="m" SELECTED>3 3/4 in. per second</option>
+				<option value="m" selected="selected">3 3/4 in. per second</option>
 			<!-- TMPL_ELSE -->
 				<option value="m">3 3/4 in. per second</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2n" -->
-				<option value="n" SELECTED>7 1/2 in. per second</option>
+				<option value="n" selected="selected">7 1/2 in. per second</option>
 			<!-- TMPL_ELSE -->
 				<option value="n">7 1/2 in. per second</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2o" -->
-				<option value="o" SELECTED>15 in. per second</option>
+				<option value="o" selected="selected">15 in. per second</option>
 			<!-- TMPL_ELSE -->
 				<option value="o">15 in. per second</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2p" -->
-				<option value="p" SELECTED>30 in. per second</option>
+				<option value="p" selected="selected">30 in. per second</option>
 			<!-- TMPL_ELSE -->
 				<option value="p">30 in. per second</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2q" -->
-				<option value="q" SELECTED>8/10 in. per second</option>
+				<option value="q" selected="selected">8/10 in. per second</option>
 			<!-- TMPL_ELSE -->
 				<option value="q">8/10 in. per second</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2r" -->
-				<option value="r" SELECTED>4/10 in. per second</option>
+				<option value="r" selected="selected">4/10 in. per second</option>
 			<!-- TMPL_ELSE -->
 				<option value="r">4/10 in. per second</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 	<tr>
-		<td>Kind of sound:</td>
+		<td><label for="f3">Kind of sound:</label></td>
 		<td>
-			<select name="f3" size="1">
+			<select name="f3" id="f3" size="1">
 			<!-- TMPL_IF name="f3a" -->
-				<option value="a" SELECTED>monoaural</option>
+				<option value="a" selected="selected">monoaural</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">monoaural</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3b" -->
-				<option value="b" SELECTED>stereophonic</option>
+				<option value="b" selected="selected">stereophonic</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">stereophonic</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3c" -->
-				<option value="c" SELECTED>quadraphonic</option>
+				<option value="c" selected="selected">quadraphonic</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">quadraphonic</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 	<tr>
-		<td>Groove width:</td>
+		<td><label for="f4">Groove width:</label></td>
 		<td>
-			<select name="f4" size="1">
+			<select name="f4" id="f4" size="1">
 			<!-- TMPL_IF name="f4a" -->
-				<option value="a" SELECTED>coarse/standard</option>
+				<option value="a" selected="selected">coarse/standard</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">coarse/standard</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4b" -->
-				<option value="b" SELECTED>microgroove/fine</option>
+				<option value="b" selected="selected">microgroove/fine</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">microgroove/fine</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4x" -->
-				<option value="x" SELECTED>not applicable</option>
+				<option value="x" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not applicable</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 	<tr>
-		<td>Dimensions (sound recordings):</td>
+		<td><label for="f5">Dimensions (sound recordings):</label></td>
 		<td>
-			<select name="f5" size="1">
+			<select name="f5" id="f5" size="1">
 			<!-- TMPL_IF name="f5a" -->
-				<option value="a" SELECTED>7.62cm or 3 in.</option>
+				<option value="a" selected="selected">7.62cm or 3 in.</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">7.62cm or 3 in.</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5b" -->
-				<option value="b" SELECTED>12.7 cm or 5 in.</option>
+				<option value="b" selected="selected">12.7 cm or 5 in.</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">12.7 cm or 5 in.</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5c" -->
-				<option value="c" SELECTED>17.78 cm or 7 in.</option>
+				<option value="c" selected="selected">17.78 cm or 7 in.</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">17.78 cm or 7 in.</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5d" -->
-				<option value="d" SELECTED>25.4 cm or 10 in.</option>
+				<option value="d" selected="selected">25.4 cm or 10 in.</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">25.4 cm or 10 in.</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5e" -->
-				<option value="e" SELECTED>30,48 cm or 12 in.</option>
+				<option value="e" selected="selected">30,48 cm or 12 in.</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">30,48 cm or 12 in.</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5f" -->
-				<option value="f" SELECTED>40.64 cm or 16 in.</option>
+				<option value="f" selected="selected">40.64 cm or 16 in.</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">40.64 cm or 16 in.</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5g" -->
-				<option value="g" SELECTED>35.56 cm or 14 in.</option>
+				<option value="g" selected="selected">35.56 cm or 14 in.</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">35.56 cm or 14 in.</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5h" -->
-				<option value="h" SELECTED>12 cm or 4 in. 3/4</option>
+				<option value="h" selected="selected">12 cm or 4 in. 3/4</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">12 cm or 4 in. 3/4</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5j" -->
-				<option value="j" SELECTED>10 cm x 6.3 cm or 3 in. 7/8 x 2 in. 1/2</option>
+				<option value="j" selected="selected">10 cm x 6.3 cm or 3 in. 7/8 x 2 in. 1/2</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">10 cm x 6.3 cm or 3 in. 7/8 x 2 in. 1/2</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5o" -->
-				<option value="o" SELECTED>13.2 cm x 9.7 cm or 5 in. 1/4 x 3 in. 7/8</option>
+				<option value="o" selected="selected">13.2 cm x 9.7 cm or 5 in. 1/4 x 3 in. 7/8</option>
 			<!-- TMPL_ELSE -->
 				<option value="o">13.2 cm x 9.7 cm or 5 in. 1/4 x 3 in. 7/8</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5s" -->
-				<option value="s" SELECTED>5.7 cm x 10 cm or 2 in. 1/4 x 4 in., cylinder</option>
+				<option value="s" selected="selected">5.7 cm x 10 cm or 2 in. 1/4 x 4 in., cylinder</option>
 			<!-- TMPL_ELSE -->
 				<option value="s">5.7 cm x 10 cm or 2 in. 1/4 x 4 in., cylinder</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5x" -->
-				<option value="x" SELECTED>not applicable</option>
+				<option value="x" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not applicable</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 	<tr>
-		<td>Tape width:</td>
+		<td><label for="f6">Tape width:</label></td>
 		<td>
-			<select name="f6" size="1">
+			<select name="f6" id="f6" size="1">
 			
 			<!-- TMPL_IF name="f6a" -->
-				<option value="a" SELECTED>1/4 in.</option>
+				<option value="a" selected="selected">1/4 in.</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">1/4 in.</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6b" -->
-				<option value="b" SELECTED>1/2 in.</option>
+				<option value="b" selected="selected">1/2 in.</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">1/2 in.</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6c" -->
-				<option value="c" SELECTED>1 in.</option>
+				<option value="c" selected="selected">1 in.</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">1 in.</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6d" -->
-				<option value="d" SELECTED>1/8 in.</option>
+				<option value="d" selected="selected">1/8 in.</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">1/8 in.</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6e" -->
-				<option value="e" SELECTED>2 in.</option>
+				<option value="e" selected="selected">2 in.</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">2 in.</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6f" -->
-				<option value="f" SELECTED>1/3 in. (8 mm)</option>
+				<option value="f" selected="selected">1/3 in. (8 mm)</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">1/3 in. (8 mm)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6x" -->
-				<option value="x" SELECTED>recording not a tape</option>
+				<option value="x" selected="selected">recording not a tape</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">recording not a tape</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 	<tr>
-		<td>Tape configuration:</td>
+		<td><label for="f7">Tape configuration:</label></td>
 		<td>
-			<select name="f7" size="1">
+			<select name="f7" id="f7" size="1">
 			
 			<!-- TMPL_IF name="f7a" -->
-				<option value="a" SELECTED>full track</option>
+				<option value="a" selected="selected">full track</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">full track</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7b" -->
-				<option value="b" SELECTED>half track</option>
+				<option value="b" selected="selected">half track</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">half track</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7c" -->
-				<option value="c" SELECTED>quarter track</option>
+				<option value="c" selected="selected">quarter track</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">quarter track</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7d" -->
-				<option value="d" SELECTED>eight track</option>
+				<option value="d" selected="selected">eight track</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">eight track</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7e" -->
-				<option value="e" SELECTED>twelve track</option>
+				<option value="e" selected="selected">twelve track</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">twelve track</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7f" -->
-				<option value="f" SELECTED>sixteen track</option>
+				<option value="f" selected="selected">sixteen track</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">sixteen track</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7g" -->
-				<option value="g" SELECTED>twentyfour track</option>
+				<option value="g" selected="selected">twentyfour track</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">twentyfour track</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7h" -->
-				<option value="h" SELECTED>six track</option>
+				<option value="h" selected="selected">six track</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">six track</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7x" -->
-				<option value="x" SELECTED>recording not a tape</option>
+				<option value="x" selected="selected">recording not a tape</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">recording not a tape</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 	<tr>
-		<td>Accompanying textual material 1:</td>
+		<td><label for="f8">Accompanying textual material 1:</label></td>
 		<td>
-			<select name="f8" size="1">
+			<select name="f8" id="f8" size="1">
 			<!-- TMPL_IF name="f8 " -->
-				<option value=" " SELECTED>non required value</option>
+				<option value=" " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8a" -->
-				<option value="a" SELECTED>discography</option>
+				<option value="a" selected="selected">discography</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">discography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8b" -->
-				<option value="b" SELECTED>bibliography</option>
+				<option value="b" selected="selected">bibliography</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">bibliography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8c" -->
-				<option value="c" SELECTED>thematic index</option>
+				<option value="c" selected="selected">thematic index</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">thematic index</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8d" -->
-				<option value="d" SELECTED>libretto or text</option>
+				<option value="d" selected="selected">libretto or text</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">libretto or text</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8e" -->
-				<option value="e" SELECTED>biography of composer</option>
+				<option value="e" selected="selected">biography of composer</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">biography of composer</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8f" -->
-				<option value="f" SELECTED>biography of performer or history of ensemble</option>
+				<option value="f" selected="selected">biography of performer or history of ensemble</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">biography of performer or history of ensemble</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8g" -->
-				<option value="g" SELECTED>technical or historical information on instruments</option>
+				<option value="g" selected="selected">technical or historical information on instruments</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">technical or historical information on instruments</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8h" -->
-				<option value="h" SELECTED>technical information on music</option>
+				<option value="h" selected="selected">technical information on music</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">technical information on music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8i" -->
-				<option value="i" SELECTED>historical information about music</option>
+				<option value="i" selected="selected">historical information about music</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">historical information about music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8j" -->
-				<option value="j" SELECTED>other historical information</option>
+				<option value="j" selected="selected">other historical information</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">other historical information</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8k" -->
-				<option value="k" SELECTED>ethnological information</option>
+				<option value="k" selected="selected">ethnological information</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">ethnological information</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8l" -->
-				<option value="l" SELECTED>biography of arranger or transcriber</option>
+				<option value="l" selected="selected">biography of arranger or transcriber</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">biography of arranger or transcriber</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8r" -->
-				<option value="r" SELECTED>instructional material</option>
+				<option value="r" selected="selected">instructional material</option>
 			<!-- TMPL_ELSE -->
 				<option value="r">instructional material</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8s" -->
-				<option value="s" SELECTED>score</option>
+				<option value="s" selected="selected">score</option>
 			<!-- TMPL_ELSE -->
 				<option value="s">score</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8z" -->
-				<option value="z" SELECTED>other accompanying textual material</option>
+				<option value="z" selected="selected">other accompanying textual material</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other accompanying textual material</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 	<tr>
-		<td>Accompanying textual material 2:</td>
+		<td><label for="f9">Accompanying textual material 2:</label></td>
 		<td>
-			<select name="f9" size="1">
+			<select name="f9" id="f9" size="1">
 			
 			<!-- TMPL_IF name="f9 " -->
-				<option value=" " SELECTED>non required value</option>
+				<option value=" " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9a" -->
-				<option value="a" SELECTED>discography</option>
+				<option value="a" selected="selected">discography</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">discography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9b" -->
-				<option value="b" SELECTED>bibliography</option>
+				<option value="b" selected="selected">bibliography</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">bibliography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9c" -->
-				<option value="c" SELECTED>thematic index</option>
+				<option value="c" selected="selected">thematic index</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">thematic index</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9d" -->
-				<option value="d" SELECTED>libretto or text</option>
+				<option value="d" selected="selected">libretto or text</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">libretto or text</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9e" -->
-				<option value="e" SELECTED>biography of composer</option>
+				<option value="e" selected="selected">biography of composer</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">biography of composer</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9f" -->
-				<option value="f" SELECTED>biography of performer or history of ensemble</option>
+				<option value="f" selected="selected">biography of performer or history of ensemble</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">biography of performer or history of ensemble</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9g" -->
-				<option value="g" SELECTED>technical or historical information on instruments</option>
+				<option value="g" selected="selected">technical or historical information on instruments</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">technical or historical information on instruments</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9h" -->
-				<option value="h" SELECTED>technical information on music</option>
+				<option value="h" selected="selected">technical information on music</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">technical information on music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9i" -->
-				<option value="i" SELECTED>historical information about music</option>
+				<option value="i" selected="selected">historical information about music</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">historical information about music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9j" -->
-				<option value="j" SELECTED>other historical information</option>
+				<option value="j" selected="selected">other historical information</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">other historical information</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9k" -->
-				<option value="k" SELECTED>ethnological information</option>
+				<option value="k" selected="selected">ethnological information</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">ethnological information</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9l" -->
-				<option value="l" SELECTED>biography of arranger or transcriber</option>
+				<option value="l" selected="selected">biography of arranger or transcriber</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">biography of arranger or transcriber</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9r" -->
-				<option value="r" SELECTED>instructional material</option>
+				<option value="r" selected="selected">instructional material</option>
 			<!-- TMPL_ELSE -->
 				<option value="r">instructional material</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9s" -->
-				<option value="s" SELECTED>score</option>
+				<option value="s" selected="selected">score</option>
 			<!-- TMPL_ELSE -->
 				<option value="s">score</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9z" -->
-				<option value="z" SELECTED>other accompanying textual material</option>
+				<option value="z" selected="selected">other accompanying textual material</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other accompanying textual material</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 	<tr>
-		<td>Accompanying textual material 3:</td>
+		<td><label for="f10">Accompanying textual material 3:</label></td>
 		<td>
-			<select name="f10" size="1">
+			<select name="f10" id="f10" size="1">
 			
 			<!-- TMPL_IF name="f10 " -->
-				<option value=" " SELECTED>non required value</option>
+				<option value=" " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10a" -->
-				<option value="a" SELECTED>discography</option>
+				<option value="a" selected="selected">discography</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">discography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10b" -->
-				<option value="b" SELECTED>bibliography</option>
+				<option value="b" selected="selected">bibliography</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">bibliography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10c" -->
-				<option value="c" SELECTED>thematic index</option>
+				<option value="c" selected="selected">thematic index</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">thematic index</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10d" -->
-				<option value="d" SELECTED>libretto or text</option>
+				<option value="d" selected="selected">libretto or text</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">libretto or text</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10e" -->
-				<option value="e" SELECTED>biography of composer</option>
+				<option value="e" selected="selected">biography of composer</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">biography of composer</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10f" -->
-				<option value="f" SELECTED>biography of performer or history of ensemble</option>
+				<option value="f" selected="selected">biography of performer or history of ensemble</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">biography of performer or history of ensemble</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10g" -->
-				<option value="g" SELECTED>technical or historical information on instruments</option>
+				<option value="g" selected="selected">technical or historical information on instruments</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">technical or historical information on instruments</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10h" -->
-				<option value="h" SELECTED>technical information on music</option>
+				<option value="h" selected="selected">technical information on music</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">technical information on music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10i" -->
-				<option value="i" SELECTED>historical information about music</option>
+				<option value="i" selected="selected">historical information about music</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">historical information about music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10j" -->
-				<option value="j" SELECTED>other historical information</option>
+				<option value="j" selected="selected">other historical information</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">other historical information</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10k" -->
-				<option value="k" SELECTED>ethnological information</option>
+				<option value="k" selected="selected">ethnological information</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">ethnological information</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10l" -->
-				<option value="l" SELECTED>biography of arranger or transcriber</option>
+				<option value="l" selected="selected">biography of arranger or transcriber</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">biography of arranger or transcriber</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10r" -->
-				<option value="r" SELECTED>instructional material</option>
+				<option value="r" selected="selected">instructional material</option>
 			<!-- TMPL_ELSE -->
 				<option value="r">instructional material</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10s" -->
-				<option value="s" SELECTED>score</option>
+				<option value="s" selected="selected">score</option>
 			<!-- TMPL_ELSE -->
 				<option value="s">score</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10z" -->
-				<option value="z" SELECTED>other accompanying textual material</option>
+				<option value="z" selected="selected">other accompanying textual material</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other accompanying textual material</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 	<tr>
-		<td>Accompanying textual material 4:</td>
+		<td><label for="f11">Accompanying textual material 4:</label></td>
 		<td>
-			<select name="f11" size="1">
+			<select name="f11" id="f11" size="1">
 			
 			<!-- TMPL_IF name="f11 " -->
-				<option value=" " SELECTED>non required value</option>
+				<option value=" " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11a" -->
-				<option value="a" SELECTED>discography</option>
+				<option value="a" selected="selected">discography</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">discography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11b" -->
-				<option value="b" SELECTED>bibliography</option>
+				<option value="b" selected="selected">bibliography</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">bibliography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11c" -->
-				<option value="c" SELECTED>thematic index</option>
+				<option value="c" selected="selected">thematic index</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">thematic index</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11d" -->
-				<option value="d" SELECTED>libretto or text</option>
+				<option value="d" selected="selected">libretto or text</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">libretto or text</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11e" -->
-				<option value="e" SELECTED>biography of composer</option>
+				<option value="e" selected="selected">biography of composer</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">biography of composer</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11f" -->
-				<option value="f" SELECTED>biography of performer or history of ensemble</option>
+				<option value="f" selected="selected">biography of performer or history of ensemble</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">biography of performer or history of ensemble</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11g" -->
-				<option value="g" SELECTED>technical or historical information on instruments</option>
+				<option value="g" selected="selected">technical or historical information on instruments</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">technical or historical information on instruments</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11h" -->
-				<option value="h" SELECTED>technical information on music</option>
+				<option value="h" selected="selected">technical information on music</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">technical information on music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11i" -->
-				<option value="i" SELECTED>historical information about music</option>
+				<option value="i" selected="selected">historical information about music</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">historical information about music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11j" -->
-				<option value="j" SELECTED>other historical information</option>
+				<option value="j" selected="selected">other historical information</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">other historical information</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11k" -->
-				<option value="k" SELECTED>ethnological information</option>
+				<option value="k" selected="selected">ethnological information</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">ethnological information</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11l" -->
-				<option value="l" SELECTED>biography of arranger or transcriber</option>
+				<option value="l" selected="selected">biography of arranger or transcriber</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">biography of arranger or transcriber</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11r" -->
-				<option value="r" SELECTED>instructional material</option>
+				<option value="r" selected="selected">instructional material</option>
 			<!-- TMPL_ELSE -->
 				<option value="r">instructional material</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11s" -->
-				<option value="s" SELECTED>score</option>
+				<option value="s" selected="selected">score</option>
 			<!-- TMPL_ELSE -->
 				<option value="s">score</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11z" -->
-				<option value="z" SELECTED>other accompanying textual material</option>
+				<option value="z" selected="selected">other accompanying textual material</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other accompanying textual material</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 	<tr>
-		<td>Accompanying textual material 5:</td>
+		<td><label for="f12">Accompanying textual material 5:</label></td>
 		<td>
-			<select name="f12" size="1">
+			<select name="f12" id="f12" size="1">
                         <!-- TMPL_IF NAME="f12 "-->
-                            <option value=" " SELECTED>non required value</option>
+                            <option value=" " selected="selected">non required value</option>
                         <!-- TMPL_ELSE -->
                             <option value=" ">non required value</option>
                         <!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12a" -->
-				<option value="a" SELECTED>discography</option>
+				<option value="a" selected="selected">discography</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">discography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12b" -->
-				<option value="b" SELECTED>bibliography</option>
+				<option value="b" selected="selected">bibliography</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">bibliography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12c" -->
-				<option value="c" SELECTED>thematic index</option>
+				<option value="c" selected="selected">thematic index</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">thematic index</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12d" -->
-				<option value="d" SELECTED>libretto or text</option>
+				<option value="d" selected="selected">libretto or text</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">libretto or text</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12e" -->
-				<option value="e" SELECTED>biography of composer</option>
+				<option value="e" selected="selected">biography of composer</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">biography of composer</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12f" -->
-				<option value="f" SELECTED>biography of performer or history of ensemble</option>
+				<option value="f" selected="selected">biography of performer or history of ensemble</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">biography of performer or history of ensemble</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12g" -->
-				<option value="g" SELECTED>technical or historical information on instruments</option>
+				<option value="g" selected="selected">technical or historical information on instruments</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">technical or historical information on instruments</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12h" -->
-				<option value="h" SELECTED>technical information on music</option>
+				<option value="h" selected="selected">technical information on music</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">technical information on music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12i" -->
-				<option value="i" SELECTED>historical information about music</option>
+				<option value="i" selected="selected">historical information about music</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">historical information about music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12j" -->
-				<option value="j" SELECTED>other historical information</option>
+				<option value="j" selected="selected">other historical information</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">other historical information</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12k" -->
-				<option value="k" SELECTED>ethnological information</option>
+				<option value="k" selected="selected">ethnological information</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">ethnological information</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12l" -->
-				<option value="l" SELECTED>biography of arranger or transcriber</option>
+				<option value="l" selected="selected">biography of arranger or transcriber</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">biography of arranger or transcriber</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12r" -->
-				<option value="r" SELECTED>instructional material</option>
+				<option value="r" selected="selected">instructional material</option>
 			<!-- TMPL_ELSE -->
 				<option value="r">instructional material</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12s" -->
-				<option value="s" SELECTED>score</option>
+				<option value="s" selected="selected">score</option>
 			<!-- TMPL_ELSE -->
 				<option value="s">score</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12z" -->
-				<option value="z" SELECTED>other accompanying textual material</option>
+				<option value="z" selected="selected">other accompanying textual material</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other accompanying textual material</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 	<tr>
-		<td>Accompanying textual material 6:</td>
+		<td><label for="f13">Accompanying textual material 6:</label></td>
 		<td>
-			<select name="f13" size="1">
+			<select name="f13" id="f13" size="1">
                         <!-- TMPL_IF NAME="f13 "-->
-                            <option value=" " SELECTED>non required value</option>
+                            <option value=" " selected="selected">non required value</option>
                         <!-- TMPL_ELSE -->
                             <option value=" ">non required value</option>
                         <!-- /TMPL_IF -->
                         
 			<!-- TMPL_IF name="f13a" -->
-				<option value="a" SELECTED>discography</option>
+				<option value="a" selected="selected">discography</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">discography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13b" -->
-				<option value="b" SELECTED>bibliography</option>
+				<option value="b" selected="selected">bibliography</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">bibliography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13c" -->
-				<option value="c" SELECTED>thematic index</option>
+				<option value="c" selected="selected">thematic index</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">thematic index</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13d" -->
-				<option value="d" SELECTED>libretto or text</option>
+				<option value="d" selected="selected">libretto or text</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">libretto or text</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13e" -->
-				<option value="e" SELECTED>biography of composer</option>
+				<option value="e" selected="selected">biography of composer</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">biography of composer</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13f" -->
-				<option value="f" SELECTED>biography of performer or history of ensemble</option>
+				<option value="f" selected="selected">biography of performer or history of ensemble</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">biography of performer or history of ensemble</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13g" -->
-				<option value="g" SELECTED>technical or historical information on instruments</option>
+				<option value="g" selected="selected">technical or historical information on instruments</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">technical or historical information on instruments</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13h" -->
-				<option value="h" SELECTED>technical information on music</option>
+				<option value="h" selected="selected">technical information on music</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">technical information on music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13i" -->
-				<option value="i" SELECTED>historical information about music</option>
+				<option value="i" selected="selected">historical information about music</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">historical information about music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13j" -->
-				<option value="j" SELECTED>other historical information</option>
+				<option value="j" selected="selected">other historical information</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">other historical information</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13k" -->
-				<option value="k" SELECTED>ethnological information</option>
+				<option value="k" selected="selected">ethnological information</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">ethnological information</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13l" -->
-				<option value="l" SELECTED>biography of arranger or transcriber</option>
+				<option value="l" selected="selected">biography of arranger or transcriber</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">biography of arranger or transcriber</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13r" -->
-				<option value="r" SELECTED>instructional material</option>
+				<option value="r" selected="selected">instructional material</option>
 			<!-- TMPL_ELSE -->
 				<option value="r">instructional material</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13s" -->
-				<option value="s" SELECTED>score</option>
+				<option value="s" selected="selected">score</option>
 			<!-- TMPL_ELSE -->
 				<option value="s">score</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13z" -->
-				<option value="z" SELECTED>other accompanying textual material</option>
+				<option value="z" selected="selected">other accompanying textual material</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other accompanying textual material</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 	<tr>
-		<td>Recording technique:</td>
+		<td><label for="f14">Recording technique:</label></td>
 		<td>
-			<select name="f14" size="1">
+			<select name="f14" id="f14" size="1">
 			<!-- TMPL_IF name="f14a" -->
-				<option value="a" SELECTED>acoustic</option>
+				<option value="a" selected="selected">acoustic</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">acoustic</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14b" -->
-				<option value="b" SELECTED>electric</option>
+				<option value="b" selected="selected">electric</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">electric</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14c" -->
-				<option value="c" SELECTED>digital</option>
+				<option value="c" selected="selected">digital</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">digital</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 	<tr>
-		<td>Special reproduction characteristics:</td>
+		<td><label for="f15">Special reproduction characteristics:</label></td>
 		<td>
-			<select name="f15" size="1">
+			<select name="f15" id="f15" size="1">
 			<!-- TMPL_IF name="f15a" -->
-				<option value="a" SELECTED>NAB standard</option>
+				<option value="a" selected="selected">NAB standard</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">NAB standard</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15b" -->
-				<option value="b" SELECTED>CCIR/IEC standard</option>
+				<option value="b" selected="selected">CCIR/IEC standard</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">CCIR/IEC standard</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15c" -->
-				<option value="c" SELECTED>DBX processed</option>
+				<option value="c" selected="selected">DBX processed</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">DBX processed</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15d" -->
-				<option value="d" SELECTED>digital (compact disc)</option>
+				<option value="d" selected="selected">digital (compact disc)</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">digital (compact disc)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15e" -->
-				<option value="e" SELECTED>Dolby-A encoded</option>
+				<option value="e" selected="selected">Dolby-A encoded</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">Dolby-A encoded</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15f" -->
-				<option value="f" SELECTED>Dolby-B encoded</option>
+				<option value="f" selected="selected">Dolby-B encoded</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">Dolby-B encoded</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15g" -->
-				<option value="g" SELECTED>Dolby-C encoded</option>
+				<option value="g" selected="selected">Dolby-C encoded</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">Dolby-C encoded</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15h" -->
-				<option value="h" SELECTED>CX encoded</option>
+				<option value="h" selected="selected">CX encoded</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">CX encoded</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15x" -->
-				<option value="x" SELECTED>not applicable</option>
+				<option value="x" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not applicable</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
+//<![CDATA[
 	function report() {
             var doc   = opener.document; 
             var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
@@ -1037,6 +1035,7 @@
 	    window.close();
 	    return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126b.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126b.tmpl
index 639fac6..e43cb39 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126b.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126b.tmpl
@@ -1,178 +1,176 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 126b builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 126b builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 126b builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Kind of disc, cylinder or tape:</td>
+		<td><label for="f1">Kind of disc, cylinder or tape:</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
 
 			<!-- TMPL_IF name="f1a" -->
-				<option value="a" SELECTED>instantaneous (unique, cut on the spot)</option>
+				<option value="a" selected="selected">instantaneous (unique, cut on the spot)</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">instantaneous (unique, cut on the spot)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1b" -->
-				<option value="b" SELECTED>mass produced</option>
+				<option value="b" selected="selected">mass produced</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">mass produced</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1c" -->
-				<option value="c" SELECTED>master tape</option>
+				<option value="c" selected="selected">master tape</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">master tape</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1d" -->
-				<option value="d" SELECTED>tape duplication master</option>
+				<option value="d" selected="selected">tape duplication master</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">tape duplication master</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1e" -->
-				<option value="e" SELECTED>disc master (negative)</option>
+				<option value="e" selected="selected">disc master (negative)</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">disc master (negative)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1f" -->
-				<option value="f" SELECTED>mother (positive)</option>
+				<option value="f" selected="selected">mother (positive)</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">mother (positive)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1g" -->
-				<option value="g" SELECTED>stamper (negative)</option>
+				<option value="g" selected="selected">stamper (negative)</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">stamper (negative)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1h" -->
-				<option value="h" SELECTED>test pressing</option>
+				<option value="h" selected="selected">test pressing</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">test pressing</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 	<tr>
-		<td>Kind of material:</td>
+		<td><label for="f2">Kind of material:</label></td>
 		<td>
-			<select name="f2" size="1">
+			<select name="f2" id="f2" size="1">
 
 			<!-- TMPL_IF name="f2u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2x" -->
-				<option value="x" SELECTED>not applicable</option>
+				<option value="x" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not applicable</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2g" -->
-				<option value="g" SELECTED>wax (instantaneous)</option>
+				<option value="g" selected="selected">wax (instantaneous)</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">wax (instantaneous)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2h" -->
-				<option value="h" SELECTED>plastic (mass produced)</option>
+				<option value="h" selected="selected">plastic (mass produced)</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">plastic (mass produced)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2a" -->
-				<option value="a" SELECTED>lacquered (e.g. acetate)</option>
+				<option value="a" selected="selected">lacquered (e.g. acetate)</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">lacquered (e.g. acetate)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2b" -->
-				<option value="b" SELECTED>metal (e.g. aluminium)</option>
+				<option value="b" selected="selected">metal (e.g. aluminium)</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">metal (e.g. aluminium)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2c" -->
-				<option value="c" SELECTED>shellac pressing</option>
+				<option value="c" selected="selected">shellac pressing</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">shellac pressing</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2d" -->
-				<option value="d" SELECTED>plastic pressing</option>
+				<option value="d" selected="selected">plastic pressing</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">plastic pressing</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2e" -->
-				<option value="e" SELECTED>metal and plastic (compact discs)</option>
+				<option value="e" selected="selected">metal and plastic (compact discs)</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">metal and plastic (compact discs)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2i" -->
-				<option value="i" SELECTED>paper backed</option>
+				<option value="i" selected="selected">paper backed</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">paper backed</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2j" -->
-				<option value="j" SELECTED>acetate</option>
+				<option value="j" selected="selected">acetate</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">acetate</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2k" -->
-				<option value="k" SELECTED>P.V.C.</option>
+				<option value="k" selected="selected">P.V.C.</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">P.V.C.</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2l" -->
-				<option value="l" SELECTED>polyester</option>
+				<option value="l" selected="selected">polyester</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">polyester</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 	<tr>
-		<td>Kind of cutting:</td>
+		<td><label for="f3">Kind of cutting:</label></td>
 		<td>
-			<select name="f3" size="1">
+			<select name="f3" id="f3" size="1">
 			<!-- TMPL_IF name="f3a" -->
-				<option value="a" SELECTED>lateral or combined cutting</option>
+				<option value="a" selected="selected">lateral or combined cutting</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">lateral or combined cutting</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3b" -->
-				<option value="b" SELECTED>vertical (hill and dale) cutting</option>
+				<option value="b" selected="selected">vertical (hill and dale) cutting</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">vertical (hill and dale) cutting</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3x" -->
-				<option value="x" SELECTED>not applicable</option>
+				<option value="x" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not applicable</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
-<script>
+<script type="text/javascript">
+//<![CDATA[
 	function report() {
 
 
@@ -183,6 +181,7 @@
 		self.close();
 		return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_127.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_127.tmpl
index d245e2d..084f771 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_127.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_127.tmpl
@@ -1,34 +1,30 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 127 builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 127 builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 127 builder</h3>
+<form name="f_pop" action="">
 <table>
-<tr>(Complete with 0 on the left)</tr>
-<tr>          <td>Hours:</td>
-                         <td><input type="text" name="f1" maxlength=2
-                         size=3
-                   value="<!-- TMPL_VAR name="f1" -->"></td>
-          <td>Minutes:</td>
-                         <td><input type="text" name="f2" maxlength=2
-                         size=3
-                   value="<!-- TMPL_VAR name="f2" -->"></td>
-          <td>Seconds:</td>
-                         <td><input type="text" name="f3" maxlength=2
-                         size=3
-                   value="<!-- TMPL_VAR name="f3" -->"></td>
+<tr><th colspan="9">(Complete with 0 on the left)</th></tr>
+<tr>          <td><label for="f1">Hours:</label></td>
+                         <td><input type="text" name="f1" id="f1" maxlength="2"
+                         size="3"
+                   value="<!-- TMPL_VAR name="f1" -->" /></td>
+          <td><label for="f2">Minutes:</label></td>
+                         <td><input type="text" name="f2" id="f2" maxlength="2"
+                         size="3"
+                   value="<!-- TMPL_VAR name="f2" -->" /></td>
+          <td><label for="f3">Seconds:</label></td>
+                         <td><input type="text" name="f3" id="f3" maxlength="2"
+                         size="3"
+                   value="<!-- TMPL_VAR name="f3" -->" /></td>
 </tr>
-
-
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
-<script>
+<script type="text/javascript">
+//<![CDATA[
 	function report() {
 document.f_pop.f1.value=document.f_pop.f1.value+'   ';
 document.f_pop.f2.value=document.f_pop.f2.value+'  ';
@@ -48,6 +44,7 @@ document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);
 		self.close();
 		return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128a.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128a.tmpl
index a157417..58631be 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128a.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128a.tmpl
@@ -1,374 +1,372 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 128a builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 128a builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 128a builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Form of Musical Work:</td>
+		<td><label for="f1">Form of Musical Work:</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
 			<!-- TMPL_IF name="f1ai" -->
-				<option value="ai#" SELECTED>air</option>
+				<option value="ai#" selected="selected">air</option>
 			<!-- TMPL_ELSE -->
 				<option value="ai#">air</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1an" -->
-				<option value="an#" SELECTED>anthem </option>
+				<option value="an#" selected="selected">anthem </option>
 			<!-- TMPL_ELSE -->
 				<option value="an#">anthem </option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ar" -->
-				<option value="ar#" SELECTED>aria</option>
+				<option value="ar#" selected="selected">aria</option>
 			<!-- TMPL_ELSE -->
 				<option value="ar#">aria</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1bt" -->
-				<option value="bt#" SELECTED>ballet</option>
+				<option value="bt#" selected="selected">ballet</option>
 			<!-- TMPL_ELSE -->
 				<option value="bt#">ballet</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1bd" -->
-				<option value="bd#" SELECTED>ballad</option>
+				<option value="bd#" selected="selected">ballad</option>
 			<!-- TMPL_ELSE -->
 				<option value="bd#">ballad</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1bg" -->
-				<option value="bg#" SELECTED>bluegrass</option>
+				<option value="bg#" selected="selected">bluegrass</option>
 			<!-- TMPL_ELSE -->
 				<option value="bg#">bluegrass</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1bl" -->
-				<option value="bl#" SELECTED>blues</option>
+				<option value="bl#" selected="selected">blues</option>
 			<!-- TMPL_ELSE -->
 				<option value="bl#">blues</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1cb" -->
-				<option value="cb#" SELECTED>chant, non christian</option>
+				<option value="cb#" selected="selected">chant, non christian</option>
 			<!-- TMPL_ELSE -->
 				<option value="cb#">chant, non christian</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1cc" -->
-				<option value="cc#" SELECTED>chant, christian</option>
+				<option value="cc#" selected="selected">chant, christian</option>
 			<!-- TMPL_ELSE -->
 				<option value="cc#">chant, christian</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1cl" -->
-				<option value="cl#" SELECTED>choral-prelude</option>
+				<option value="cl#" selected="selected">choral-prelude</option>
 			<!-- TMPL_ELSE -->
 				<option value="cl#">choral-prelude</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1cg" -->
-				<option value="cg#" SELECTED>concerto grosso</option>
+				<option value="cg#" selected="selected">concerto grosso</option>
 			<!-- TMPL_ELSE -->
 				<option value="cg#">concerto grosso</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ch" -->
-				<option value="ch#" SELECTED>choral</option>
+				<option value="ch#" selected="selected">choral</option>
 			<!-- TMPL_ELSE -->
 				<option value="ch#">choral</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1cn" -->
-				<option value="cn#" SELECTED>canon</option>
+				<option value="cn#" selected="selected">canon</option>
 			<!-- TMPL_ELSE -->
 				<option value="cn#">canon</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1co" -->
-				<option value="co#" SELECTED>concerto</option>
+				<option value="co#" selected="selected">concerto</option>
 			<!-- TMPL_ELSE -->
 				<option value="co#">concerto</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1cp" -->
-				<option value="cp#" SELECTED>chanson, polyphonic</option>
+				<option value="cp#" selected="selected">chanson, polyphonic</option>
 			<!-- TMPL_ELSE -->
 				<option value="cp#">chanson, polyphonic</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1cr" -->
-				<option value="cr#" SELECTED>carol</option>
+				<option value="cr#" selected="selected">carol</option>
 			<!-- TMPL_ELSE -->
 				<option value="cr#">carol</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1cs" -->
-				<option value="cs#" SELECTED>chance composition / aleatoric music</option>
+				<option value="cs#" selected="selected">chance composition / aleatoric music</option>
 			<!-- TMPL_ELSE -->
 				<option value="cs#">chance composition / aleatoric music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ct" -->
-				<option value="ct#" SELECTED>cantata</option>
+				<option value="ct#" selected="selected">cantata</option>
 			<!-- TMPL_ELSE -->
 				<option value="ct#">cantata</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1cy" -->
-				<option value="cy#" SELECTED>country music</option>
+				<option value="cy#" selected="selected">country music</option>
 			<!-- TMPL_ELSE -->
 				<option value="cy#">country music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1cz" -->
-				<option value="cz#" SELECTED>canzona</option>
+				<option value="cz#" selected="selected">canzona</option>
 			<!-- TMPL_ELSE -->
 				<option value="cz#">canzona</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1df" -->
-				<option value="df#" SELECTED>danse form</option>
+				<option value="df#" selected="selected">danse form</option>
 			<!-- TMPL_ELSE -->
 				<option value="df#">danse form</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1dv" -->
-				<option value="dv#" SELECTED>divertimento</option>
+				<option value="dv#" selected="selected">divertimento</option>
 			<!-- TMPL_ELSE -->
 				<option value="dv#">divertimento</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1fg" -->
-				<option value="fg#" SELECTED>fugue</option>
+				<option value="fg#" selected="selected">fugue</option>
 			<!-- TMPL_ELSE -->
 				<option value="fg#">fugue</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1fm" -->
-				<option value="fm#" SELECTED>folk music</option>
+				<option value="fm#" selected="selected">folk music</option>
 			<!-- TMPL_ELSE -->
 				<option value="fm#">folk music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ft" -->
-				<option value="ft#" SELECTED>fantasia</option>
+				<option value="ft#" selected="selected">fantasia</option>
 			<!-- TMPL_ELSE -->
 				<option value="ft#">fantasia</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1gm" -->
-				<option value="gm#" SELECTED>gospel music</option>
+				<option value="gm#" selected="selected">gospel music</option>
 			<!-- TMPL_ELSE -->
 				<option value="gm#">gospel music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1hy" -->
-				<option value="hy#" SELECTED>hymn</option>
+				<option value="hy#" selected="selected">hymn</option>
 			<!-- TMPL_ELSE -->
 				<option value="hy#">hymn</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1in" -->
-				<option value="in#" SELECTED>intermezzo</option>
+				<option value="in#" selected="selected">intermezzo</option>
 			<!-- TMPL_ELSE -->
 				<option value="in#">intermezzo</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1jz" -->
-				<option value="jz#" SELECTED>jazz</option>
+				<option value="jz#" selected="selected">jazz</option>
 			<!-- TMPL_ELSE -->
 				<option value="jz#">jazz</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1li" -->
-				<option value="li#" SELECTED>lied</option>
+				<option value="li#" selected="selected">lied</option>
 			<!-- TMPL_ELSE -->
 				<option value="li#">lied</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1mc" -->
-				<option value="mc#" SELECTED>musical revue and comedy</option>
+				<option value="mc#" selected="selected">musical revue and comedy</option>
 			<!-- TMPL_ELSE -->
 				<option value="mc#">musical revue and comedy</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1md" -->
-				<option value="md#" SELECTED>madrigal</option>
+				<option value="md#" selected="selected">madrigal</option>
 			<!-- TMPL_ELSE -->
 				<option value="md#">madrigal</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1mi" -->
-				<option value="mi#" SELECTED>minuet</option>
+				<option value="mi#" selected="selected">minuet</option>
 			<!-- TMPL_ELSE -->
 				<option value="mi#">minuet</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1mr" -->
-				<option value="mr#" SELECTED>march</option>
+				<option value="mr#" selected="selected">march</option>
 			<!-- TMPL_ELSE -->
 				<option value="mr#">march</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ms" -->
-				<option value="ms#" SELECTED>mass</option>
+				<option value="ms#" selected="selected">mass</option>
 			<!-- TMPL_ELSE -->
 				<option value="ms#">mass</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1mo" -->
-				<option value="mo#" SELECTED>motet</option>
+				<option value="mo#" selected="selected">motet</option>
 			<!-- TMPL_ELSE -->
 				<option value="mo#">motet</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1mp" -->
-				<option value="mp#" SELECTED>moving picture music</option>
+				<option value="mp#" selected="selected">moving picture music</option>
 			<!-- TMPL_ELSE -->
 				<option value="mp#">moving picture music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1mu" -->
-				<option value="mu#" SELECTED>multiple forms</option>
+				<option value="mu#" selected="selected">multiple forms</option>
 			<!-- TMPL_ELSE -->
 				<option value="mu#">multiple forms</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1mz" -->
-				<option value="mz#" SELECTED>mazurka</option>
+				<option value="mz#" selected="selected">mazurka</option>
 			<!-- TMPL_ELSE -->
 				<option value="mz#">mazurka</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1nc" -->
-				<option value="nc#" SELECTED>nocturne</option>
+				<option value="nc#" selected="selected">nocturne</option>
 			<!-- TMPL_ELSE -->
 				<option value="nc#">nocturne</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1op" -->
-				<option value="op#" SELECTED>opera</option>
+				<option value="op#" selected="selected">opera</option>
 			<!-- TMPL_ELSE -->
 				<option value="op#">opera</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1or" -->
-				<option value="or#" SELECTED>oratorio</option>
+				<option value="or#" selected="selected">oratorio</option>
 			<!-- TMPL_ELSE -->
 				<option value="or#">oratorio</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ov" -->
-				<option value="ov#" SELECTED>overture</option>
+				<option value="ov#" selected="selected">overture</option>
 			<!-- TMPL_ELSE -->
 				<option value="ov#">overture</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1pf" -->
-				<option value="pf#" SELECTED>prelude and fugue</option>
+				<option value="pf#" selected="selected">prelude and fugue</option>
 			<!-- TMPL_ELSE -->
 				<option value="pf#">prelude and fugue</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1pg" -->
-				<option value="pg#" SELECTED>programme music</option>
+				<option value="pg#" selected="selected">programme music</option>
 			<!-- TMPL_ELSE -->
 				<option value="pg#">programme music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1pm" -->
-				<option value="pm#" SELECTED>passion music</option>
+				<option value="pm#" selected="selected">passion music</option>
 			<!-- TMPL_ELSE -->
 				<option value="pm#">passion music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1po" -->
-				<option value="po#" SELECTED>polonaise</option>
+				<option value="po#" selected="selected">polonaise</option>
 			<!-- TMPL_ELSE -->
 				<option value="po#">polonaise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1pp" -->
-				<option value="pp#" SELECTED>popular music</option>
+				<option value="pp#" selected="selected">popular music</option>
 			<!-- TMPL_ELSE -->
 				<option value="pp#">popular music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ps" -->
-				<option value="ps#" SELECTED>passacaglia</option>
+				<option value="ps#" selected="selected">passacaglia</option>
 			<!-- TMPL_ELSE -->
 				<option value="ps#">passacaglia</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1pt" -->
-				<option value="p#" SELECTED>partsong</option>
+				<option value="p#" selected="selected">partsong</option>
 			<!-- TMPL_ELSE -->
 				<option value="pt#">partsong</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1pv" -->
-				<option value="pv#" SELECTED>pavan</option>
+				<option value="pv#" selected="selected">pavan</option>
 			<!-- TMPL_ELSE -->
 				<option value="pv#">pavan</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1rc" -->
-				<option value="rc#" SELECTED>rock music</option>
+				<option value="rc#" selected="selected">rock music</option>
 			<!-- TMPL_ELSE -->
 				<option value="rc#">rock music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1rd" -->
-				<option value="rd#" SELECTED>rondo</option>
+				<option value="rd#" selected="selected">rondo</option>
 			<!-- TMPL_ELSE -->
 				<option value="rd#">rondo</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1rg" -->
-				<option value="rg#" SELECTED>ragtime</option>
+				<option value="rg#" selected="selected">ragtime</option>
 			<!-- TMPL_ELSE -->
 				<option value="rg#">ragtime</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ri" -->
-				<option value="ri#" SELECTED>ricercare</option>
+				<option value="ri#" selected="selected">ricercare</option>
 			<!-- TMPL_ELSE -->
 				<option value="ri#">ricercare</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1rp" -->
-				<option value="rp#" SELECTED>rhapsody</option>
+				<option value="rp#" selected="selected">rhapsody</option>
 			<!-- TMPL_ELSE -->
 				<option value="rp#">rhapsody</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1rq" -->
-				<option value="rq#" SELECTED>requiem mass</option>
+				<option value="rq#" selected="selected">requiem mass</option>
 			<!-- TMPL_ELSE -->
 				<option value="rq#">requiem mass</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1sg" -->
-				<option value="sg#" SELECTED>song</option>
+				<option value="sg#" selected="selected">song</option>
 			<!-- TMPL_ELSE -->
 				<option value="sg#">song</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1si" -->
-				<option value="si#" SELECTED>sinfonia</option>
+				<option value="si#" selected="selected">sinfonia</option>
 			<!-- TMPL_ELSE -->
 				<option value="si#">sinfonia</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1sn" -->
-				<option value="sn#" SELECTED>sonata</option>
+				<option value="sn#" selected="selected">sonata</option>
 			<!-- TMPL_ELSE -->
 				<option value="sn#">sonata</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1sp" -->
-				<option value="sp#" SELECTED>symphonic poem</option>
+				<option value="sp#" selected="selected">symphonic poem</option>
 			<!-- TMPL_ELSE -->
 				<option value="sp#">symphonic poem</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1sq" -->
-				<option value="sq#" SELECTED>square dance</option>
+				<option value="sq#" selected="selected">square dance</option>
 			<!-- TMPL_ELSE -->
 				<option value="sq#">square dance</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1st" -->
-				<option value="st#" SELECTED>study, exercise</option>
+				<option value="st#" selected="selected">study, exercise</option>
 			<!-- TMPL_ELSE -->
 				<option value="st#">study, exercise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1su" -->
-				<option value="su#" SELECTED>suite</option>
+				<option value="su#" selected="selected">suite</option>
 			<!-- TMPL_ELSE -->
 				<option value="su#">suite</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1sy" -->
-				<option value="sy#" SELECTED>symphony</option>
+				<option value="sy#" selected="selected">symphony</option>
 			<!-- TMPL_ELSE -->
 				<option value="sy#">symphony</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1tc" -->
-				<option value="tc#" SELECTED>toccata</option>
+				<option value="tc#" selected="selected">toccata</option>
 			<!-- TMPL_ELSE -->
 				<option value="tc#">toccata</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ts" -->
-				<option value="ts#" SELECTED>triosonata</option>
+				<option value="ts#" selected="selected">triosonata</option>
 			<!-- TMPL_ELSE -->
 				<option value="ts#">triosonata</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1vr" -->
-				<option value="vr#" SELECTED>variation</option>
+				<option value="vr#" selected="selected">variation</option>
 			<!-- TMPL_ELSE -->
 				<option value="vr#">variation</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1wz" -->
-				<option value="wz#" SELECTED>waltz</option>
+				<option value="wz#" selected="selected">waltz</option>
 			<!-- TMPL_ELSE -->
 				<option value="wz#">waltz</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1zz" -->
-				<option value="zz#" SELECTED>other form</option>
+				<option value="zz#" selected="selected">other form</option>
 			<!-- TMPL_ELSE -->
 				<option value="zz#">other form</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
+//<![CDATA[
     function report() {
         var doc   = opener.document; 
         var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
@@ -376,6 +374,7 @@
         window.close();
         return false;
     }
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128b.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128b.tmpl
index 9fd586f..822db8e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128b.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128b.tmpl
@@ -1,473 +1,469 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_constructeur champ 128b</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 128b builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 128b builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Instruments ou voix dans un ensemble:</td>
+		<td><label for="f1">Instruments ou voix dans un ensemble:</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
 			<!-- TMPL_IF name="f1|" -->
-            	<option value="|" SELECTED>|- Caractère de remplissage</option>
+            	<option value="|" selected="selected">|- Caractère de remplissage</option>
             <!-- TMPL_ELSE -->
             	<option value="|">|- Caractère de remplissage</option>
             <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f1ba" -->
-				<option value="ba" SELECTED>Cor</option>
+				<option value="ba" selected="selected">Cor</option>
 			<!-- TMPL_ELSE -->
 				<option value="ba">Cor</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1bb" -->
-				<option value="bb" SELECTED>Trompette</option>
+				<option value="bb" selected="selected">Trompette</option>
 			<!-- TMPL_ELSE -->
 				<option value="bb">Trompette</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1bc" -->
-				<option value="bc" SELECTED>Cornet a piston</option>
+				<option value="bc" selected="selected">Cornet a piston</option>
 			<!-- TMPL_ELSE -->
 				<option value="bc">Cornet a piston</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1bd" -->
-				<option value="bd" SELECTED>Trombone</option>
+				<option value="bd" selected="selected">Trombone</option>
 			<!-- TMPL_ELSE -->
 				<option value="bd">Trombone</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1be" -->
-				<option value="be" SELECTED>Tuba</option>
+				<option value="be" selected="selected">Tuba</option>
 			<!-- TMPL_ELSE -->
 				<option value="be">Tuba</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1bf" -->
-				<option value="bf" SELECTED>Saxophone</option>
+				<option value="bf" selected="selected">Saxophone</option>
 			<!-- TMPL_ELSE -->
 				<option value="bf">Saxophone</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1bt" -->
-				<option value="bt" SELECTED>Ethniques</option>
+				<option value="bt" selected="selected">Ethniques</option>
 			<!-- TMPL_ELSE -->
 				<option value="bt">Ethniques</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1bu" -->
-				<option value="bu" SELECTED>Non precise (Cuivre)</option>
+				<option value="bu" selected="selected">Non precise (Cuivre)</option>
 			<!-- TMPL_ELSE -->
 				<option value="bu">Non precise (Cuivre)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1bz" -->
-				<option value="bz" SELECTED>Autre cuivre</option>
+				<option value="bz" selected="selected">Autre cuivre</option>
 			<!-- TMPL_ELSE -->
 				<option value="bz">Autre cuivre</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ca" -->
-				<option value="ca" SELECTED>Mixtes</option>
+				<option value="ca" selected="selected">Mixtes</option>
 			<!-- TMPL_ELSE -->
 				<option value="ca">Mixtes</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1cb" -->
-				<option value="cb" SELECTED>Femmes </option>
+				<option value="cb" selected="selected">Femmes </option>
 			<!-- TMPL_ELSE -->
 				<option value="cb">Femmes</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1cc" -->
-				<option value="cc" SELECTED>Hommes</option>
+				<option value="cc" selected="selected">Hommes</option>
 			<!-- TMPL_ELSE -->
 				<option value="cc">Hommes</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1cd" -->
-				<option value="cd" SELECTED>Enfants</option>
+				<option value="cd" selected="selected">Enfants</option>
 			<!-- TMPL_ELSE -->
 				<option value="cd">Enfants</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ct" -->
-				<option value="ct" SELECTED>Ethniques</option>
+				<option value="ct" selected="selected">Ethniques</option>
 			<!-- TMPL_ELSE -->
 				<option value="ct">Ethniques</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1cu" -->
-				<option value="cu" SELECTED>Non precise (Choeurs)</option>
+				<option value="cu" selected="selected">Non precise (Choeurs)</option>
 			<!-- TMPL_ELSE -->
 				<option value="cu">Non precise (Choeurs)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1oa" -->
-				<option value="oa" SELECTED>Orchestre symphonique</option>
+				<option value="oa" selected="selected">Orchestre symphonique</option>
 			<!-- TMPL_ELSE -->
 				<option value="oa">Orchestre symphonique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ob" -->
-				<option value="ob" SELECTED>Orchestre de chambre</option>
+				<option value="ob" selected="selected">Orchestre de chambre</option>
 			<!-- TMPL_ELSE -->
 				<option value="ob">Orchestre de chambre</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1oc" -->
-				<option value="oc" SELECTED>Orchestres a cordes</option>
+				<option value="oc" selected="selected">Orchestres a cordes</option>
 			<!-- TMPL_ELSE -->
 				<option value="oc">Orchestres a cordes</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1od" -->
-				<option value="od" SELECTED>Fanfare</option>
+				<option value="od" selected="selected">Fanfare</option>
 			<!-- TMPL_ELSE -->
 				<option value="od">Fanfare</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1oe" -->
-				<option value="oe" SELECTED>Orchestre de danse</option>
+				<option value="oe" selected="selected">Orchestre de danse</option>
 			<!-- TMPL_ELSE -->
 				<option value="oe">Orchestre de danse</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1of" -->
-				<option value="of" SELECTED>Grand ensemble - orchestre de cuivres</option>
+				<option value="of" selected="selected">Grand ensemble - orchestre de cuivres</option>
 			<!-- TMPL_ELSE -->
 				<option value="of">Grand ensemble - orchestre de cuivres</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ot" -->
-				<option value="ot" SELECTED>Ethnique</option>
+				<option value="ot" selected="selected">Ethnique</option>
 			<!-- TMPL_ELSE -->
 				<option value="ot">Ethnique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ou" -->
-				<option value="ou" SELECTED>Non precise (orchestre)</option>
+				<option value="ou" selected="selected">Non precise (orchestre)</option>
 			<!-- TMPL_ELSE -->
 				<option value="ou">Non precise (orchestre)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1oz" -->
-				<option value="oz" SELECTED>Autre orchestre</option>
+				<option value="oz" selected="selected">Autre orchestre</option>
 			<!-- TMPL_ELSE -->
 				<option value="oz">Autre orchestre</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1pa" -->
-				<option value="pa" SELECTED>Tympanon</option>
+				<option value="pa" selected="selected">Tympanon</option>
 			<!-- TMPL_ELSE -->
 				<option value="pa">Tympanon</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1pb" -->
-				<option value="pb" SELECTED>Xylophone</option>
+				<option value="pb" selected="selected">Xylophone</option>
 			<!-- TMPL_ELSE -->
 				<option value="pb">Xylophone</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1pc" -->
-				<option value="pc" SELECTED>Marimba</option>
+				<option value="pc" selected="selected">Marimba</option>
 			<!-- TMPL_ELSE -->
 				<option value="pc">Marimba</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1pd" -->
-				<option value="pd" SELECTED>Tambour, batterie</option>
+				<option value="pd" selected="selected">Tambour, batterie</option>
 			<!-- TMPL_ELSE -->
 				<option value="pd">Tambour, batterie</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1pt" -->
-				<option value="pt" SELECTED>Ethnique</option>
+				<option value="pt" selected="selected">Ethnique</option>
 			<!-- TMPL_ELSE -->
 				<option value="pt">Ethnique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1pu" -->
-				<option value="pu" SELECTED>Non precise (percussion)</option>
+				<option value="pu" selected="selected">Non precise (percussion)</option>
 			<!-- TMPL_ELSE -->
 				<option value="pu">Non precise (percussion)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1pz" -->
-				<option value="pz" SELECTED>Autre percussions</option>
+				<option value="pz" selected="selected">Autre percussions</option>
 			<!-- TMPL_ELSE -->
 				<option value="pz">Autre percussions</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1sa" -->
-				<option value="sa" SELECTED>Violon</option>
+				<option value="sa" selected="selected">Violon</option>
 			<!-- TMPL_ELSE -->
 				<option value="sa">Violon</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1sb" -->
-				<option value="sb" SELECTED>Alto</option>
+				<option value="sb" selected="selected">Alto</option>
 			<!-- TMPL_ELSE -->
 				<option value="sb">Alto</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1sc" -->
-				<option value="sc" SELECTED>Violoncelle</option>
+				<option value="sc" selected="selected">Violoncelle</option>
 			<!-- TMPL_ELSE -->
 				<option value="sc">Violoncelle</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1sd" -->
-				<option value="sd" SELECTED>Contrebasse</option>
+				<option value="sd" selected="selected">Contrebasse</option>
 			<!-- TMPL_ELSE -->
 				<option value="sd">Contrebasse</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1se" -->
-				<option value="se" SELECTED>Viole</option>
+				<option value="se" selected="selected">Viole</option>
 			<!-- TMPL_ELSE -->
 				<option value="se">Viole</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1sf" -->
-				<option value="sf" SELECTED>Viole d'amour</option>
+				<option value="sf" selected="selected">Viole d'amour</option>
 			<!-- TMPL_ELSE -->
 				<option value="sf">Viole d'amour</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1sg" -->
-				<option value="sg" SELECTED>Viole de gambe</option>
+				<option value="sg" selected="selected">Viole de gambe</option>
 			<!-- TMPL_ELSE -->
 				<option value="sg">Viole de gambe</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1st" -->
-				<option value="st" SELECTED>Ethnique</option>
+				<option value="st" selected="selected">Ethnique</option>
 			<!-- TMPL_ELSE -->
 				<option value="st">Ethnique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1su" -->
-				<option value="su" SELECTED>Non precise (Corde frottee)</option>
+				<option value="su" selected="selected">Non precise (Corde frottee)</option>
 			<!-- TMPL_ELSE -->
 				<option value="su">Non precise (Corde frottee)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1sz" -->
-				<option value="sz" SELECTED>Autre (Corde frottee)</option>
+				<option value="sz" selected="selected">Autre (Corde frottee)</option>
 			<!-- TMPL_ELSE -->
 				<option value="sz">Autre (Corde frottee)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1uu" -->
-				<option value="uu" SELECTED>Non precise (Non precise)</option>
+				<option value="uu" selected="selected">Non precise (Non precise)</option>
 			<!-- TMPL_ELSE -->
 				<option value="uu">Non precise (Non precise)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ea" -->
-				<option value="ea" SELECTED>Synthetiseur</option>
+				<option value="ea" selected="selected">Synthetiseur</option>
 			<!-- TMPL_ELSE -->
 				<option value="ea">Synthetiseur</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1eb" -->
-				<option value="eb" SELECTED>Bande magnetique</option>
+				<option value="eb" selected="selected">Bande magnetique</option>
 			<!-- TMPL_ELSE -->
 				<option value="eb">Bande magnetique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ec" -->
-				<option value="ec" SELECTED>Ordinateur</option>
+				<option value="ec" selected="selected">Ordinateur</option>
 			<!-- TMPL_ELSE -->
 				<option value="ec">Ordinateur</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ed" -->
-				<option value="ed" SELECTED>Ondes Martenot</option>
+				<option value="ed" selected="selected">Ondes Martenot</option>
 			<!-- TMPL_ELSE -->
 				<option value="ed">Ondes Martenot</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1eu" -->
-				<option value="eu" SELECTED>Non precise (Electronique)</option>
+				<option value="eu" selected="selected">Non precise (Electronique)</option>
 			<!-- TMPL_ELSE -->
 				<option value="eu">Non precise (Electronique)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ez" -->
-				<option value="ez" SELECTED>Autre (Electronique)</option>
+				<option value="ez" selected="selected">Autre (Electronique)</option>
 			<!-- TMPL_ELSE -->
 				<option value="ez">Autre (Electronique)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ka" -->
-				<option value="ka" SELECTED>Piano</option>
+				<option value="ka" selected="selected">Piano</option>
 			<!-- TMPL_ELSE -->
 				<option value="ka">Piano</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1kb" -->
-				<option value="kb" SELECTED>Orgue</option>
+				<option value="kb" selected="selected">Orgue</option>
 			<!-- TMPL_ELSE -->
 				<option value="kb">Orgue</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1kc" -->
-				<option value="kc" SELECTED>Clavecin</option>
+				<option value="kc" selected="selected">Clavecin</option>
 			<!-- TMPL_ELSE -->
 				<option value="kc">Clavecin</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1kd" -->
-				<option value="kd" SELECTED>Clavicorde</option>
+				<option value="kd" selected="selected">Clavicorde</option>
 			<!-- TMPL_ELSE -->
 				<option value="kd">Clavicorde</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ke" -->
-				<option value="ke" SELECTED>Continuo</option>
+				<option value="ke" selected="selected">Continuo</option>
 			<!-- TMPL_ELSE -->
 				<option value="ke">Continuo</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1kf" -->
-				<option value="kf" SELECTED>Celesta</option>
+				<option value="kf" selected="selected">Celesta</option>
 			<!-- TMPL_ELSE -->
 				<option value="kf">Celesta</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1kt" -->
-				<option value="kt" SELECTED>Ethnique</option>
+				<option value="kt" selected="selected">Ethnique</option>
 			<!-- TMPL_ELSE -->
 				<option value="kt">Ethnique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ku" -->
-				<option value="ku" SELECTED>Non precise (clavier)</option>
+				<option value="ku" selected="selected">Non precise (clavier)</option>
 			<!-- TMPL_ELSE -->
 				<option value="ku">Non precise (clavier)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1kz" -->
-				<option value="kz" SELECTED>Autre</option>
+				<option value="kz" selected="selected">Autre</option>
 			<!-- TMPL_ELSE -->
 				<option value="kz">Autre</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1va" -->
-				<option value="va" SELECTED>Soprano</option>
+				<option value="va" selected="selected">Soprano</option>
 			<!-- TMPL_ELSE -->
 				<option value="va">Soprano</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1vb" -->
-				<option value="vb" SELECTED>Mezzo-soprano</option>
+				<option value="vb" selected="selected">Mezzo-soprano</option>
 			<!-- TMPL_ELSE -->
 				<option value="vb">Mezzo-soprano</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1vc" -->
-				<option value="vc" SELECTED>Alto</option>
+				<option value="vc" selected="selected">Alto</option>
 			<!-- TMPL_ELSE -->
 				<option value="vc">Alto</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1vd" -->
-				<option value="vd" SELECTED>Tenor</option>
+				<option value="vd" selected="selected">Tenor</option>
 			<!-- TMPL_ELSE -->
 				<option value="vd">Tenor</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ve" -->
-				<option value="ve" SELECTED>Baryton</option>
+				<option value="ve" selected="selected">Baryton</option>
 			<!-- TMPL_ELSE -->
 				<option value="ve">Baryton</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1vf" -->
-				<option value="vf" SELECTED>Basse</option>
+				<option value="vf" selected="selected">Basse</option>
 			<!-- TMPL_ELSE -->
 				<option value="vf">Basse</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1vg" -->
-				<option value="vg" SELECTED>Haute contre</option>
+				<option value="vg" selected="selected">Haute contre</option>
 			<!-- TMPL_ELSE -->
 				<option value="vg">Haute contre</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1vh" -->
-				<option value="vh" SELECTED>Voix aigues</option>
+				<option value="vh" selected="selected">Voix aigues</option>
 			<!-- TMPL_ELSE -->
 				<option value="vh">Voix aigues</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1vi" -->
-				<option value="vi" SELECTED>Voix medium</option>
+				<option value="vi" selected="selected">Voix medium</option>
 			<!-- TMPL_ELSE -->
 				<option value="vi">Voix medium</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1vj" -->
-				<option value="vj" SELECTED>Voix graves</option>
+				<option value="vj" selected="selected">Voix graves</option>
 			<!-- TMPL_ELSE -->
 				<option value="vj">Voix graves</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1vt" -->
-				<option value="vt" SELECTED>Ethnique</option>
+				<option value="vt" selected="selected">Ethnique</option>
 			<!-- TMPL_ELSE -->
 				<option value="vt">Ethnique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1vu" -->
-				<option value="vu" SELECTED>Non precise (Voix precise)</option>
+				<option value="vu" selected="selected">Non precise (Voix precise)</option>
 			<!-- TMPL_ELSE -->
 				<option value="vu">Non precise (Voix precise)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ta" -->
-				<option value="ta" SELECTED>Harpe</option>
+				<option value="ta" selected="selected">Harpe</option>
 			<!-- TMPL_ELSE -->
 				<option value="ta">Harpe</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1tb" -->
-				<option value="tb" SELECTED>Famille de la guitare</option>
+				<option value="tb" selected="selected">Famille de la guitare</option>
 			<!-- TMPL_ELSE -->
 				<option value="tb">Famille de la guitare</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1tc" -->
-				<option value="tc" SELECTED>Famille du luth</option>
+				<option value="tc" selected="selected">Famille du luth</option>
 			<!-- TMPL_ELSE -->
 				<option value="tc">Famille du luth</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1td" -->
-				<option value="td" SELECTED>Mandoline</option>
+				<option value="td" selected="selected">Mandoline</option>
 			<!-- TMPL_ELSE -->
 				<option value="td">Mandoline</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1tt" -->
-				<option value="tt" SELECTED>Ethnique</option>
+				<option value="tt" selected="selected">Ethnique</option>
 			<!-- TMPL_ELSE -->
 				<option value="tt">Ethnique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1tu" -->
-				<option value="tu" SELECTED>Non precise (Cordes pincees)</option>
+				<option value="tu" selected="selected">Non precise (Cordes pincees)</option>
 			<!-- TMPL_ELSE -->
 				<option value="tu">Non precise (Cordes pincees)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1tz" -->
-				<option value="tz" SELECTED>Autre corde pincee</option>
+				<option value="tz" selected="selected">Autre corde pincee</option>
 			<!-- TMPL_ELSE -->
 				<option value="tz">Autre corde pincee</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1wa" -->
-				<option value="wa" SELECTED>Flute traversiere</option>
+				<option value="wa" selected="selected">Flute traversiere</option>
 			<!-- TMPL_ELSE -->
 				<option value="wa">Flute traversiere</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1wb" -->
-				<option value="wb" SELECTED>Hautbois</option>
+				<option value="wb" selected="selected">Hautbois</option>
 			<!-- TMPL_ELSE -->
 				<option value="wb">Hautbois</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1wc" -->
-				<option value="wc" SELECTED>Clarinette</option>
+				<option value="wc" selected="selected">Clarinette</option>
 			<!-- TMPL_ELSE -->
 				<option value="wc">Clarinette</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1wd" -->
-				<option value="wd" SELECTED>Basson</option>
+				<option value="wd" selected="selected">Basson</option>
 			<!-- TMPL_ELSE -->
 				<option value="wd">Basson</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1we" -->
-				<option value="we" SELECTED>Piccolo</option>
+				<option value="we" selected="selected">Piccolo</option>
 			<!-- TMPL_ELSE -->
 				<option value="we">Piccolo</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1wf" -->
-				<option value="wf" SELECTED>Cor anglais</option>
+				<option value="wf" selected="selected">Cor anglais</option>
 			<!-- TMPL_ELSE -->
 				<option value="wf">Cor anglais</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1wg" -->
-				<option value="wg" SELECTED>Clarinette basse</option>
+				<option value="wg" selected="selected">Clarinette basse</option>
 			<!-- TMPL_ELSE -->
 				<option value="wg">Clarinette basse</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1wh" -->
-				<option value="wh" SELECTED>Flute a bec </option>
+				<option value="wh" selected="selected">Flute a bec </option>
 			<!-- TMPL_ELSE -->
 				<option value="wh">Flute a bec</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1wi" -->
-				<option value="wi" SELECTED>Saxophone</option>
+				<option value="wi" selected="selected">Saxophone</option>
 			<!-- TMPL_ELSE -->
 				<option value="wi">Saxophone</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1wt" -->
-				<option value="wt" SELECTED>Ethnique</option>
+				<option value="wt" selected="selected">Ethnique</option>
 			<!-- TMPL_ELSE -->
 				<option value="wt">Ethnique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1wu" -->
-				<option value="wu" SELECTED>Non precise</option>
+				<option value="wu" selected="selected">Non precise</option>
 			<!-- TMPL_ELSE -->
 				<option value="wu">Non precise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1wz" -->
-				<option value="wz" SELECTED>Autre bois</option>
+				<option value="wz" selected="selected">Autre bois</option>
 			<!-- TMPL_ELSE -->
 				<option value="wz">Autre bois</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
-<script>
+<script type="javascript">
+//<![CDATA[
 	function report() {
-
-
 		var doc   = opener.document; 
             var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
         
@@ -475,6 +471,7 @@
 		self.close();
 		return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128c.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128c.tmpl
index fffc2dc..9f1177c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128c.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128c.tmpl
@@ -1,465 +1,463 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_constructeur champ 128c</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 128c builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 128c builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td></td>
+		<td><label for="f1">Instruments ou voix pour un soloiste</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
 	
 			<!-- TMPL_IF name="f1ba" -->
-				<option value="ba" SELECTED>Cor</option>
+				<option value="ba" selected="selected">Cor</option>
 			<!-- TMPL_ELSE -->
 				<option value="ba">Cor</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1bb" -->
-				<option value="bb" SELECTED>Trompette</option>
+				<option value="bb" selected="selected">Trompette</option>
 			<!-- TMPL_ELSE -->
 				<option value="bb">Trompette</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1bc" -->
-				<option value="bc" SELECTED>Cornet a piston</option>
+				<option value="bc" selected="selected">Cornet a piston</option>
 			<!-- TMPL_ELSE -->
 				<option value="bc">Cornet a piston</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1bd" -->
-				<option value="bd" SELECTED>Trombone</option>
+				<option value="bd" selected="selected">Trombone</option>
 			<!-- TMPL_ELSE -->
 				<option value="bd">Trombone</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1be" -->
-				<option value="be" SELECTED>Tuba</option>
+				<option value="be" selected="selected">Tuba</option>
 			<!-- TMPL_ELSE -->
 				<option value="be">Tuba</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1bf" -->
-				<option value="bf" SELECTED>Saxophone</option>
+				<option value="bf" selected="selected">Saxophone</option>
 			<!-- TMPL_ELSE -->
 				<option value="bf">Saxophone</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1bt" -->
-				<option value="bt" SELECTED>Ethniques</option>
+				<option value="bt" selected="selected">Ethniques</option>
 			<!-- TMPL_ELSE -->
 				<option value="bt">Ethniques</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1bu" -->
-				<option value="bu" SELECTED>Non precise (Cuivre)</option>
+				<option value="bu" selected="selected">Non precise (Cuivre)</option>
 			<!-- TMPL_ELSE -->
 				<option value="bu">Non precise (Cuivre)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1bz" -->
-				<option value="bz" SELECTED>Autre cuivre</option>
+				<option value="bz" selected="selected">Autre cuivre</option>
 			<!-- TMPL_ELSE -->
 				<option value="bz">Autre cuivre</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ca" -->
-				<option value="ca" SELECTED>Mixtes</option>
+				<option value="ca" selected="selected">Mixtes</option>
 			<!-- TMPL_ELSE -->
 				<option value="ca">Mixtes</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1cb" -->
-				<option value="cb" SELECTED>Femmes </option>
+				<option value="cb" selected="selected">Femmes </option>
 			<!-- TMPL_ELSE -->
 				<option value="cb">Femmes</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1cc" -->
-				<option value="cc" SELECTED>Hommes</option>
+				<option value="cc" selected="selected">Hommes</option>
 			<!-- TMPL_ELSE -->
 				<option value="cc">Hommes</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1cd" -->
-				<option value="cd" SELECTED>Enfants</option>
+				<option value="cd" selected="selected">Enfants</option>
 			<!-- TMPL_ELSE -->
 				<option value="cd">Enfants</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ct" -->
-				<option value="ct" SELECTED>Ethniques</option>
+				<option value="ct" selected="selected">Ethniques</option>
 			<!-- TMPL_ELSE -->
 				<option value="ct">Ethniques</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1cu" -->
-				<option value="cu" SELECTED>Non precise (Choeurs)</option>
+				<option value="cu" selected="selected">Non precise (Choeurs)</option>
 			<!-- TMPL_ELSE -->
 				<option value="cu">Non precise (Choeurs)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1oa" -->
-				<option value="oa" SELECTED>Orchestre symphonique</option>
+				<option value="oa" selected="selected">Orchestre symphonique</option>
 			<!-- TMPL_ELSE -->
 				<option value="oa">Orchestre symphonique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ob" -->
-				<option value="ob" SELECTED>Orchestre de chambre</option>
+				<option value="ob" selected="selected">Orchestre de chambre</option>
 			<!-- TMPL_ELSE -->
 				<option value="ob">Orchestre de chambre</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1oc" -->
-				<option value="oc" SELECTED>Orchestres a cordes</option>
+				<option value="oc" selected="selected">Orchestres a cordes</option>
 			<!-- TMPL_ELSE -->
 				<option value="oc">Orchestres a cordes</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1od" -->
-				<option value="od" SELECTED>Fanfare</option>
+				<option value="od" selected="selected">Fanfare</option>
 			<!-- TMPL_ELSE -->
 				<option value="od">Fanfare</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1oe" -->
-				<option value="oe" SELECTED>Orchestre de danse</option>
+				<option value="oe" selected="selected">Orchestre de danse</option>
 			<!-- TMPL_ELSE -->
 				<option value="oe">Orchestre de danse</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1of" -->
-				<option value="of" SELECTED>Grand ensemble - orchestre de cuivres</option>
+				<option value="of" selected="selected">Grand ensemble - orchestre de cuivres</option>
 			<!-- TMPL_ELSE -->
 				<option value="of">Grand ensemble - orchestre de cuivres</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ot" -->
-				<option value="ot" SELECTED>Ethnique</option>
+				<option value="ot" selected="selected">Ethnique</option>
 			<!-- TMPL_ELSE -->
 				<option value="ot">Ethnique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ou" -->
-				<option value="ou" SELECTED>Non precise (orchestre)</option>
+				<option value="ou" selected="selected">Non precise (orchestre)</option>
 			<!-- TMPL_ELSE -->
 				<option value="ou">Non precise (orchestre)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1oz" -->
-				<option value="oz" SELECTED>Autre orchestre</option>
+				<option value="oz" selected="selected">Autre orchestre</option>
 			<!-- TMPL_ELSE -->
 				<option value="oz">Autre orchestre</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1pa" -->
-				<option value="pa" SELECTED>Tympanon</option>
+				<option value="pa" selected="selected">Tympanon</option>
 			<!-- TMPL_ELSE -->
 				<option value="pa">Tympanon</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1pb" -->
-				<option value="pb" SELECTED>Xylophone</option>
+				<option value="pb" selected="selected">Xylophone</option>
 			<!-- TMPL_ELSE -->
 				<option value="pb">Xylophone</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1pc" -->
-				<option value="pc" SELECTED>Marimba</option>
+				<option value="pc" selected="selected">Marimba</option>
 			<!-- TMPL_ELSE -->
 				<option value="pc">Marimba</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1pd" -->
-				<option value="pd" SELECTED>Tambour, batterie</option>
+				<option value="pd" selected="selected">Tambour, batterie</option>
 			<!-- TMPL_ELSE -->
 				<option value="pd">Tambour, batterie</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1pt" -->
-				<option value="pt" SELECTED>Ethnique</option>
+				<option value="pt" selected="selected">Ethnique</option>
 			<!-- TMPL_ELSE -->
 				<option value="pt">Ethnique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1pu" -->
-				<option value="pu" SELECTED>Non precise (percussion)</option>
+				<option value="pu" selected="selected">Non precise (percussion)</option>
 			<!-- TMPL_ELSE -->
 				<option value="pu">Non precise (percussion)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1pz" -->
-				<option value="pz" SELECTED>Autre percussions</option>
+				<option value="pz" selected="selected">Autre percussions</option>
 			<!-- TMPL_ELSE -->
 				<option value="pz">Autre percussions</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1sa" -->
-				<option value="sa" SELECTED>Violon</option>
+				<option value="sa" selected="selected">Violon</option>
 			<!-- TMPL_ELSE -->
 				<option value="sa">Violon</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1sb" -->
-				<option value="sb" SELECTED>Alto</option>
+				<option value="sb" selected="selected">Alto</option>
 			<!-- TMPL_ELSE -->
 				<option value="sb">Alto</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1sc" -->
-				<option value="sc" SELECTED>Violoncelle</option>
+				<option value="sc" selected="selected">Violoncelle</option>
 			<!-- TMPL_ELSE -->
 				<option value="sc">Violoncelle</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1sd" -->
-				<option value="sd" SELECTED>Contrebasse</option>
+				<option value="sd" selected="selected">Contrebasse</option>
 			<!-- TMPL_ELSE -->
 				<option value="sd">Contrebasse</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1se" -->
-				<option value="se" SELECTED>Viole</option>
+				<option value="se" selected="selected">Viole</option>
 			<!-- TMPL_ELSE -->
 				<option value="se">Viole</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1sf" -->
-				<option value="sf" SELECTED>Viole d'amour</option>
+				<option value="sf" selected="selected">Viole d'amour</option>
 			<!-- TMPL_ELSE -->
 				<option value="sf">Viole d'amour</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1sg" -->
-				<option value="sg" SELECTED>Viole de gambe</option>
+				<option value="sg" selected="selected">Viole de gambe</option>
 			<!-- TMPL_ELSE -->
 				<option value="sg">Viole de gambe</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1st" -->
-				<option value="st" SELECTED>Ethnique</option>
+				<option value="st" selected="selected">Ethnique</option>
 			<!-- TMPL_ELSE -->
 				<option value="st">Ethnique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1su" -->
-				<option value="su" SELECTED>Non precise (Corde frottee)</option>
+				<option value="su" selected="selected">Non precise (Corde frottee)</option>
 			<!-- TMPL_ELSE -->
 				<option value="su">Non precise (Corde frottee)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1sz" -->
-				<option value="sz" SELECTED>Autre (Corde frottee)</option>
+				<option value="sz" selected="selected">Autre (Corde frottee)</option>
 			<!-- TMPL_ELSE -->
 				<option value="sz">Autre (Corde frottee)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1uu" -->
-				<option value="uu" SELECTED>Non precise (Non precise)</option>
+				<option value="uu" selected="selected">Non precise (Non precise)</option>
 			<!-- TMPL_ELSE -->
 				<option value="uu">Non precise (Non precise)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ea" -->
-				<option value="ea" SELECTED>Synthetiseur</option>
+				<option value="ea" selected="selected">Synthetiseur</option>
 			<!-- TMPL_ELSE -->
 				<option value="ea">Synthetiseur</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1eb" -->
-				<option value="eb" SELECTED>Bande magnetique</option>
+				<option value="eb" selected="selected">Bande magnetique</option>
 			<!-- TMPL_ELSE -->
 				<option value="eb">Bande magnetique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ec" -->
-				<option value="ec" SELECTED>Ordinateur</option>
+				<option value="ec" selected="selected">Ordinateur</option>
 			<!-- TMPL_ELSE -->
 				<option value="ec">Ordinateur</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ed" -->
-				<option value="ed" SELECTED>Ondes Martenot</option>
+				<option value="ed" selected="selected">Ondes Martenot</option>
 			<!-- TMPL_ELSE -->
 				<option value="ed">Ondes Martenot</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1eu" -->
-				<option value="eu" SELECTED>Non precise (Electronique)</option>
+				<option value="eu" selected="selected">Non precise (Electronique)</option>
 			<!-- TMPL_ELSE -->
 				<option value="eu">Non precise (Electronique)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ez" -->
-				<option value="ez" SELECTED>Autre (Electronique)</option>
+				<option value="ez" selected="selected">Autre (Electronique)</option>
 			<!-- TMPL_ELSE -->
 				<option value="ez">Autre (Electronique)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ka" -->
-				<option value="ka" SELECTED>Piano</option>
+				<option value="ka" selected="selected">Piano</option>
 			<!-- TMPL_ELSE -->
 				<option value="ka">Piano</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1kb" -->
-				<option value="kb" SELECTED>Orgue</option>
+				<option value="kb" selected="selected">Orgue</option>
 			<!-- TMPL_ELSE -->
 				<option value="kb">Orgue</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1kc" -->
-				<option value="kc" SELECTED>Clavecin</option>
+				<option value="kc" selected="selected">Clavecin</option>
 			<!-- TMPL_ELSE -->
 				<option value="kc">Clavecin</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1kd" -->
-				<option value="kd" SELECTED>Clavicorde</option>
+				<option value="kd" selected="selected">Clavicorde</option>
 			<!-- TMPL_ELSE -->
 				<option value="kd">Clavicorde</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ke" -->
-				<option value="ke" SELECTED>Continuo</option>
+				<option value="ke" selected="selected">Continuo</option>
 			<!-- TMPL_ELSE -->
 				<option value="ke">Continuo</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1kf" -->
-				<option value="kf" SELECTED>Celesta</option>
+				<option value="kf" selected="selected">Celesta</option>
 			<!-- TMPL_ELSE -->
 				<option value="kf">Celesta</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1kt" -->
-				<option value="kt" SELECTED>Ethnique</option>
+				<option value="kt" selected="selected">Ethnique</option>
 			<!-- TMPL_ELSE -->
 				<option value="kt">Ethnique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ku" -->
-				<option value="ku" SELECTED>Non precise (clavier)</option>
+				<option value="ku" selected="selected">Non precise (clavier)</option>
 			<!-- TMPL_ELSE -->
 				<option value="ku">Non precise (clavier)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1kz" -->
-				<option value="kz" SELECTED>Autre</option>
+				<option value="kz" selected="selected">Autre</option>
 			<!-- TMPL_ELSE -->
 				<option value="kz">Autre</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1va" -->
-				<option value="va" SELECTED>Soprano</option>
+				<option value="va" selected="selected">Soprano</option>
 			<!-- TMPL_ELSE -->
 				<option value="va">Soprano</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1vb" -->
-				<option value="vb" SELECTED>Mezzo-soprano</option>
+				<option value="vb" selected="selected">Mezzo-soprano</option>
 			<!-- TMPL_ELSE -->
 				<option value="vb">Mezzo-soprano</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1vc" -->
-				<option value="vc" SELECTED>Alto</option>
+				<option value="vc" selected="selected">Alto</option>
 			<!-- TMPL_ELSE -->
 				<option value="vc">Alto</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1vd" -->
-				<option value="vd" SELECTED>Tenor</option>
+				<option value="vd" selected="selected">Tenor</option>
 			<!-- TMPL_ELSE -->
 				<option value="vd">Tenor</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ve" -->
-				<option value="ve" SELECTED>Baryton</option>
+				<option value="ve" selected="selected">Baryton</option>
 			<!-- TMPL_ELSE -->
 				<option value="ve">Baryton</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1vf" -->
-				<option value="vf" SELECTED>Basse</option>
+				<option value="vf" selected="selected">Basse</option>
 			<!-- TMPL_ELSE -->
 				<option value="vf">Basse</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1vg" -->
-				<option value="vg" SELECTED>Haute contre</option>
+				<option value="vg" selected="selected">Haute contre</option>
 			<!-- TMPL_ELSE -->
 				<option value="vg">Haute contre</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1vh" -->
-				<option value="vh" SELECTED>Voix aigues</option>
+				<option value="vh" selected="selected">Voix aigues</option>
 			<!-- TMPL_ELSE -->
 				<option value="vh">Voix aigues</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1vi" -->
-				<option value="vi" SELECTED>Voix medium</option>
+				<option value="vi" selected="selected">Voix medium</option>
 			<!-- TMPL_ELSE -->
 				<option value="vi">Voix medium</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1vj" -->
-				<option value="vj" SELECTED>Voix graves</option>
+				<option value="vj" selected="selected">Voix graves</option>
 			<!-- TMPL_ELSE -->
 				<option value="vj">Voix graves</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1vt" -->
-				<option value="vt" SELECTED>Ethnique</option>
+				<option value="vt" selected="selected">Ethnique</option>
 			<!-- TMPL_ELSE -->
 				<option value="vt">Ethnique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1vu" -->
-				<option value="vu" SELECTED>Non precise (Voix precise)</option>
+				<option value="vu" selected="selected">Non precise (Voix precise)</option>
 			<!-- TMPL_ELSE -->
 				<option value="vu">Non precise (Voix precise)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ta" -->
-				<option value="ta" SELECTED>Harpe</option>
+				<option value="ta" selected="selected">Harpe</option>
 			<!-- TMPL_ELSE -->
 				<option value="ta">Harpe</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1tb" -->
-				<option value="tb" SELECTED>Famille de la guitare</option>
+				<option value="tb" selected="selected">Famille de la guitare</option>
 			<!-- TMPL_ELSE -->
 				<option value="tb">Famille de la guitare</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1tc" -->
-				<option value="tc" SELECTED>Famille du luth</option>
+				<option value="tc" selected="selected">Famille du luth</option>
 			<!-- TMPL_ELSE -->
 				<option value="tc">Famille du luth</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1td" -->
-				<option value="td" SELECTED>Mandoline</option>
+				<option value="td" selected="selected">Mandoline</option>
 			<!-- TMPL_ELSE -->
 				<option value="td">Mandoline</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1tt" -->
-				<option value="tt" SELECTED>Ethnique</option>
+				<option value="tt" selected="selected">Ethnique</option>
 			<!-- TMPL_ELSE -->
 				<option value="tt">Ethnique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1tu" -->
-				<option value="tu" SELECTED>Non precise (Cordes pincees)</option>
+				<option value="tu" selected="selected">Non precise (Cordes pincees)</option>
 			<!-- TMPL_ELSE -->
 				<option value="tu">Non precise (Cordes pincees)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1tz" -->
-				<option value="tz" SELECTED>Autre corde pincee</option>
+				<option value="tz" selected="selected">Autre corde pincee</option>
 			<!-- TMPL_ELSE -->
 				<option value="tz">Autre corde pincee</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1wa" -->
-				<option value="wa" SELECTED>Flute traversiere</option>
+				<option value="wa" selected="selected">Flute traversiere</option>
 			<!-- TMPL_ELSE -->
 				<option value="wa">Flute traversiere</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1wb" -->
-				<option value="wb" SELECTED>Hautbois</option>
+				<option value="wb" selected="selected">Hautbois</option>
 			<!-- TMPL_ELSE -->
 				<option value="wb">Hautbois</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1wc" -->
-				<option value="wc" SELECTED>Clarinette</option>
+				<option value="wc" selected="selected">Clarinette</option>
 			<!-- TMPL_ELSE -->
 				<option value="wc">Clarinette</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1wd" -->
-				<option value="wd" SELECTED>Basson</option>
+				<option value="wd" selected="selected">Basson</option>
 			<!-- TMPL_ELSE -->
 				<option value="wd">Basson</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1we" -->
-				<option value="we" SELECTED>Piccolo</option>
+				<option value="we" selected="selected">Piccolo</option>
 			<!-- TMPL_ELSE -->
 				<option value="we">Piccolo</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1wf" -->
-				<option value="wf" SELECTED>Cor anglais</option>
+				<option value="wf" selected="selected">Cor anglais</option>
 			<!-- TMPL_ELSE -->
 				<option value="wf">Cor anglais</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1wg" -->
-				<option value="wg" SELECTED>Clarinette basse</option>
+				<option value="wg" selected="selected">Clarinette basse</option>
 			<!-- TMPL_ELSE -->
 				<option value="wg">Clarinette basse</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1wh" -->
-				<option value="wh" SELECTED>Flute a bec </option>
+				<option value="wh" selected="selected">Flute a bec </option>
 			<!-- TMPL_ELSE -->
 				<option value="wh">Flute a bec</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1wi" -->
-				<option value="wi" SELECTED>Saxophone</option>
+				<option value="wi" selected="selected">Saxophone</option>
 			<!-- TMPL_ELSE -->
 				<option value="wi">Saxophone</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1wt" -->
-				<option value="wt" SELECTED>Ethnique</option>
+				<option value="wt" selected="selected">Ethnique</option>
 			<!-- TMPL_ELSE -->
 				<option value="wt">Ethnique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1wu" -->
-				<option value="wu" SELECTED>Non precise</option>
+				<option value="wu" selected="selected">Non precise</option>
 			<!-- TMPL_ELSE -->
 				<option value="wu">Non precise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1wz" -->
-				<option value="wz" SELECTED>Autre bois</option>
+				<option value="wz" selected="selected">Autre bois</option>
 			<!-- TMPL_ELSE -->
 				<option value="wz">Autre bois</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
+//<![CDATA[
 	function report() {
             var doc   = opener.document; 
             var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
@@ -467,6 +465,7 @@
 	    window.close();
 	    return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_130.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_130.tmpl
index 5575045..38dc8b8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_130.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_130.tmpl
@@ -1,335 +1,332 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 130 builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 130 builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 130 builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Specific Material Designation:</td>
+		<td><label for="f1">Specific Material Designation:</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
 			<!-- TMPL_IF name="f1a" -->
-				<option value="a" SELECTED>aperture card</option>
+				<option value="a" selected="selected">aperture card</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">aperture card</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1b" -->
-				<option value="b" SELECTED>microform cartridge</option>
+				<option value="b" selected="selected">microform cartridge</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">microform cartridge</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1c" -->
-				<option value="c" SELECTED>microfilm cassette</option>
+				<option value="c" selected="selected">microfilm cassette</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">microfilm cassette</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1d" -->
-				<option value="d" SELECTED>microfilm reel</option>
+				<option value="d" selected="selected">microfilm reel</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">microfilm reel</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1e" -->
-				<option value="e" SELECTED>microfiche</option>
+				<option value="e" selected="selected">microfiche</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">microfiche</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1f" -->
-				<option value="f" SELECTED>microfiche cassette</option>
+				<option value="f" selected="selected">microfiche cassette</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">microfiche cassette</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1g" -->
-				<option value="g" SELECTED>micro opaque</option>
+				<option value="g" selected="selected">micro opaque</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">micro opaque</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1h" -->
-				<option value="h" SELECTED>microfilm slip</option>
+				<option value="h" selected="selected">microfilm slip</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">microfilm slip</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 	<tr>
-		<td>Polarity:</td>
+		<td><label for="f2">Polarity:</label></td>
 		<td>
-			<select name="f2" size="1">
+			<select name="f2" id="f2" size="1">
 
 			<!-- TMPL_IF name="f2a" -->
-				<option value="a" SELECTED>positive</option>
+				<option value="a" selected="selected">positive</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">positive</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2b" -->
-				<option value="b" SELECTED>negative</option>
+				<option value="b" selected="selected">negative</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">negative</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2c" -->
-				<option value="c" SELECTED>unknown</option>
+				<option value="c" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">unknown</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2d" -->
-				<option value="d" SELECTED>mixed polarity</option>
+				<option value="d" selected="selected">mixed polarity</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">mixed polarity</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 	<tr>
-		<td>Dimensions:</td>
+		<td><label for="f3">Dimensions:</label></td>
 		<td>
-			<select name="f3" size="1">
+			<select name="f3" id="f3" size="1">
 
 			<!-- TMPL_IF name="f3 " -->
-				<option value=" " SELECTED>non required value</option>
+				<option value=" " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3a" -->
-				<option value="a" SELECTED>8 mm (microfilm)</option>
+				<option value="a" selected="selected">8 mm (microfilm)</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">8 mm (microfilm)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3d" -->
-				<option value="d" SELECTED>16 mm (microfilm)</option>
+				<option value="d" selected="selected">16 mm (microfilm)</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">16 mm (microfilm)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3f" -->
-				<option value="f" SELECTED>35 mm (microfilm)</option>
+				<option value="f" selected="selected">35 mm (microfilm)</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">35 mm (microfilm)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3g" -->
-				<option value="g" SELECTED>70 mm (microfilm)</option>
+				<option value="g" selected="selected">70 mm (microfilm)</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">70 mm (microfilm)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3h" -->
-				<option value="h" SELECTED>105 mm (microfilm)</option>
+				<option value="h" selected="selected">105 mm (microfilm)</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">105 mm (microfilm)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3l" -->
-				<option value="l" SELECTED>3 x 5 in.</option>
+				<option value="l" selected="selected">3 x 5 in.</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">3 x 5 in.</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3m" -->
-				<option value="m" SELECTED>4 x 6 in.</option>
+				<option value="m" selected="selected">4 x 6 in.</option>
 			<!-- TMPL_ELSE -->
 				<option value="m">4 x 6 in.</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3o" -->
-				<option value="o" SELECTED>6 x 9 in.</option>
+				<option value="o" selected="selected">6 x 9 in.</option>
 			<!-- TMPL_ELSE -->
 				<option value="o">6 x 9 in.</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3p" -->
-				<option value="p" SELECTED>9 x 19 cm</option>
+				<option value="p" selected="selected">9 x 19 cm</option>
 			<!-- TMPL_ELSE -->
 				<option value="p">9 x 19 cm</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 	<tr>
-		<td>Reduction ratio:</td>
+		<td><label for="f4">Reduction ratio:</label></td>
 		<td>
-			<select name="f4" size="1">		
+			<select name="f4" id="f4" size="1">		
 			<!-- TMPL_IF name="f4a" -->
-				<option value="a" SELECTED>low reduction</option>
+				<option value="a" selected="selected">low reduction</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">low reduction</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4b" -->
-				<option value="b" SELECTED>Normal (16x - 30x)</option>
+				<option value="b" selected="selected">Normal (16x - 30x)</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">Normal (16x - 30x)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4c" -->
-				<option value="c" SELECTED>high (31x - 60x)</option>
+				<option value="c" selected="selected">high (31x - 60x)</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">high (31x - 60x)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4d" -->
-				<option value="d" SELECTED>very high (61x - 90x)</option>
+				<option value="d" selected="selected">very high (61x - 90x)</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">very high (61x - 90x)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4e" -->
-				<option value="e" SELECTED>ultrahigh (91x -)</option>
+				<option value="e" selected="selected">ultrahigh (91x -)</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">ultrahigh (91x -)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4v" -->
-				<option value="v" SELECTED>varies</option>
+				<option value="v" selected="selected">varies</option>
 			<!-- TMPL_ELSE -->
 				<option value="v">varies</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
     <tr>
-                <td>Specific reduction ratio</td>
-                <td><input type="text" name="f5" maxlength=3 size=4 
-value="<!-- TMPL_VAR name="f5" -->"></td>
+                <td><label for="f5">Specific reduction ratio</label></td>
+                <td><input type="text" name="f5" id="f5" maxlength="3" size="4" 
+value="<!-- TMPL_VAR name="f5" -->" /></td>
         </tr>
 
-		</td></tr>
 	<tr>
-		<td>Colour:</td>
+		<td><label for="f6">Color:</label></td>
 		<td>
-			<select name="f6" size="1">
+			<select name="f6" id="f6" size="1">
 			<!-- TMPL_IF name="f6a" -->
-				<option value="a" SELECTED>monochrome</option>
+				<option value="a" selected="selected">monochrome</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">monochrome</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6b" -->
-				<option value="b" SELECTED>colour</option>
+				<option value="b" selected="selected">color</option>
 			<!-- TMPL_ELSE -->
-				<option value="b">colour</option>
+				<option value="b">color</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6v" -->
-				<option value="v" SELECTED>varies</option>
+				<option value="v" selected="selected">varies</option>
 			<!-- TMPL_ELSE -->
 				<option value="v">varies</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 	<tr>
-		<td>Emulsion on film:</td>
+		<td><label for="f7">Emulsion on film:</label></td>
 		<td>
-			<select name="f7" size="1">
+			<select name="f7" id="f7" size="1">
 			<!-- TMPL_IF name="f7a" -->
-				<option value="a" SELECTED>silver halide</option>
+				<option value="a" selected="selected">silver halide</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">silver halide</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7b" -->
-				<option value="b" SELECTED>diazo</option>
+				<option value="b" selected="selected">diazo</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">diazo</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7c" -->
-				<option value="c" SELECTED>vesicular</option>
+				<option value="c" selected="selected">vesicular</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">vesicular</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7d" -->
-				<option value="d" SELECTED>unknown</option>
+				<option value="d" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">unknown</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7u" -->
-				<option value="u" SELECTED>mixed emulsion</option>
+				<option value="u" selected="selected">mixed emulsion</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">mixed emulsion</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7x" -->
-				<option value="x" SELECTED>not applicable</option>
+				<option value="x" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not applicable</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 	<tr>
-		<td>Generation:</td>
+		<td><label for="f8">Generation:</label></td>
 		<td>
-			<select name="f8" size="1">
+			<select name="f8" id="f8" size="1">
 			<!-- TMPL_IF name="f8a" -->
-				<option value="a" SELECTED>first generation (Master)</option>
+				<option value="a" selected="selected">first generation (Master)</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">first generation (Master)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8b" -->
-				<option value="b" SELECTED>printing master</option>
+				<option value="b" selected="selected">printing master</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">printing master</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8c" -->
-				<option value="c" SELECTED>service copy</option>
+				<option value="c" selected="selected">service copy</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">service copy</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8v" -->
-				<option value="v" SELECTED>mixed generations</option>
+				<option value="v" selected="selected">mixed generations</option>
 			<!-- TMPL_ELSE -->
 				<option value="v">mixed generations</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 	<tr>
-		<td>Base of film:</td>
+		<td><label for="f9">Base of film:</label></td>
 		<td>
-			<select name="f9" size="1">
+			<select name="f9" id="f9" size="1">
 			<!-- TMPL_IF name="f9a" -->
-				<option value="a" SELECTED>safety base</option>
+				<option value="a" selected="selected">safety base</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">safety base</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9b" -->
-				<option value="b" SELECTED>not a safety base</option>
+				<option value="b" selected="selected">not a safety base</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">not a safety base</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9x" -->
-				<option value="x" SELECTED>not applicable</option>
+				<option value="x" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not applicable</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
+//<![CDATA[
 	function report() {
 	    document.f_pop.f5.value=document.f_pop.f5.value+'   ';
 	    document.f_pop.f5.value=document.f_pop.f5.value.substring(0,3);
@@ -339,6 +336,7 @@ value="<!-- TMPL_VAR name="f5" -->"></td>
 	    window.close();
 	    return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_135a.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_135a.tmpl
index e572fa7..9c1565f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_135a.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_135a.tmpl
@@ -1,64 +1,63 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 135a builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 135a builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 135a builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Type of electronic resource:</td>
+		<td><label for="f1">Type of electronic resource:</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
             
 			<!-- TMPL_IF name="f1 " -->
-				<option value=" " SELECTED>non required value</option>
+				<option value=" " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1a" -->
-				<option value="a" SELECTED>numeric</option>
+				<option value="a" selected="selected">numeric</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">numeric</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1b" -->
-				<option value="b" SELECTED>computer program(s)</option>
+				<option value="b" selected="selected">computer program(s)</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">computer program(s)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1c" -->
-				<option value="c" SELECTED>representational</option>
+				<option value="c" selected="selected">representational</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">representational</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1d" -->
-				<option value="d" SELECTED>text</option>
+				<option value="d" selected="selected">text</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">text</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1v" -->
-				<option value="v" SELECTED>combination</option>
+				<option value="v" selected="selected">combination</option>
 			<!-- TMPL_ELSE -->
 				<option value="v">combination</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
+			</select>
 		</td></tr>
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<p><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></p>
 </form>
 <script type="text/javascript">
+//<![CDATA[
 	function report() {
             var doc   = opener.document; 
             var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
@@ -67,6 +66,7 @@
             window.close();
             return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_140.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_140.tmpl
index a3480d3..1358ce2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_140.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_140.tmpl
@@ -1,1549 +1,1564 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 140 builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 140 builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 140 builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Illustration - Book 1:</td>
+		<td><label for="f1">Illustration - Book 1:</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
 			<!-- TMPL_IF name="f1 " -->
-				<option value=" " SELECTED>non required value</option>
+				<option value=" " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1a" -->
-				<option value="a" SELECTED>illustrations</option>
+				<option value="a" selected="selected">illustrations</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">illustrations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1b" -->
-				<option value="b" SELECTED>illuminations</option>
+				<option value="b" selected="selected">illuminations</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">illuminations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1c" -->
-				<option value="c" SELECTED>ornamental letter</option>
+				<option value="c" selected="selected">ornamental letter</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">ornamental letter</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1d" -->
-				<option value="d" SELECTED>miniature</option>
+				<option value="d" selected="selected">miniature</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">miniature</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1e" -->
-				<option value="e" SELECTED>rubric (i.e. heading etc. in special lettering)</option>
+				<option value="e" selected="selected">rubric (i.e. heading etc. in special lettering)</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">rubric (i.e. heading etc. in special lettering)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1f" -->
-				<option value="f" SELECTED>vignette</option>
+				<option value="f" selected="selected">vignette</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">vignette</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1g" -->
-				<option value="g" SELECTED>frontispiece</option>
+				<option value="g" selected="selected">frontispiece</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">frontispiece</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1h" -->
-				<option value="h" SELECTED>portrait</option>
+				<option value="h" selected="selected">portrait</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">portrait</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1i" -->
-				<option value="i" SELECTED>vedute</option>
+				<option value="i" selected="selected">vedute</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">vedute</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1j" -->
-				<option value="j" SELECTED>maps</option>
+				<option value="j" selected="selected">maps</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">maps</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1k" -->
-				<option value="k" SELECTED>charts</option>
+				<option value="k" selected="selected">charts</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">charts</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1l" -->
-				<option value="l" SELECTED>plans</option>
+				<option value="l" selected="selected">plans</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">plans</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1m" -->
-				<option value="m" SELECTED>music</option>
+				<option value="m" selected="selected">music</option>
 			<!-- TMPL_ELSE -->
 				<option value="m">music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1n" -->
-				<option value="n" SELECTED>coats of arms</option>
+				<option value="n" selected="selected">coats of arms</option>
 			<!-- TMPL_ELSE -->
 				<option value="n">coats of arms</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1o" -->
-				<option value="o" SELECTED>genealogical tables</option>
+				<option value="o" selected="selected">genealogical tables</option>
 			<!-- TMPL_ELSE -->
 				<option value="o">genealogical tables</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1y" -->
-				<option value="y" SELECTED>no illustrations</option>
+				<option value="y" selected="selected">no illustrations</option>
 			<!-- TMPL_ELSE -->
 				<option value="y">no illustrations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
+			</select>
 		</td>
-		<td>Illustration - Book 2:</td>
+		<td><label for="f2">Illustration - Book 2:</label></td>
 		<td>
-			<select name="f2" size="1">
+			<select name="f2" id="f2" size="1">
 			<!-- TMPL_IF name="f2 " -->
-				<option value=" " SELECTED>non required value</option>
+				<option value=" " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2a" -->
-				<option value="a" SELECTED>illustrations</option>
+				<option value="a" selected="selected">illustrations</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">illustrations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2b" -->
-				<option value="b" SELECTED>illuminations</option>
+				<option value="b" selected="selected">illuminations</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">illuminations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2c" -->
-				<option value="c" SELECTED>ornamental letter</option>
+				<option value="c" selected="selected">ornamental letter</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">ornamental letter</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2d" -->
-				<option value="d" SELECTED>miniature</option>
+				<option value="d" selected="selected">miniature</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">miniature</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2e" -->
-				<option value="e" SELECTED>rubric (i.e. heading etc. in special lettering)</option>
+				<option value="e" selected="selected">rubric (i.e. heading etc. in special lettering)</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">rubric (i.e. heading etc. in special lettering)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2f" -->
-				<option value="f" SELECTED>vignette</option>
+				<option value="f" selected="selected">vignette</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">vignette</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2g" -->
-				<option value="g" SELECTED>frontispiece</option>
+				<option value="g" selected="selected">frontispiece</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">frontispiece</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2h" -->
-				<option value="h" SELECTED>portrait</option>
+				<option value="h" selected="selected">portrait</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">portrait</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2i" -->
-				<option value="i" SELECTED>vedute</option>
+				<option value="i" selected="selected">vedute</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">vedute</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2j" -->
-				<option value="j" SELECTED>maps</option>
+				<option value="j" selected="selected">maps</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">maps</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2k" -->
-				<option value="k" SELECTED>charts</option>
+				<option value="k" selected="selected">charts</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">charts</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2l" -->
-				<option value="l" SELECTED>plans</option>
+				<option value="l" selected="selected">plans</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">plans</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2m" -->
-				<option value="m" SELECTED>music</option>
+				<option value="m" selected="selected">music</option>
 			<!-- TMPL_ELSE -->
 				<option value="m">music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2n" -->
-				<option value="n" SELECTED>coats of arms</option>
+				<option value="n" selected="selected">coats of arms</option>
 			<!-- TMPL_ELSE -->
 				<option value="n">coats of arms</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2o" -->
-				<option value="o" SELECTED>genealogical tables</option>
+				<option value="o" selected="selected">genealogical tables</option>
 			<!-- TMPL_ELSE -->
 				<option value="o">genealogical tables</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2y" -->
-				<option value="y" SELECTED>no illustrations</option>
+				<option value="y" selected="selected">no illustrations</option>
 			<!-- TMPL_ELSE -->
 				<option value="y">no illustrations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
-		</td></tr>	<tr>
-		<td>Illustration - Book 3:</td>
+			</select>
+		</td></tr>
+		<tr>
+		<td><label for="f3">Illustration - Book 3:</label></td>
 		<td>
-			<select name="f3" size="1">
+			<select name="f3" id="f3" size="1">
 			<!-- TMPL_IF name="f3 " -->
-				<option value=" " SELECTED>non required value</option>
+				<option value=" " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3a" -->
-				<option value="a" SELECTED>illustrations</option>
+				<option value="a" selected="selected">illustrations</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">illustrations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3b" -->
-				<option value="b" SELECTED>illuminations</option>
+				<option value="b" selected="selected">illuminations</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">illuminations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3c" -->
-				<option value="c" SELECTED>ornamental letter</option>
+				<option value="c" selected="selected">ornamental letter</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">ornamental letter</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3d" -->
-				<option value="d" SELECTED>miniature</option>
+				<option value="d" selected="selected">miniature</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">miniature</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3e" -->
-				<option value="e" SELECTED>rubric (i.e. heading etc. in special lettering)</option>
+				<option value="e" selected="selected">rubric (i.e. heading etc. in special lettering)</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">rubric (i.e. heading etc. in special lettering)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3f" -->
-				<option value="f" SELECTED>vignette</option>
+				<option value="f" selected="selected">vignette</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">vignette</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3g" -->
-				<option value="g" SELECTED>frontispiece</option>
+				<option value="g" selected="selected">frontispiece</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">frontispiece</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3h" -->
-				<option value="h" SELECTED>portrait</option>
+				<option value="h" selected="selected">portrait</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">portrait</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3i" -->
-				<option value="i" SELECTED>vedute</option>
+				<option value="i" selected="selected">vedute</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">vedute</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3j" -->
-				<option value="j" SELECTED>maps</option>
+				<option value="j" selected="selected">maps</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">maps</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3k" -->
-				<option value="k" SELECTED>charts</option>
+				<option value="k" selected="selected">charts</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">charts</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3l" -->
-				<option value="l" SELECTED>plans</option>
+				<option value="l" selected="selected">plans</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">plans</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3m" -->
-				<option value="m" SELECTED>music</option>
+				<option value="m" selected="selected">music</option>
 			<!-- TMPL_ELSE -->
 				<option value="m">music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3n" -->
-				<option value="n" SELECTED>coats of arms</option>
+				<option value="n" selected="selected">coats of arms</option>
 			<!-- TMPL_ELSE -->
 				<option value="n">coats of arms</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3o" -->
-				<option value="o" SELECTED>genealogical tables</option>
+				<option value="o" selected="selected">genealogical tables</option>
 			<!-- TMPL_ELSE -->
 				<option value="o">genealogical tables</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3y" -->
-				<option value="y" SELECTED>no illustrations</option>
+				<option value="y" selected="selected">no illustrations</option>
 			<!-- TMPL_ELSE -->
 				<option value="y">no illustrations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
+			</select>
 		</td>
-		<td>Illustration - Book 4:</td>
+		<td><label for="f4">Illustration - Book 4:</label></td>
 		<td>
-			<select name="f4" size="1">
+			<select name="f4" id="f4" size="1">
             
 			<!-- TMPL_IF name="f4 " -->
-				<option value=" " SELECTED>non required value</option>
+				<option value=" " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4a" -->
-				<option value="a" SELECTED>illustrations</option>
+				<option value="a" selected="selected">illustrations</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">illustrations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4b" -->
-				<option value="b" SELECTED>illuminations</option>
+				<option value="b" selected="selected">illuminations</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">illuminations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4c" -->
-				<option value="c" SELECTED>ornamental letter</option>
+				<option value="c" selected="selected">ornamental letter</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">ornamental letter</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4d" -->
-				<option value="d" SELECTED>miniature</option>
+				<option value="d" selected="selected">miniature</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">miniature</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4e" -->
-				<option value="e" SELECTED>rubric (i.e. heading etc. in special lettering)</option>
+				<option value="e" selected="selected">rubric (i.e. heading etc. in special lettering)</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">rubric (i.e. heading etc. in special lettering)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4f" -->
-				<option value="f" SELECTED>vignette</option>
+				<option value="f" selected="selected">vignette</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">vignette</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4g" -->
-				<option value="g" SELECTED>frontispiece</option>
+				<option value="g" selected="selected">frontispiece</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">frontispiece</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4h" -->
-				<option value="h" SELECTED>Portrait</option>
+				<option value="h" selected="selected">Portrait</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">Portrait</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4i" -->
-				<option value="i" SELECTED>vedute</option>
+				<option value="i" selected="selected">vedute</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">vedute</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4j" -->
-				<option value="j" SELECTED>maps</option>
+				<option value="j" selected="selected">maps</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">maps</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4k" -->
-				<option value="k" SELECTED>charts</option>
+				<option value="k" selected="selected">charts</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">charts</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4l" -->
-				<option value="l" SELECTED>plans</option>
+				<option value="l" selected="selected">plans</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">plans</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4m" -->
-				<option value="m" SELECTED>music</option>
+				<option value="m" selected="selected">music</option>
 			<!-- TMPL_ELSE -->
 				<option value="m">music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4n" -->
-				<option value="n" SELECTED>coats of arms</option>
+				<option value="n" selected="selected">coats of arms</option>
 			<!-- TMPL_ELSE -->
 				<option value="n">coats of arms</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4o" -->
-				<option value="o" SELECTED>genealogical tables</option>
+				<option value="o" selected="selected">genealogical tables</option>
 			<!-- TMPL_ELSE -->
 				<option value="o">genealogical tables</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4y" -->
-				<option value="y" SELECTED>no illustrations</option>
+				<option value="y" selected="selected">no illustrations</option>
 			<!-- TMPL_ELSE -->
 				<option value="y">no illustrations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
+			</select>
 		</td></tr>
 	<tr>
-		<td>Illustration - Full Page Plates 1:</td>
+		<td><label for="f5">Illustration - Full Page Plates 1:</label></td>
 		<td>
-			<select name="f5" size="1">
+			<select name="f5" id="f5" size="1">
             
 			<!-- TMPL_IF name="f5 " -->
-				<option value=" " SELECTED>non required value</option>
+				<option value=" " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5a" -->
-				<option value="a" SELECTED>illustrations</option>
+				<option value="a" selected="selected">illustrations</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">illustrations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5g" -->
-				<option value="g" SELECTED>frontispiece</option>
+				<option value="g" selected="selected">frontispiece</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">frontispiece</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5h" -->
-				<option value="h" SELECTED>portrait</option>
+				<option value="h" selected="selected">portrait</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">portrait</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5i" -->
-				<option value="i" SELECTED>vedute</option>
+				<option value="i" selected="selected">vedute</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">vedute</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5j" -->
-				<option value="j" SELECTED>maps</option>
+				<option value="j" selected="selected">maps</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">maps</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5k" -->
-				<option value="k" SELECTED>charts</option>
+				<option value="k" selected="selected">charts</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">charts</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5l" -->
-				<option value="l" SELECTED>plans</option>
+				<option value="l" selected="selected">plans</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">plans</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5m" -->
-				<option value="m" SELECTED>music</option>
+				<option value="m" selected="selected">music</option>
 			<!-- TMPL_ELSE -->
 				<option value="m">music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5n" -->
-				<option value="n" SELECTED>coats of arms</option>
+				<option value="n" selected="selected">coats of arms</option>
 			<!-- TMPL_ELSE -->
 				<option value="n">coats of arms</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5o" -->
-				<option value="o" SELECTED>genealogical tables</option>
+				<option value="o" selected="selected">genealogical tables</option>
 			<!-- TMPL_ELSE -->
 				<option value="o">genealogical tables</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5y" -->
-				<option value="y" SELECTED>no illustrations</option>
+				<option value="y" selected="selected">no illustrations</option>
 			<!-- TMPL_ELSE -->
 				<option value="y">no illustrations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
+			</select>
 		</td>
-		<td>Illustration - Full Page Plates 2:</td>
+		<td><label for="f6">Illustration - Full Page Plates 2:</label></td>
 		<td>
-			<select name="f6" size="1">
+			<select name="f6" id="f6" size="1">
             
 			<!-- TMPL_IF name="f6 " -->
-				<option value=" " SELECTED>non required value</option>
+				<option value=" " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6a" -->
-				<option value="a" SELECTED>illustrations</option>
+				<option value="a" selected="selected">illustrations</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">illustrations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6g" -->
-				<option value="g" SELECTED>frontispiece</option>
+				<option value="g" selected="selected">frontispiece</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">frontispiece</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6h" -->
-				<option value="h" SELECTED>portrait</option>
+				<option value="h" selected="selected">portrait</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">portrait</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6i" -->
-				<option value="i" SELECTED>vedute</option>
+				<option value="i" selected="selected">vedute</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">vedute</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6j" -->
-				<option value="j" SELECTED>maps</option>
+				<option value="j" selected="selected">maps</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">maps</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6k" -->
-				<option value="k" SELECTED>charts</option>
+				<option value="k" selected="selected">charts</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">charts</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6l" -->
-				<option value="l" SELECTED>plans</option>
+				<option value="l" selected="selected">plans</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">plans</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6m" -->
-				<option value="m" SELECTED>music</option>
+				<option value="m" selected="selected">music</option>
 			<!-- TMPL_ELSE -->
 				<option value="m">music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6n" -->
-				<option value="n" SELECTED>coats of arms</option>
+				<option value="n" selected="selected">coats of arms</option>
 			<!-- TMPL_ELSE -->
 				<option value="n">coats of arms</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6o" -->
-				<option value="o" SELECTED>genealogical tables</option>
+				<option value="o" selected="selected">genealogical tables</option>
 			<!-- TMPL_ELSE -->
 				<option value="o">genealogical tables</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6y" -->
-				<option value="y" SELECTED>no illustrations</option>
+				<option value="y" selected="selected">no illustrations</option>
 			<!-- TMPL_ELSE -->
 				<option value="y">no illustrations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
+			</select>
 		</td></tr>
-	<tr>
-		<td>Illustration - Full Page Plates 3:</td>
+		<tr>
+		<td><label for="f7">Illustration - Full Page Plates 3:</label></td>
 		<td>
-			<select name="f7" size="1">
+			<select name="f7" id="f7" size="1">
             
 			<!-- TMPL_IF name="f7 " -->
-				<option value=" " SELECTED>non required value</option>
+				<option value=" " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7a" -->
-				<option value="a" SELECTED>illustrations</option>
+				<option value="a" selected="selected">illustrations</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">illustrations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7g" -->
-				<option value="g" SELECTED>frontispiece</option>
+				<option value="g" selected="selected">frontispiece</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">frontispiece</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7h" -->
-				<option value="h" SELECTED>portrait</option>
+				<option value="h" selected="selected">portrait</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">portrait</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7i" -->
-				<option value="i" SELECTED>vedute</option>
+				<option value="i" selected="selected">vedute</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">vedute</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7j" -->
-				<option value="j" SELECTED>maps</option>
+				<option value="j" selected="selected">maps</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">maps</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7k" -->
-				<option value="k" SELECTED>charts</option>
+				<option value="k" selected="selected">charts</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">charts</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7l" -->
-				<option value="l" SELECTED>plans</option>
+				<option value="l" selected="selected">plans</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">plans</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7m" -->
-				<option value="m" SELECTED>music</option>
+				<option value="m" selected="selected">music</option>
 			<!-- TMPL_ELSE -->
 				<option value="m">music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7n" -->
-				<option value="n" SELECTED>coats of arms</option>
+				<option value="n" selected="selected">coats of arms</option>
 			<!-- TMPL_ELSE -->
 				<option value="n">coats of arms</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7o" -->
-				<option value="o" SELECTED>genealogical tables</option>
+				<option value="o" selected="selected">genealogical tables</option>
 			<!-- TMPL_ELSE -->
 				<option value="o">genealogical tables</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7y" -->
-				<option value="y" SELECTED>no illustrations</option>
+				<option value="y" selected="selected">no illustrations</option>
 			<!-- TMPL_ELSE -->
 				<option value="y">no illustrations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
+			</select>
 		</td>
-		<td>Illustration - Full Page Plates 4:</td>
+		<td><label for="f8">Illustration - Full Page Plates 4:</label></td>
 		<td>
-			<select name="f8" size="1">
+			<select name="f8" id="f8" size="1">
             
 			<!-- TMPL_IF name="f8 " -->
-				<option value=" " SELECTED>non required value</option>
+				<option value=" " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8a" -->
-				<option value="a" SELECTED>illustrations</option>
+				<option value="a" selected="selected">illustrations</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">illustrations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8g" -->
-				<option value="g" SELECTED>frontispiece</option>
+				<option value="g" selected="selected">frontispiece</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">frontispiece</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8h" -->
-				<option value="h" SELECTED>portrait</option>
+				<option value="h" selected="selected">portrait</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">portrait</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8i" -->
-				<option value="i" SELECTED>vedute</option>
+				<option value="i" selected="selected">vedute</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">vedute</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8j" -->
-				<option value="j" SELECTED>maps</option>
+				<option value="j" selected="selected">maps</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">maps</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8k" -->
-				<option value="k" SELECTED>charts</option>
+				<option value="k" selected="selected">charts</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">charts</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8l" -->
-				<option value="l" SELECTED>plans</option>
+				<option value="l" selected="selected">plans</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">plans</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8m" -->
-				<option value="m" SELECTED>music</option>
+				<option value="m" selected="selected">music</option>
 			<!-- TMPL_ELSE -->
 				<option value="m">music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8n" -->
-				<option value="n" SELECTED>coats of arms</option>
+				<option value="n" selected="selected">coats of arms</option>
 			<!-- TMPL_ELSE -->
 				<option value="n">coats of arms</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8o" -->
-				<option value="o" SELECTED>genealogical tables</option>
+				<option value="o" selected="selected">genealogical tables</option>
 			<!-- TMPL_ELSE -->
 				<option value="o">genealogical tables</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8y" -->
-				<option value="y" SELECTED>no illustrations</option>
+				<option value="y" selected="selected">no illustrations</option>
 			<!-- TMPL_ELSE -->
 				<option value="y">no illustrations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
+			</select>
 		</td></tr>
-<tr>		<td>Illustration - Technique:</td>
+<tr>		<td><label for="f9">Illustration - Technique:</label></td>
 		<td>
-			<select name="f9" size="1">
+			<select name="f9" id="f9" size="1">
             
 			<!-- TMPL_IF name="f9 " -->
-				<option value=" " SELECTED>non required value</option>
+				<option value=" " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9a" -->
-				<option value="a" SELECTED>woodcut</option>
+				<option value="a" selected="selected">woodcut</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">woodcut</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9b" -->
-				<option value="b" SELECTED>lithography</option>
+				<option value="b" selected="selected">lithography</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">lithography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9c" -->
-				<option value="c" SELECTED>etching</option>
+				<option value="c" selected="selected">etching</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">etching</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9d" -->
-				<option value="d" SELECTED>aquatint</option>
+				<option value="d" selected="selected">aquatint</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">aquatint</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9e" -->
-				<option value="e" SELECTED>engraving</option>
+				<option value="e" selected="selected">engraving</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">engraving</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9v" -->
-				<option value="v" SELECTED>mixed</option>
+				<option value="v" selected="selected">mixed</option>
 			<!-- TMPL_ELSE -->
 				<option value="v">mixed</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
-		</td></tr>
-<tr>		<td>Form of Contents 1:</td>
+			</select>
+		</td><td>&nbsp;</td>
+		</tr>
+		<tr>
+		<td><label for="f10">Form of Contents 1:</label></td>
 		<td>
-			<select name="f10" size="1">
+			<select name="f10" id="f10" size="1">
             
 			<!-- TMPL_IF name="f10  " -->
-				<option value="  " SELECTED>non required value</option>
+				<option value="  " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value="  ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10aa" -->
-				<option value="aa" SELECTED>religious work</option>
+				<option value="aa" selected="selected">religious work</option>
 			<!-- TMPL_ELSE -->
 				<option value="aa">religious work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ab" -->
-				<option value="ab" SELECTED>catechism</option>
+				<option value="ab" selected="selected">catechism</option>
 			<!-- TMPL_ELSE -->
 				<option value="ab">catechism</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ac" -->
-				<option value="ac" SELECTED>devotional literature</option>
+				<option value="ac" selected="selected">devotional literature</option>
 			<!-- TMPL_ELSE -->
 				<option value="ac">devotional literature</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ad" -->
-				<option value="ad" SELECTED>sermon</option>
+				<option value="ad" selected="selected">sermon</option>
 			<!-- TMPL_ELSE -->
 				<option value="ad">sermon</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ae" -->
-				<option value="ae" SELECTED>service books</option>
+				<option value="ae" selected="selected">service books</option>
 			<!-- TMPL_ELSE -->
 				<option value="ae">service books</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ba" -->
-				<option value="ba" SELECTED>scientific work</option>
+				<option value="ba" selected="selected">scientific work</option>
 			<!-- TMPL_ELSE -->
 				<option value="ba">scientific work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10bb" -->
-				<option value="bb" SELECTED>discussion, dissertation, thesis</option>
+				<option value="bb" selected="selected">discussion, dissertation, thesis</option>
 			<!-- TMPL_ELSE -->
 				<option value="bb">discussion, dissertation, thesis</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ca" -->
-				<option value="ca" SELECTED>social customs</option>
+				<option value="ca" selected="selected">social customs</option>
 			<!-- TMPL_ELSE -->
 				<option value="ca">social customs</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10da" -->
-				<option value="da" SELECTED>legal work</option>
+				<option value="da" selected="selected">legal work</option>
 			<!-- TMPL_ELSE -->
 				<option value="da">legal work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10db" -->
-				<option value="db" SELECTED>political work</option>
+				<option value="db" selected="selected">political work</option>
 			<!-- TMPL_ELSE -->
 				<option value="db">political work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ea" -->
-				<option value="ea" SELECTED>ephemera</option>
+				<option value="ea" selected="selected">ephemera</option>
 			<!-- TMPL_ELSE -->
 				<option value="ea">ephemera</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10fa" -->
-				<option value="fa" SELECTED>reference work</option>
+				<option value="fa" selected="selected">reference work</option>
 			<!-- TMPL_ELSE -->
 				<option value="fa">reference work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10fb" -->
-				<option value="fb" SELECTED>library catalogue</option>
+				<option value="fb" selected="selected">library catalogue</option>
 			<!-- TMPL_ELSE -->
 				<option value="fb">library catalogue</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10fc" -->
-				<option value="fc" SELECTED>bibliography</option>
+				<option value="fc" selected="selected">bibliography</option>
 			<!-- TMPL_ELSE -->
 				<option value="fc">bibliography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10fd" -->
-				<option value="fd" SELECTED>calendar</option>
+				<option value="fd" selected="selected">calendar</option>
 			<!-- TMPL_ELSE -->
 				<option value="fd">calendar</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10fe" -->
-				<option value="fe" SELECTED>index</option>
+				<option value="fe" selected="selected">index</option>
 			<!-- TMPL_ELSE -->
 				<option value="fe">index</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ff" -->
-				<option value="ff" SELECTED>dictionary</option>
+				<option value="ff" selected="selected">dictionary</option>
 			<!-- TMPL_ELSE -->
 				<option value="ff">dictionary</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10fg" -->
-				<option value="fg" SELECTED>encyclopedia</option>
+				<option value="fg" selected="selected">encyclopedia</option>
 			<!-- TMPL_ELSE -->
 				<option value="fg">encyclopedia</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ga" -->
-				<option value="ga" SELECTED>historical work</option>
+				<option value="ga" selected="selected">historical work</option>
 			<!-- TMPL_ELSE -->
 				<option value="ga">historical work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ha" -->
-				<option value="ha" SELECTED>polemical treatise</option>
+				<option value="ha" selected="selected">polemical treatise</option>
 			<!-- TMPL_ELSE -->
 				<option value="ha">polemical treatise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ia" -->
-				<option value="ia" SELECTED>discursive work</option>
+				<option value="ia" selected="selected">discursive work</option>
 			<!-- TMPL_ELSE -->
 				<option value="ia">discursive work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ja" -->
-				<option value="ja" SELECTED>commemorative work</option>
+				<option value="ja" selected="selected">commemorative work</option>
 			<!-- TMPL_ELSE -->
 				<option value="ja">commemorative work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ka" -->
-				<option value="ka" SELECTED>instructional work</option>
+				<option value="ka" selected="selected">instructional work</option>
 			<!-- TMPL_ELSE -->
 				<option value="ka">instructional work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10kb" -->
-				<option value="kb" SELECTED>manual</option>
+				<option value="kb" selected="selected">manual</option>
 			<!-- TMPL_ELSE -->
 				<option value="kb">manual</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10kc" -->
-				<option value="kc" SELECTED>textbook</option>
+				<option value="kc" selected="selected">textbook</option>
 			<!-- TMPL_ELSE -->
 				<option value="kc">textbook</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10la" -->
-				<option value="la" SELECTED>record-keeping work</option>
+				<option value="la" selected="selected">record-keeping work</option>
 			<!-- TMPL_ELSE -->
 				<option value="la">record-keeping work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ma" -->
-				<option value="ma" SELECTED>recreations</option>
+				<option value="ma" selected="selected">recreations</option>
 			<!-- TMPL_ELSE -->
 				<option value="ma">recreations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10na" -->
-				<option value="na" SELECTED>version of a work</option>
+				<option value="na" selected="selected">version of a work</option>
 			<!-- TMPL_ELSE -->
 				<option value="na">version of a work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10zz" -->
-				<option value="zz" SELECTED>other</option>
+				<option value="zz" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="zz">other</option>
 			<!-- /TMPL_IF -->
-		</td></tr>
-<tr>		<td>Form of Contents 2:</td>
+			</select>
+		</td>
+		<td><label for="f11">Form of Contents 2:</label></td>
 		<td>
-			<select name="f11" size="1">
+			<select name="f11" id="f11" size="1">
             
 			<!-- TMPL_IF name="f11  " -->
-				<option value="  " SELECTED>non required value</option>
+				<option value="  " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value="  ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11aa" -->
-				<option value="aa" SELECTED>religious work</option>
+				<option value="aa" selected="selected">religious work</option>
 			<!-- TMPL_ELSE -->
 				<option value="aa">religious work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11ab" -->
-				<option value="ab" SELECTED>catechism</option>
+				<option value="ab" selected="selected">catechism</option>
 			<!-- TMPL_ELSE -->
 				<option value="ab">catechism</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11ac" -->
-				<option value="ac" SELECTED>devotional literature</option>
+				<option value="ac" selected="selected">devotional literature</option>
 			<!-- TMPL_ELSE -->
 				<option value="ac">devotional literature</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11ad" -->
-				<option value="ad" SELECTED>sermon</option>
+				<option value="ad" selected="selected">sermon</option>
 			<!-- TMPL_ELSE -->
 				<option value="ad">sermon</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11ae" -->
-				<option value="ae" SELECTED>service books</option>
+				<option value="ae" selected="selected">service books</option>
 			<!-- TMPL_ELSE -->
 				<option value="ae">service books</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11ba" -->
-				<option value="ba" SELECTED>scientific work</option>
+				<option value="ba" selected="selected">scientific work</option>
 			<!-- TMPL_ELSE -->
 				<option value="ba">scientific work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11bb" -->
-				<option value="bb" SELECTED>discussion, dissertation, thesis</option>
+				<option value="bb" selected="selected">discussion, dissertation, thesis</option>
 			<!-- TMPL_ELSE -->
 				<option value="bb">discussion, dissertation, thesis</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11ca" -->
-				<option value="ca" SELECTED>social customs</option>
+				<option value="ca" selected="selected">social customs</option>
 			<!-- TMPL_ELSE -->
 				<option value="ca">social customs</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11da" -->
-				<option value="da" SELECTED>legal work</option>
+				<option value="da" selected="selected">legal work</option>
 			<!-- TMPL_ELSE -->
 				<option value="da">legal work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11db" -->
-				<option value="db" SELECTED>political work</option>
+				<option value="db" selected="selected">political work</option>
 			<!-- TMPL_ELSE -->
 				<option value="db">political work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11ea" -->
-				<option value="ea" SELECTED>ephemera</option>
+				<option value="ea" selected="selected">ephemera</option>
 			<!-- TMPL_ELSE -->
 				<option value="ea">ephemera</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11fa" -->
-				<option value="fa" SELECTED>reference work</option>
+				<option value="fa" selected="selected">reference work</option>
 			<!-- TMPL_ELSE -->
 				<option value="fa">reference work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11fb" -->
-				<option value="fb" SELECTED>library catalogue</option>
+				<option value="fb" selected="selected">library catalogue</option>
 			<!-- TMPL_ELSE -->
 				<option value="fb">library catalogue</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11fc" -->
-				<option value="fc" SELECTED>bibliography</option>
+				<option value="fc" selected="selected">bibliography</option>
 			<!-- TMPL_ELSE -->
 				<option value="fc">bibliography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11fd" -->
-				<option value="fd" SELECTED>calendar</option>
+				<option value="fd" selected="selected">calendar</option>
 			<!-- TMPL_ELSE -->
 				<option value="fd">calendar</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11fe" -->
-				<option value="fe" SELECTED>index</option>
+				<option value="fe" selected="selected">index</option>
 			<!-- TMPL_ELSE -->
 				<option value="fe">index</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11ff" -->
-				<option value="ff" SELECTED>dictionary</option>
+				<option value="ff" selected="selected">dictionary</option>
 			<!-- TMPL_ELSE -->
 				<option value="ff">dictionary</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11fg" -->
-				<option value="fg" SELECTED>encyclopedia</option>
+				<option value="fg" selected="selected">encyclopedia</option>
 			<!-- TMPL_ELSE -->
 				<option value="fg">encyclopedia</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11ga" -->
-				<option value="ga" SELECTED>historical work</option>
+				<option value="ga" selected="selected">historical work</option>
 			<!-- TMPL_ELSE -->
 				<option value="ga">historical work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11ha" -->
-				<option value="ha" SELECTED>polemical treatise</option>
+				<option value="ha" selected="selected">polemical treatise</option>
 			<!-- TMPL_ELSE -->
 				<option value="ha">polemical treatise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11ia" -->
-				<option value="ia" SELECTED>discursive work</option>
+				<option value="ia" selected="selected">discursive work</option>
 			<!-- TMPL_ELSE -->
 				<option value="ia">discursive work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11ja" -->
-				<option value="ja" SELECTED>commemorative work</option>
+				<option value="ja" selected="selected">commemorative work</option>
 			<!-- TMPL_ELSE -->
 				<option value="ja">commemorative work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11ka" -->
-				<option value="ka" SELECTED>instructional work</option>
+				<option value="ka" selected="selected">instructional work</option>
 			<!-- TMPL_ELSE -->
 				<option value="ka">instructional work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11kb" -->
-				<option value="kb" SELECTED>manual</option>
+				<option value="kb" selected="selected">manual</option>
 			<!-- TMPL_ELSE -->
 				<option value="kb">manual</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11kc" -->
-				<option value="kc" SELECTED>textbook</option>
+				<option value="kc" selected="selected">textbook</option>
 			<!-- TMPL_ELSE -->
 				<option value="kc">textbook</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11la" -->
-				<option value="la" SELECTED>record-keeping work</option>
+				<option value="la" selected="selected">record-keeping work</option>
 			<!-- TMPL_ELSE -->
 				<option value="la">record-keeping work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11ma" -->
-				<option value="ma" SELECTED>recreations</option>
+				<option value="ma" selected="selected">recreations</option>
 			<!-- TMPL_ELSE -->
 				<option value="ma">recreations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11na" -->
-				<option value="na" SELECTED>version of a work</option>
+				<option value="na" selected="selected">version of a work</option>
 			<!-- TMPL_ELSE -->
 				<option value="na">version of a work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11zz" -->
-				<option value="zz" SELECTED>other</option>
+				<option value="zz" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="zz">other</option>
 			<!-- /TMPL_IF -->
-		</td></tr>
-<tr>		<td>Form of Contents 3:</td>
-		<td>
-			<select name="f12" size="1">
+			</select>
+			</td>
+			</tr>
+			<tr>
+			<td><label for="f12">Form of Contents 3:</label></td>
+			<td>
+			<select name="f12" id="f12" size="1">
             
 			<!-- TMPL_IF name="f12  " -->
-				<option value="  " SELECTED>non required value</option>
+				<option value="  " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value="  ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12aa" -->
-				<option value="aa" SELECTED>religious work</option>
+				<option value="aa" selected="selected">religious work</option>
 			<!-- TMPL_ELSE -->
 				<option value="aa">religious work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12ab" -->
-				<option value="ab" SELECTED>catechism</option>
+				<option value="ab" selected="selected">catechism</option>
 			<!-- TMPL_ELSE -->
 				<option value="ab">catechism</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12ac" -->
-				<option value="ac" SELECTED>devotional literature</option>
+				<option value="ac" selected="selected">devotional literature</option>
 			<!-- TMPL_ELSE -->
 				<option value="ac">devotional literature</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12ad" -->
-				<option value="ad" SELECTED>sermon</option>
+				<option value="ad" selected="selected">sermon</option>
 			<!-- TMPL_ELSE -->
 				<option value="ad">sermon</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12ae" -->
-				<option value="ae" SELECTED>service books</option>
+				<option value="ae" selected="selected">service books</option>
 			<!-- TMPL_ELSE -->
 				<option value="ae">service books</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12ba" -->
-				<option value="ba" SELECTED>scientific work</option>
+				<option value="ba" selected="selected">scientific work</option>
 			<!-- TMPL_ELSE -->
 				<option value="ba">scientific work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12bb" -->
-				<option value="bb" SELECTED>discussion, dissertation, thesis</option>
+				<option value="bb" selected="selected">discussion, dissertation, thesis</option>
 			<!-- TMPL_ELSE -->
 				<option value="bb">discussion, dissertation, thesis</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12ca" -->
-				<option value="ca" SELECTED>social customs</option>
+				<option value="ca" selected="selected">social customs</option>
 			<!-- TMPL_ELSE -->
 				<option value="ca">social customs</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12da" -->
-				<option value="da" SELECTED>legal work</option>
+				<option value="da" selected="selected">legal work</option>
 			<!-- TMPL_ELSE -->
 				<option value="da">legal work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12db" -->
-				<option value="db" SELECTED>political work</option>
+				<option value="db" selected="selected">political work</option>
 			<!-- TMPL_ELSE -->
 				<option value="db">political work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12ea" -->
-				<option value="ea" SELECTED>ephemera</option>
+				<option value="ea" selected="selected">ephemera</option>
 			<!-- TMPL_ELSE -->
 				<option value="ea">ephemera</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12fa" -->
-				<option value="fa" SELECTED>reference work</option>
+				<option value="fa" selected="selected">reference work</option>
 			<!-- TMPL_ELSE -->
 				<option value="fa">reference work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12fb" -->
-				<option value="fb" SELECTED>library catalogue</option>
+				<option value="fb" selected="selected">library catalogue</option>
 			<!-- TMPL_ELSE -->
 				<option value="fb">library catalogue</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12fc" -->
-				<option value="fc" SELECTED>bibliography</option>
+				<option value="fc" selected="selected">bibliography</option>
 			<!-- TMPL_ELSE -->
 				<option value="fc">bibliography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12fd" -->
-				<option value="fd" SELECTED>calendar</option>
+				<option value="fd" selected="selected">calendar</option>
 			<!-- TMPL_ELSE -->
 				<option value="fd">calendar</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12fe" -->
-				<option value="fe" SELECTED>index</option>
+				<option value="fe" selected="selected">index</option>
 			<!-- TMPL_ELSE -->
 				<option value="fe">index</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12ff" -->
-				<option value="ff" SELECTED>dictionary</option>
+				<option value="ff" selected="selected">dictionary</option>
 			<!-- TMPL_ELSE -->
 				<option value="ff">dictionary</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12fg" -->
-				<option value="fg" SELECTED>encyclopedia</option>
+				<option value="fg" selected="selected">encyclopedia</option>
 			<!-- TMPL_ELSE -->
 				<option value="fg">encyclopedia</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12ga" -->
-				<option value="ga" SELECTED>historical work</option>
+				<option value="ga" selected="selected">historical work</option>
 			<!-- TMPL_ELSE -->
 				<option value="ga">historical work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12ha" -->
-				<option value="ha" SELECTED>polemical treatise</option>
+				<option value="ha" selected="selected">polemical treatise</option>
 			<!-- TMPL_ELSE -->
 				<option value="ha">polemical treatise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12ia" -->
-				<option value="ia" SELECTED>discursive work</option>
+				<option value="ia" selected="selected">discursive work</option>
 			<!-- TMPL_ELSE -->
 				<option value="ia">discursive work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12ja" -->
-				<option value="ja" SELECTED>commemorative work</option>
+				<option value="ja" selected="selected">commemorative work</option>
 			<!-- TMPL_ELSE -->
 				<option value="ja">commemorative work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12ka" -->
-				<option value="ka" SELECTED>instructional work</option>
+				<option value="ka" selected="selected">instructional work</option>
 			<!-- TMPL_ELSE -->
 				<option value="ka">instructional work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12kb" -->
-				<option value="kb" SELECTED>manual</option>
+				<option value="kb" selected="selected">manual</option>
 			<!-- TMPL_ELSE -->
 				<option value="kb">manual</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12kc" -->
-				<option value="kc" SELECTED>textbook</option>
+				<option value="kc" selected="selected">textbook</option>
 			<!-- TMPL_ELSE -->
 				<option value="kc">textbook</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12la" -->
-				<option value="la" SELECTED>record-keeping work</option>
+				<option value="la" selected="selected">record-keeping work</option>
 			<!-- TMPL_ELSE -->
 				<option value="la">record-keeping work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12ma" -->
-				<option value="ma" SELECTED>recreations</option>
+				<option value="ma" selected="selected">recreations</option>
 			<!-- TMPL_ELSE -->
 				<option value="ma">recreations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12na" -->
-				<option value="na" SELECTED>version of a work</option>
+				<option value="na" selected="selected">version of a work</option>
 			<!-- TMPL_ELSE -->
 				<option value="na">version of a work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12zz" -->
-				<option value="zz" SELECTED>other</option>
+				<option value="zz" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="zz">other</option>
 			<!-- /TMPL_IF -->
-		</td></tr>
-<tr>		<td>Form of Contents 4:</td>
+			</select>
+		</td>
+		<td><label for="f13">Form of Contents 4:</label></td>
 		<td>
-			<select name="f13" size="1">
+			<select name="f13" id="f13" size="1">
             
 			<!-- TMPL_IF name="f13  " -->
-				<option value="  " SELECTED>non required value</option>
+				<option value="  " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value="  ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13aa" -->
-				<option value="aa" SELECTED>religious work</option>
+				<option value="aa" selected="selected">religious work</option>
 			<!-- TMPL_ELSE -->
 				<option value="aa">religious work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13ab" -->
-				<option value="ab" SELECTED>catechism</option>
+				<option value="ab" selected="selected">catechism</option>
 			<!-- TMPL_ELSE -->
 				<option value="ab">catechism</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13ac" -->
-				<option value="ac" SELECTED>devotional literature</option>
+				<option value="ac" selected="selected">devotional literature</option>
 			<!-- TMPL_ELSE -->
 				<option value="ac">devotional literature</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13ad" -->
-				<option value="ad" SELECTED>sermon</option>
+				<option value="ad" selected="selected">sermon</option>
 			<!-- TMPL_ELSE -->
 				<option value="ad">sermon</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13ae" -->
-				<option value="ae" SELECTED>service books</option>
+				<option value="ae" selected="selected">service books</option>
 			<!-- TMPL_ELSE -->
 				<option value="ae">service books</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13ba" -->
-				<option value="ba" SELECTED>scientific work</option>
+				<option value="ba" selected="selected">scientific work</option>
 			<!-- TMPL_ELSE -->
 				<option value="ba">scientific work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13bb" -->
-				<option value="bb" SELECTED>discussion, dissertation, thesis</option>
+				<option value="bb" selected="selected">discussion, dissertation, thesis</option>
 			<!-- TMPL_ELSE -->
 				<option value="bb">discussion, dissertation, thesis</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13ca" -->
-				<option value="ca" SELECTED>social customs</option>
+				<option value="ca" selected="selected">social customs</option>
 			<!-- TMPL_ELSE -->
 				<option value="ca">social customs</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13da" -->
-				<option value="da" SELECTED>legal work</option>
+				<option value="da" selected="selected">legal work</option>
 			<!-- TMPL_ELSE -->
 				<option value="da">legal work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13db" -->
-				<option value="db" SELECTED>political work</option>
+				<option value="db" selected="selected">political work</option>
 			<!-- TMPL_ELSE -->
 				<option value="db">political work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13ea" -->
-				<option value="ea" SELECTED>ephemera</option>
+				<option value="ea" selected="selected">ephemera</option>
 			<!-- TMPL_ELSE -->
 				<option value="ea">ephemera</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13fa" -->
-				<option value="fa" SELECTED>reference work</option>
+				<option value="fa" selected="selected">reference work</option>
 			<!-- TMPL_ELSE -->
 				<option value="fa">reference work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13fb" -->
-				<option value="fb" SELECTED>library catalogue</option>
+				<option value="fb" selected="selected">library catalogue</option>
 			<!-- TMPL_ELSE -->
 				<option value="fb">library catalogue</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13fc" -->
-				<option value="fc" SELECTED>bibliography</option>
+				<option value="fc" selected="selected">bibliography</option>
 			<!-- TMPL_ELSE -->
 				<option value="fc">bibliography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13fd" -->
-				<option value="fd" SELECTED>calendar</option>
+				<option value="fd" selected="selected">calendar</option>
 			<!-- TMPL_ELSE -->
 				<option value="fd">calendar</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13fe" -->
-				<option value="fe" SELECTED>index</option>
+				<option value="fe" selected="selected">index</option>
 			<!-- TMPL_ELSE -->
 				<option value="fe">index</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13ff" -->
-				<option value="ff" SELECTED>dictionary</option>
+				<option value="ff" selected="selected">dictionary</option>
 			<!-- TMPL_ELSE -->
 				<option value="ff">dictionary</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13fg" -->
-				<option value="fg" SELECTED>encyclopedia</option>
+				<option value="fg" selected="selected">encyclopedia</option>
 			<!-- TMPL_ELSE -->
 				<option value="fg">encyclopedia</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13ga" -->
-				<option value="ga" SELECTED>historical work</option>
+				<option value="ga" selected="selected">historical work</option>
 			<!-- TMPL_ELSE -->
 				<option value="ga">historical work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13ha" -->
-				<option value="ha" SELECTED>polemical treatise</option>
+				<option value="ha" selected="selected">polemical treatise</option>
 			<!-- TMPL_ELSE -->
 				<option value="ha">polemical treatise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13ia" -->
-				<option value="ia" SELECTED>discursive work</option>
+				<option value="ia" selected="selected">discursive work</option>
 			<!-- TMPL_ELSE -->
 				<option value="ia">discursive work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13ja" -->
-				<option value="ja" SELECTED>commemorative work</option>
+				<option value="ja" selected="selected">commemorative work</option>
 			<!-- TMPL_ELSE -->
 				<option value="ja">commemorative work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13ka" -->
-				<option value="ka" SELECTED>instructional work</option>
+				<option value="ka" selected="selected">instructional work</option>
 			<!-- TMPL_ELSE -->
 				<option value="ka">instructional work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13kb" -->
-				<option value="kb" SELECTED>manual</option>
+				<option value="kb" selected="selected">manual</option>
 			<!-- TMPL_ELSE -->
 				<option value="kb">manual</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13kc" -->
-				<option value="kc" SELECTED>textbook</option>
+				<option value="kc" selected="selected">textbook</option>
 			<!-- TMPL_ELSE -->
 				<option value="kc">textbook</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13la" -->
-				<option value="la" SELECTED>record-keeping work</option>
+				<option value="la" selected="selected">record-keeping work</option>
 			<!-- TMPL_ELSE -->
 				<option value="la">record-keeping work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13ma" -->
-				<option value="ma" SELECTED>recreations</option>
+				<option value="ma" selected="selected">recreations</option>
 			<!-- TMPL_ELSE -->
 				<option value="ma">recreations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13na" -->
-				<option value="na" SELECTED>version of a work</option>
+				<option value="na" selected="selected">version of a work</option>
 			<!-- TMPL_ELSE -->
 				<option value="na">version of a work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13zz" -->
-				<option value="zz" SELECTED>other</option>
+				<option value="zz" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="zz">other</option>
 			<!-- /TMPL_IF -->
+			</select>
 		</td></tr>
-<tr>		<td>Literature:</td>
+<tr>		<td><label for="f14">Literature:</label></td>
 		<td>
-			<select name="f14" size="1">
+			<select name="f14" id="f14" size="1">
 
 			<!-- TMPL_IF name="f14  " -->
-				<option value="  " SELECTED>non required value</option>
+				<option value="  " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value="  ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14aa" -->
-				<option value="aa" SELECTED>poetry</option>
+				<option value="aa" selected="selected">poetry</option>
 			<!-- TMPL_ELSE -->
 				<option value="aa">poetry</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14ab" -->
-				<option value="ab" SELECTED>romance</option>
+				<option value="ab" selected="selected">romance</option>
 			<!-- TMPL_ELSE -->
 				<option value="ab">romance</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14ca" -->
-				<option value="ca" SELECTED>drama</option>
+				<option value="ca" selected="selected">drama</option>
 			<!-- TMPL_ELSE -->
 				<option value="ca">drama</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14da" -->
-				<option value="da" SELECTED>libretto</option>
+				<option value="da" selected="selected">libretto</option>
 			<!-- TMPL_ELSE -->
 				<option value="da">libretto</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14ea" -->
-				<option value="ea" SELECTED>fiction</option>
+				<option value="ea" selected="selected">fiction</option>
 			<!-- TMPL_ELSE -->
 				<option value="ea">fiction</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14eb" -->
-				<option value="eb" SELECTED>novel</option>
+				<option value="eb" selected="selected">novel</option>
 			<!-- TMPL_ELSE -->
 				<option value="eb">novel</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14ec" -->
-				<option value="ec" SELECTED>novella</option>
+				<option value="ec" selected="selected">novella</option>
 			<!-- TMPL_ELSE -->
 				<option value="ec">novella</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14ed" -->
-				<option value="ed" SELECTED>fable</option>
+				<option value="ed" selected="selected">fable</option>
 			<!-- TMPL_ELSE -->
 				<option value="ed">fable</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14ef" -->
-				<option value="ef" SELECTED>fairy tale</option>
+				<option value="ef" selected="selected">fairy tale</option>
 			<!-- TMPL_ELSE -->
 				<option value="ef">fairy tale</option>
 			<!-- /TMPL_IF -->
 			
 			<!-- TMPL_IF name="f14eg" -->
-				<option value="eg" SELECTED>allegory</option>
+				<option value="eg" selected="selected">allegory</option>
 			<!-- TMPL_ELSE -->
 				<option value="eg">allegory</option>
 			<!-- /TMPL_IF -->
 			
 			<!-- TMPL_IF name="f14eh" -->
-				<option value="eh" SELECTED>legend</option>
+				<option value="eh" selected="selected">legend</option>
 			<!-- TMPL_ELSE -->
 				<option value="eh">legend</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f14ei" -->
-				<option value="ei" SELECTED>parable</option>
+				<option value="ei" selected="selected">parable</option>
 			<!-- TMPL_ELSE -->
 				<option value="ei">parable</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14ej" -->
-				<option value="ej" SELECTED>short story</option>
+				<option value="ej" selected="selected">short story</option>
 			<!-- TMPL_ELSE -->
 				<option value="ej">short story</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14fa" -->
-				<option value="fa" SELECTED>essay, feuilleton</option>
+				<option value="fa" selected="selected">essay, feuilleton</option>
 			<!-- TMPL_ELSE -->
 				<option value="fa">essay, feuilleton</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14ga" -->
-				<option value="ga" SELECTED>humour, satire</option>
+				<option value="ga" selected="selected">humour, satire</option>
 			<!-- TMPL_ELSE -->
 				<option value="ga">humour, satire</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14ha" -->
-				<option value="ha" SELECTED>letters</option>
+				<option value="ha" selected="selected">letters</option>
 			<!-- TMPL_ELSE -->
 				<option value="ha">letters</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14ia" -->
-				<option value="ia" SELECTED>miscellane</option>
+				<option value="ia" selected="selected">miscellane</option>
 			<!-- TMPL_ELSE -->
 				<option value="ia">miscellane</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14ja" -->
-				<option value="ja" SELECTED>maxim, aphorism, proverb, anecdote</option>
+				<option value="ja" selected="selected">maxim, aphorism, proverb, anecdote</option>
 			<!-- TMPL_ELSE -->
 				<option value="ja">maxim, aphorism, proverb, anecdote</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14ka" -->
-				<option value="ka" SELECTED>juvenile literature</option>
+				<option value="ka" selected="selected">juvenile literature</option>
 			<!-- TMPL_ELSE -->
 				<option value="ka">juvenile literature</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14la" -->
-				<option value="la" SELECTED>other</option>
+				<option value="la" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="la">other</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14lb" -->
-				<option value="lb" SELECTED>chronicle</option>
+				<option value="lb" selected="selected">chronicle</option>
 			<!-- TMPL_ELSE -->
 				<option value="lb">chronicle</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14lc" -->
-				<option value="lc" SELECTED>memoir</option>
+				<option value="lc" selected="selected">memoir</option>
 			<!-- TMPL_ELSE -->
 				<option value="lc">memoir</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14ld" -->
-				<option value="ld" SELECTED>diary</option>
+				<option value="ld" selected="selected">diary</option>
 			<!-- TMPL_ELSE -->
 				<option value="ld">diary</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14le" -->
-				<option value="le" SELECTED>biography</option>
+				<option value="le" selected="selected">biography</option>
 			<!-- TMPL_ELSE -->
 				<option value="le">biography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14lf" -->
-				<option value="lf" SELECTED>hagiography</option>
+				<option value="lf" selected="selected">hagiography</option>
 			<!-- TMPL_ELSE -->
 				<option value="lf">hagiography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14lg" -->
-				<option value="lg" SELECTED>travelogue</option>
+				<option value="lg" selected="selected">travelogue</option>
 			<!-- TMPL_ELSE -->
 				<option value="lg">travelogue</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14lh" -->
-				<option value="lh" SELECTED>erotica</option>
+				<option value="lh" selected="selected">erotica</option>
 			<!-- TMPL_ELSE -->
 				<option value="lh">erotica</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14li" -->
-				<option value="li" SELECTED>erotica</option>
+				<option value="li" selected="selected">erotica</option>
 			<!-- TMPL_ELSE -->
 				<option value="li">erotica</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14ma" -->
-				<option value="ma" SELECTED>oratory, speeches</option>
+				<option value="ma" selected="selected">oratory, speeches</option>
 			<!-- TMPL_ELSE -->
 				<option value="ma">oratory, speeches</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14yy" -->
-				<option value="yy" SELECTED>not a literary text</option>
+				<option value="yy" selected="selected">not a literary text</option>
 			<!-- TMPL_ELSE -->
 				<option value="yy">not a literary text</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14zz" -->
-				<option value="zz" SELECTED>multiple or other</option>
+				<option value="zz" selected="selected">multiple or other</option>
 			<!-- TMPL_ELSE -->
 				<option value="zz">multiple or other</option>
 			<!-- /TMPL_IF -->
-		</td></tr>
-	<tr>
-		<td>Biography:</td>
+			</select>
+		</td>
+		<td><label for="f15">Biography:</label></td>
 		<td>
-			<select name="f15" size="1">
+			<select name="f15" id="f15" size="1">
 
 			<!-- TMPL_IF name="f15 " -->
-				<option value=" " SELECTED>non required value</option>
+				<option value=" " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15a" -->
-				<option value="a" SELECTED>autobiography</option>
+				<option value="a" selected="selected">autobiography</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">autobiography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15b" -->
-				<option value="b" SELECTED>individual biography</option>
+				<option value="b" selected="selected">individual biography</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">individual biography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15c" -->
-				<option value="c" SELECTED>collective biography</option>
+				<option value="c" selected="selected">collective biography</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">collective biography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15d" -->
-				<option value="d" SELECTED>contains biographical information</option>
+				<option value="d" selected="selected">contains biographical information</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">contains biographical information</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15y" -->
-				<option value="y" SELECTED>not biographical</option>
+				<option value="y" selected="selected">not biographical</option>
 			<!-- TMPL_ELSE -->
 				<option value="y">not biographical</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15z" -->
-				<option value="z" SELECTED>multiple or other form</option>
+				<option value="z" selected="selected">multiple or other form</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">multiple or other form</option>
 			<!-- /TMPL_IF -->
@@ -1551,86 +1566,84 @@
 		</td>
 </tr>
 	<tr>
-		<td>Support Material - Book:</td>
+		<td><label for="f16">Support Material - Book:</label></td>
 		<td>
-			<select name="f16" size="1">
+			<select name="f16" id="f16" size="1">
 
 			<!-- TMPL_IF name="f16 " -->
-				<option value=" " SELECTED>non required value</option>
+				<option value=" " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f16a" -->
-				<option value="a" SELECTED>paper, general</option>
+				<option value="a" selected="selected">paper, general</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">paper, general</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f16b" -->
-				<option value="b" SELECTED>hand-made paper</option>
+				<option value="b" selected="selected">hand-made paper</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">hand-made paper</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f16c" -->
-				<option value="c" SELECTED>rice paper</option>
+				<option value="c" selected="selected">rice paper</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">rice paper</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f16d" -->
-				<option value="d" SELECTED>wood-pulp paper</option>
+				<option value="d" selected="selected">wood-pulp paper</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">wood-pulp paper</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f16e" -->
-				<option value="e" SELECTED>parchment, vellum</option>
+				<option value="e" selected="selected">parchment, vellum</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">parchment, vellum</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f16z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
 	</select>
 		</td>
-</tr>
-	<tr>
-		<td>Support Material - Plates:</td>
+		<td><label for="f17">Support Material - Plates:</label></td>
 		<td>
-			<select name="f17" size="1">
+			<select name="f17" id="f17" size="1">
 
          		<!-- TMPL_IF name="f17" -->
-				<option value=" " SELECTED>non required value</option>
+				<option value=" " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">non required value</option>
 			<!-- /TMPL_IF -->
 			
 			<!-- TMPL_IF name="f17a" -->
-				<option value="a" SELECTED>paper, general</option>
+				<option value="a" selected="selected">paper, general</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">paper, general</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f17b" -->
-				<option value="b" SELECTED>hand-made paper</option>
+				<option value="b" selected="selected">hand-made paper</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">hand-made paper</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f17c" -->
-				<option value="c" SELECTED>rice paper</option>
+				<option value="c" selected="selected">rice paper</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">rice paper</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f17d" -->
-				<option value="d" SELECTED>wood-pulp paper</option>
+				<option value="d" selected="selected">wood-pulp paper</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">wood-pulp paper</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f17e" -->
-				<option value="e" SELECTED>parchment, vellum</option>
+				<option value="e" selected="selected">parchment, vellum</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">parchment, vellum</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f17z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
@@ -1638,35 +1651,33 @@
 		</td>
 </tr>
 	<tr>
-		<td>Watermark:</td>
+		<td><label for="f18">Watermark:</label></td>
 		<td>
-			<select name="f18" size="1">
+			<select name="f18" id="f18" size="1">
 
-			<!-- TMPL_IF name="f180" -->
-				<option value="0" SELECTED>paper does not contain watermark</option>
+			<!-- TMPL_IF name="f180" id="f180" -->
+				<option value="0" selected="selected">paper does not contain watermark</option>
 			<!-- TMPL_ELSE -->
 				<option value="0">paper does not contain watermark</option>
 			<!-- /TMPL_IF -->
-			<!-- TMPL_IF name="f181" -->
-				<option value="1" SELECTED>paper contains watermark</option>
+			<!-- TMPL_IF name="f181" id="f181" -->
+				<option value="1" selected="selected">paper contains watermark</option>
 			<!-- TMPL_ELSE -->
 				<option value="1">paper contains watermark</option>
 			<!-- /TMPL_IF -->
 	</select>
 		</td>
-</tr>
-	<tr>
-		<td>Printer's Device:</td>
+		<td><label for="f19">Printer's Device:</label></td>
 		<td>
-			<select name="f19" size="1">
+			<select name="f19" id="f19" size="1">
 
-			<!-- TMPL_IF name="f190" -->
-				<option value="0" SELECTED>printer's device not present</option>
+			<!-- TMPL_IF name="f190" id="f190" -->
+				<option value="0" selected="selected">printer's device not present</option>
 			<!-- TMPL_ELSE -->
 				<option value="0">printer's device not present</option>
 			<!-- /TMPL_IF -->
-			<!-- TMPL_IF name="f191" -->
-				<option value="1" SELECTED>printer's device present</option>
+			<!-- TMPL_IF name="f191" id="f191" -->
+				<option value="1" selected="selected">printer's device present</option>
 			<!-- TMPL_ELSE -->
 				<option value="1">printer's device present</option>
 			<!-- /TMPL_IF -->
@@ -1674,45 +1685,44 @@
 		</td>
 </tr>
 	<tr>
-		<td>Publisher's Device:</td>
+		<td><label for="f20">Publisher's Device:</label></td>
 		<td>
-			<select name="f20" size="1">
+			<select name="f20" id="f20" size="1">
 
-			<!-- TMPL_IF name="f200" -->
-				<option value="0" SELECTED>publisher's device not present</option>
+			<!-- TMPL_IF name="f200" id="f200" -->
+				<option value="0" selected="selected">publisher's device not present</option>
 			<!-- TMPL_ELSE -->
 				<option value="0">publisher's device not present</option>
 			<!-- /TMPL_IF -->
-			<!-- TMPL_IF name="f201" -->
-				<option value="1" SELECTED>publisher's device present</option>
+			<!-- TMPL_IF name="f201" id="f201" -->
+				<option value="1" selected="selected">publisher's device present</option>
 			<!-- TMPL_ELSE -->
 				<option value="1">publisher's device present</option>
 			<!-- /TMPL_IF -->
 	</select>
 		</td>
-</tr>
-	<tr>
-		<td>Ornamental Device:</td>
+		<td><label for="f21">Ornamental Device:</label></td>
 		<td>
-			<select name="f21" size="1">
+			<select name="f21" id="f21" size="1">
 
-			<!-- TMPL_IF name="f210" -->
-				<option value="0" SELECTED>ornamental device not present</option>
+			<!-- TMPL_IF name="f210" id="f210" -->
+				<option value="0" selected="selected">ornamental device not present</option>
 			<!-- TMPL_ELSE -->
 				<option value="0">ornamental device not present</option>
 			<!-- /TMPL_IF -->
-			<!-- TMPL_IF name="f211" -->
-				<option value="1" SELECTED>ornamental device present</option>
+			<!-- TMPL_IF name="f211" id="f211" -->
+				<option value="1" selected="selected">ornamental device present</option>
 			<!-- TMPL_ELSE -->
 				<option value="1">ornamental device present</option>
 			<!-- /TMPL_IF -->
 	</select>
 		</td>
 </tr>
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
+//<![CDATA[
     function report() {
         var doc = opener.document; 
         var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
@@ -1720,6 +1730,7 @@
         self.close();
         return false;
     }
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_141.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_141.tmpl
index 8b1c6b2..54b7ab5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_141.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_141.tmpl
@@ -1,18 +1,15 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 141 builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 141 builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 141 builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Binding Material 1:</td>
+		<td><label for="f1">Binding Material 1:</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
             
 			<!-- TMPL_IF name="f1 " -->
 				<option value=" " SELECTED>non required value</option>
@@ -66,9 +63,9 @@
 			<!-- /TMPL_IF -->
 	</select>
 		</td></tr>	<tr>
-		<td>Binding Material 2:</td>
+		<td><label for="f2">Binding Material 2:</label></td>
 		<td>
-			<select name="f2" size="1">
+			<select name="f2" id="f2" size="1">
             
 			<!-- TMPL_IF name="f2 " -->
 				<option value=" " SELECTED>non required value</option>
@@ -123,9 +120,9 @@
 	</select>
 		</td></tr>
                 <tr>
-		<td>Binding Material 3:</td>
+		<td><label for="f3">Binding Material 3:</label></td>
 		<td>
-			<select name="f3" size="1">
+			<select name="f3" id="f3" size="1">
                         <!-- TMPL_IF name="f3 " -->
                                 <option value=" " SELECTED>non required value</option>
                         <!-- TMPL_ELSE -->
@@ -178,9 +175,10 @@
 			<!-- /TMPL_IF -->
 	</select>
 		</td></tr>
-		<td>Types of Binding:</td>
+		<tr>
+		<td><label for="f4">Types of Binding:</label></td>
 		<td>
-			<select name="f4" size="1">
+			<select name="f4" id="f4" size="1">
 
 			<!-- TMPL_IF name="f4a" -->
 				<option value="a" SELECTED>original, i.e. primary</option>
@@ -222,25 +220,27 @@
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
+			</select>
 		</td></tr>	<tr>
-		<td>Bound with':</td>
+		<td><label for="f5">Bound with':</label></td>
 		<td>
-			<select name="f5" size="1">
+			<select name="f5" id="f5" size="1">
 
-			<!-- TMPL_IF name="f50" -->
+			<!-- TMPL_IF name="f50" id="f50" -->
 				<option value="0" SELECTED>single item</option>
 			<!-- TMPL_ELSE -->
 				<option value="0">single item</option>
 			<!-- /TMPL_IF -->
-			<!-- TMPL_IF name="f51" -->
+			<!-- TMPL_IF name="f51" id="f51" -->
 				<option value="1" SELECTED>bound with one or more others</option>
 			<!-- TMPL_ELSE -->
 				<option value="1">bound with one or more others</option>
 			<!-- /TMPL_IF -->
+			</select>
 		</td></tr><tr>
-	<td>State of Preservation - Binding:</td>
+	<td><label for="f6">State of Preservation - Binding:</label></td>
 		<td>
-			<select name="f6" size="1">
+			<select name="f6" id="f6" size="1">
 
 			<!-- TMPL_IF name="f6a" -->
 				<option value="a" SELECTED>excellent</option>
@@ -277,10 +277,11 @@
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
+			</select>
 </td></tr><tr>
-	<td>State of Preservation - Body of the Book 1 :</td>
+	<td><label for="f7">State of Preservation - Body of the Book 1 :</label></td>
 		<td>
-			<select name="f7" size="1">
+			<select name="f7" id="f7" size="1">
 
 			<!-- TMPL_IF name="f7a" -->
 				<option value="a" SELECTED>excellent</option>
@@ -317,10 +318,11 @@
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
+			</select>
 </td></tr><tr>
-	<td>State of Preservation - Body of the Book 2 :</td>
+	<td><label for="f8">State of Preservation - Body of the Book 2 :</label></td>
 		<td>
-			<select name="f8" size="1">
+			<select name="f8" id="f8" size="1">
 
 			<!-- TMPL_IF name="f8a" -->
 				<option value="a" SELECTED>excellent</option>
@@ -357,11 +359,13 @@
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
+			</select>
 </td></tr>
-	<tr><td colspan=2><input type="button" value="OK"  onclick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
+//<![CDATA[
     function report() {
         var doc   = opener.document; 
         var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
@@ -370,6 +374,7 @@
         self.close();
         return false;
     }
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tmpl
index c2d19c7..9eb49fe 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tmpl
@@ -1,57 +1,47 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 210c builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 210c builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-
-<div id="mainbloc">
-    <h1 class="authority">Authority search results</h1>
-    <div>
+<body style="padding:1em;">
+<h3>UNIMARC Field 210c builder</h3>
+    <h4>Search for authority type: EDITORS</h4>
         <form name="f" method="post" action="plugin_launcher.pl">
-            <input type="hidden" name="plugin_name" value="unimarc_field_210c.pl" />
+        <fieldset class="rows">
+            <input type="hidden" name="plugin_name" value="UNIMARC Field_210c.pl" />
             <input type="hidden" name="op" value="do_search" />
             <input type="hidden" name="type" value="intranet" />
             <input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->" />
-            <div>
-                <h2 class="authority">Search on</h2>
-                <p>
-                    <label class="label100">Authority type</label>
-                    EDITORS
-                </p>
-                <p>
-                    <label class="label100">Search value</label><input type="text" name="value" value="<!-- TMPL_VAR name="resultstring" -->" />
-                    <input type="hidden" name="index" value="<!--TMPL_VAR Name="index"-->" />
-                    <input type="hidden" name="authtypecode" value="EDITORS" />
-                    <input type="hidden" name="q" value="<!-- TMPL_VAR NAME="index" -->" />
-                    <input type="hidden" name="marclist" value="all" />
-                    <input type="hidden" name="and_or" value="and" />
-                    <input type="hidden" name="excluding" value="" />
-					<select name="orderby">
+            <input type="hidden" name="index" value="<!--TMPL_VAR Name="index"-->" />
+            <input type="hidden" name="authtypecode" value="EDITORS" />
+            <input type="hidden" name="q" value="<!-- TMPL_VAR NAME="index" -->" />
+            <input type="hidden" name="marclist" value="all" />
+            <input type="hidden" name="and_or" value="and" />
+            <input type="hidden" name="excluding" value="" />
+                 <ol>
+                    <li>
+					<select name="orderby" id="orderby">
             			<option value="">None</option>
             			<option value="HeadingAsc" selected="selected">Heading A-Z</option>
             			<option value="HeadingDsc">Heading Z-A</option>
         			</select>
-					<select name="operator">
+					<select name="operator" id="operator">
 			            <option value="contains">contains</option>
 			            <option value="start">starts with</option>
 			            <option value="is">is exactly</option>
 		        	</select>
-
-                </p>
-                <p>
-                <input type="submit" value="Start search" class="button authority" />
-                </p>
-            </div>
+                    <input type="text" id="value" name="value" value="<!-- TMPL_VAR name="resultstring" -->" />
+                    </li>
+                </ol>
+                </fieldset>
+                <fieldset class="action">
+                <input type="submit" value="Search" />
+                </fieldset>
         </form>
-    </div>
-    <div>
-        <div>
+            <!-- TMPL_IF NAME="total" -->
+            <h3>Authority search results</h3>
             <div class="paginationBar">
-              <!--TMPL_VAR Name="pagination_bar"-->      
-            </div>
+                          <!--TMPL_VAR Name="pagination_bar"-->      
+                        </div><!-- /TMPL_IF -->
             <p>
                 <!-- TMPL_IF name="total" -->
                     &nbsp;<b>Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" --></b><br /><br />
@@ -59,38 +49,35 @@
                     &nbsp; No results found<br />
                 <!-- /TMPL_IF -->
             </p>
-        </div>
+<!-- TMPL_IF NAME="total" -->
         <div id="resultlist">
             <table>
                 <tr>
-                    <th class="authority">Summary</th>
-                    <th class="authority">Used</th>
-                    <th class="authority">Get It!</th>
+                    <th>Summary</th>
+                    <th>Used</th>
+                    <th>Get It!</th>
                 </tr>
                 <!-- TMPL_LOOP NAME="result" -->
                     <tr>
                         <td><!-- TMPL_VAR NAME="summary" --></td>
                         <td><!-- TMPL_VAR NAME="used" --> times</td>
                         <td>
-			    <!-- TMPL_IF NAME="to_report" -->
+                <!-- TMPL_IF NAME="to_report" -->
                             <a href="javascript:report('<!-- TMPL_VAR name="to_report" ESCAPE=JS -->')"><img alt="choose" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/arrow.gif" width="32" hspace="0" vspace="0" border="0"></a>
-			    <!-- /TMPL_IF -->
+                <!-- /TMPL_IF -->
                         </td>
                     </tr>
                 <!-- /TMPL_LOOP -->
             </table>
-    
         </div>
-        <div>
-            <div class="paginationBar">
-              <!--TMPL_VAR Name="pagination_bar"-->      
-            </div>
-        </div>
-    </div>
-</div>
-
-<script language="JavaScript" type="text/javascript">
+<!-- /TMPL_IF -->
 
+            <!-- TMPL_IF NAME="total" --><div class="paginationBar">
+                          <!--TMPL_VAR Name="pagination_bar"-->      
+                        </div>
+            <!-- /TMPL_IF -->
+<script type="text/javascript">
+//<![CDATA[
 function report(summary)
 {    
     var doc   = opener.document; 
@@ -99,5 +86,7 @@ function report(summary)
     field.value = summary;
     self.close();
 }
+//]]>
 </script>
+
 <!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_225a.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_225a.tmpl
index d3ef3fe..1f9b97b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_225a.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_225a.tmpl
@@ -1,27 +1,27 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <title>UNIMARC_Field 225a builder</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+    <title>UNIMARC Field 225a builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
+<body style="padding:1em;">
+<h3>UNIMARC Field 225a builder</h3>
     <div id="mainbloc">
-        <form name="f_pop" onsubmit="javascript:report()" action="">
+        <form name="f_pop" onsubmit="report()" action="">
             <h2 class="authority">Collection</h2>
             <p><label>Select a collection</label><!-- TMPL_VAR name="collection" --></p>
             <input type="submit" value="OK" class="button authority" />
         </form>
     </div>
     
-    <script type="text/javascript">
-        function report() {
+<script type="text/javascript">
+//<![CDATA[
+function report() {
             var doc   = opener.document; 
             var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
             field.value =  document.f_pop.f1.value;
             window.close();
             return false;
         }
-    </script>
-</body>
-</html>
\ No newline at end of file
+    //]]>
+</script>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tmpl
index 253e8a3..0eb2ae5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tmpl
@@ -1,10 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Cataloging &rsaquo; 4XX plugin</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-</head>
-<body>
 <!-- TMPL_IF NAME='fillinput' -->
-	<body>
         <script language="javascript" type="text/javascript">
 
             function go() {
@@ -77,12 +74,15 @@
             window.onload = go();
             opener.close();
             window.close();
-        </script>
-	</body>
+        //]]>
+</script>
+
+</head>
+<body style="padding:1em;">
+<h3>UNIMARC Field 4XX builder</h3>
 <!-- TMPL_ELSE -->
-	<body>
 		<script type="text/javascript">
-			
+//<![CDATA[			
 // 			document.getElementById('searchbox').focus();
 		
 			function report(value2report) {
@@ -98,23 +98,26 @@
                             self.close();
                             return false;
 			}
-		</script>
-    </head>
-	<h1>KOHA : INTRANET : Catalogue </h1>
+		//]]>
+</script>
+
+</head>
+<body style="padding:1em;">
+<h3>UNIMARC Field 4XX builder</h3>
 	<!--TMPL_IF Name = "Search"-->
-		<div id="unimarc_field_4XX_search">
+		<div id="UNIMARC_Field_4XX_search">
 		<h2> Search On  </h2>
-		<form name="f" method="post" action="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl">
+		<form name="f" method="post" action="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=UNIMARC Field_4XX.pl">
 	
 			<p>
-				<input type="hidden" name="plugin_name" value="unimarc_field_4XX.pl">
-				<input type="hidden" name="index" value="<!--TMPL_VAR Name="index" -->">
-				<input type="hidden" name="result" value="unimarc field 4 <!--TMPL_VAR Name="index" -->">
-				<input type="hidden" name="op" value="do_search">
+				<input type="hidden" name="plugin_name" value="UNIMARC Field_4XX.pl" />
+				<input type="hidden" name="index" value="<!--TMPL_VAR Name="index" -->" /> 
+				<input type="hidden" name="result" value="unimarc field 4 <!--TMPL_VAR Name="index" -->" />
+				<input type="hidden" name="op" value="do_search" />
 				<label class="label100" for="searchbox">Any word</label>
-				<input type="text" name="search" id="searchbox" size="35"><br />
+				<input type="text" name="search" id="searchbox" size="35" /><br />
 				<label for="itypeloop">Item type:</label>
-				<select name="itype">
+				<select name="itype" id="itypeloop>
 				<option value="">All Item Types</option>
 				<!-- TMPL_LOOP NAME="itypeloop" -->
 				<!-- TMPL_IF NAME="selected" -->
@@ -126,8 +129,7 @@
 				</select>
 			</p>
 			<p>
-				<input type="submit" value="Start search">
-				<input type="reset"  value="Clear All Fields">
+				<input type="submit" value="Start search" />
 			</p>
 	
 		</div>
@@ -137,15 +139,15 @@
 	
 
 		<h2>Search results</h2>
-		<div id="unimarc_field_4XX_resultnumber">
-			<p><!-- TMPL_IF NAME="displayprev" --> <a class="resultnumber" href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl&amp;index=<!--TMPL_VAR Name="index"-->&amp;startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;search=<!-- TMPL_VAR NAME="search" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">&lt;&lt; Previous</a><!-- /TMPL_IF -->
+		<div id="UNIMARC_Field_4XX_resultnumber">
+			<p><!-- TMPL_IF NAME="displayprev" --> <a class="resultnumber" href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=UNIMARC Field_4XX.pl&amp;index=<!--TMPL_VAR Name="index"-->&amp;startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;search=<!-- TMPL_VAR NAME="search" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">&lt;&lt; Previous</a><!-- /TMPL_IF -->
 				<!-- TMPL_LOOP NAME="numbers" -->
                                 <!-- TMPL_IF NAME="highlight" --> <span class="highlight"><!-- TMPL_VAR NAME="number" --></span>
-                                <!-- TMPL_ELSE --> <a class="resultnumber" href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl&amp;index=<!--TMPL_VAR Name="index"-->&amp;startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><!-- TMPL_VAR NAME="number" --></a>
+                                <!-- TMPL_ELSE --> <a class="resultnumber" href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=UNIMARC Field_4XX.pl&amp;index=<!--TMPL_VAR Name="index"-->&amp;startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><!-- TMPL_VAR NAME="number" --></a>
                                 <!-- /TMPL_IF -->
                                 <!-- /TMPL_LOOP -->
                                 <!-- TMPL_IF NAME="displaynext" -->
-                                  <a class="resultnumber" href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl&amp;index=<!--TMPL_VAR Name="index"-->&amp;startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;search=<!-- TMPL_VAR NAME="search" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">Next&gt;&gt;</a>
+                                  <a class="resultnumber" href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=UNIMARC Field_4XX.pl&amp;index=<!--TMPL_VAR Name="index"-->&amp;startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;search=<!-- TMPL_VAR NAME="search" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">Next&gt;&gt;</a>
                                 <!-- /TMPL_IF --></p>
 			<p class="resultcount">
                           <!-- TMPL_IF NAME="total" -->Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" -->
@@ -183,9 +185,9 @@
 					</td>
 					<td>
                       <!--TMPL_IF Name="biblionumber"-->
-						<a href="javascript:jumpfull('/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl&index=<!--TMPL_VAR Name="index"-->&biblionumber=<!--TMPL_VAR Name="biblionumber"-->&type=intranet&op=fillinput')">Choose</a>
+						<a href="javascript:jumpfull('/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=UNIMARC Field_4XX.pl&amp;index=<!--TMPL_VAR Name="index"-->&amp;biblionumber=<!--TMPL_VAR Name="biblionumber"-->&amp;type=intranet&amp;op=fillinput')">Choose</a>
                       <!--TMPL_ELSE-->
-						<a href="javascript:jumpfull('/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl&index=<!--TMPL_VAR Name="index"-->&type=intranet&op=fillinput')">Clear Field</a>
+						<a href="javascript:jumpfull('/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=UNIMARC Field_4XX.pl&amp;index=<!--TMPL_VAR Name="index"-->&amp;type=intranet&amp;op=fillinput')">Clear Field</a>
                       <!--/TMPL_IF-->
 					</td>
 				</tr>
@@ -196,7 +198,7 @@
 		<div id="resultnumber">
 			<p>
 				<!-- TMPL_IF NAME="displayprev" -->
-				<a class="resultnumber" href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl&amp;index=<!--TMPL_VAR Name="index"-->&amp;startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">
+				<a class="resultnumber" href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=UNIMARC Field_4XX.pl&amp;amp;index=<!--TMPL_VAR Name="index"-->&amp;amp;startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL -->&amp;amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;amp;type=intranet&amp;amp;op=do_search">
 					&lt;&lt; Previous
 				</a>
 				<!-- /TMPL_IF -->
@@ -207,29 +209,30 @@
 							<!-- TMPL_VAR NAME="number" -->
 						</span>
 					<!-- TMPL_ELSE -->
-						<a class="resultnumber" href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl&amp;index=<!--TMPL_VAR Name="index"-->&amp;startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;search=<!-- TMPL_VAR NAME="search" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">
+						<a class="resultnumber" href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=UNIMARC Field_4XX.pl&amp;index=<!--TMPL_VAR Name="index"-->&amp;startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;search=<!-- TMPL_VAR NAME="search" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">
 							<!-- TMPL_VAR NAME="number" -->
 						</a>
 					<!-- /TMPL_IF -->
 				<!-- /TMPL_LOOP -->
 
 				<!-- TMPL_IF NAME="displaynext" -->
-				<a class="resultnumber" href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl&amp;index=<!--TMPL_VAR Name="index"-->&amp;startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;search=<!-- TMPL_VAR NAME="search" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">
+				<a class="resultnumber" href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=UNIMARC Field_4XX.pl&amp;index=<!--TMPL_VAR Name="index"-->&amp;startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;search=<!-- TMPL_VAR NAME="search" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">
 					Next&gt;&gt;
 				</a>
 				<!-- /TMPL_IF -->
 			</p>
 		</div>
 	
-		<script language="JavaScript" type="text/javascript">
-		
+<script type="text/javascript">
+//<![CDATA[
 		function jumpfull(page){	
 			window.open(page,'','fullscreen,scrollbars');
 		}
-		</script>
+//]]>
+</script>
+
 		
 	<!--/TMPL_IF-->
 
-</body>
 <!-- /TMPL_IF -->
-</html>
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_686a.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_686a.tmpl
index 8e91f15..28a6be2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_686a.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_686a.tmpl
@@ -1,11 +1,12 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>UNIMARC_Field 686a builder</title>
+<title>UNIMARC Field 686a builder</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <style type="text/css">
 #custom-doc { width:51.46em;*width:50.17em;min-width:675px; margin:auto; text-align:left; }
 </style>
 </head>
-<body>
+<body style="padding:1em;">
+<h3>UNIMARC Field 686a builder</h3>
 <div id="custom-doc" class="yui-t7">
    <div id="bd">
 	<div id="yui-main">
@@ -66,12 +67,11 @@
                         <option value="HeadingDsc">Heading Descendant</option>
                     </select>
                 </li></ol></fieldset>
-            <fieldset class="action"> <input type="submit" value="Start search" class="submit" /> <a class="cancel close" href="#">Cancel</a></fieldset>
+            <fieldset class="action"> <input type="submit" value="Search" class="submit" /> <a class="cancel close" href="#">Cancel</a></fieldset>
 		</form>
 	</div>
 	</div>
    </div>
 </div>
 </div>
-</body>
-</html>
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_700-4.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_700-4.tmpl
index 6eb17fd..ef2a326 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_700-4.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_700-4.tmpl
@@ -1,17 +1,14 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_constructeur champ 700-4</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 700-4 builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
+<body style="padding:1em;">
+<h3>UNIMARC Field 700-4 builder</h3>
 <p>Sélectionnez la valeur pour le champ 700 $4. Elle sera automatiquement reportée dans la zone 700 $8 qui suit.</p>
-<form name="f_pop" onSubmit="report()">
+<form name="f_pop" onsubmit="report()" action="">
 <table>
 	<tr>
-		<td>Code date publication </td><td><select name="f1" size="1">
+		<td><label for="f1">Code date publication </label></td><td><select name="f1" id="f1" size="1">
 			<!-- TMPL_IF name="f1_075" -->
 			<option value="075 - postface" selected="selected">postface</option>
 			<!-- TMPL_ELSE -->
@@ -44,10 +41,11 @@
 			</select>
 		</td>
 	</tr>
-	<tr><td colspan="2"><input type="submit" value="OK" /></td></tr>
 </table>
+<fieldset class="action"><input type="submit" value="OK" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
-<script>
+<script type="text/javascript">
+//<![CDATA[
 	function report() {
 		x = document.f_pop.f1.value.split(' - ');
 		var doc   = opener.document; 
@@ -60,6 +58,7 @@
 		self.close();
 		return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_leader.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_leader.tmpl
index b267614..7549aa5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_leader.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_leader.tmpl
@@ -1,8 +1,9 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Leader building</title>
+<title>UNIMARC Leader builder</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
+<body style="padding:1em;">
+<h3>UNIMARC Leader builder</h3>
 <form name="f_pop" action="">
 <table>
 	<tr>
@@ -10,9 +11,9 @@
 		<td>(auto-calculated)</td>
 	</tr>
 	<tr>
-		<td>5- Record status</td>
+		<td><label for="f5">5- Record status</label></td>
 		<td>
-			<select name="f5" size="1">
+			<select name="f5" id="f5" size="1">
 			<!-- TMPL_IF name="f5|" -->
             	<option value="|" selected="selected">|- Filling character</option>
             <!-- TMPL_ELSE -->
@@ -48,9 +49,9 @@
 		</td>
 	</tr>
 	<tr>
-		<td>6- Type of record</td>
+		<td><label for="f6">6- Type of record</label></td>
 		<td>
-			<select name="f6" size="1">
+			<select name="f6" id="f6" size="1">
 			<!-- TMPL_IF name="f6|" -->
             	<option value="|" selected="selected">|- Filling character</option>
             <!-- TMPL_ELSE -->
@@ -139,9 +140,9 @@
 		</td>
 	</tr>
 	<tr>
-		<td>7- Bibliographic level</td>
+		<td><label for="f7">7- Bibliographic level</label></td>
 		<td>
-			<select name="f7" size="1">
+			<select name="f7" id="f7" size="1">
 			<!-- TMPL_IF name="f7|" -->
             	<option value="|" selected="selected">|- Filling character</option>
             <!-- TMPL_ELSE -->
@@ -178,9 +179,9 @@
 	</tr>
 	
 	<tr>
-		<td>8- Hierarchical level code</td>
+		<td><label for="f8">8- Hierarchical level code</label></td>
 		<td>
-			<select name="f8" size="1">
+			<select name="f8" id="f8" size="1">
 			<!-- TMPL_IF name="f8|" -->
             	<option value="|" selected="selected">|- Filling character</option>
             <!-- TMPL_ELSE -->
@@ -193,13 +194,13 @@
 					<option value=" "> - Hierarchical relationship undefined</option>
 				<!-- /TMPL_IF -->
 				
-				<!-- TMPL_IF name="f80" -->
+				<!-- TMPL_IF name="f80" id="f80" -->
 					<option value="0" selected="selected">0 - No hierarchical relationship</option>
 				<!-- TMPL_ELSE -->
 					<option value="0">0 - No hierarchical relationship</option>
 				<!-- /TMPL_IF -->
 				
-				<!-- TMPL_IF name="f81" -->
+				<!-- TMPL_IF name="f81" id="f81" -->
 					<option value="1" selected="selected">1 - Highest level record</option>
 				<!-- TMPL_ELSE -->
 					<option value="1">1 - Highest level record</option>
@@ -220,9 +221,9 @@
 		<td>(auto-filled)</td>
 	</tr>
 	<tr>
-		<td>17- Encoding level</td>
+		<td><label for="f17">17- Encoding level</label></td>
 		<td>
-			<select name="f17" size="1">
+			<select name="f17" id="f17" size="1">
 			<!-- TMPL_IF name="f17|" -->
             	<option value="|" selected="selected">|- Filling character</option>
             <!-- TMPL_ELSE -->
@@ -234,12 +235,12 @@
 				<!-- TMPL_ELSE -->
 					<option value=" "> Full level ("item in hand")</option>
 				<!-- /TMPL_IF -->
-				<!-- TMPL_IF name="f171" -->
+				<!-- TMPL_IF name="f171" id="f171" -->
 					<option value="1" selected="selected">1 - Sublevel 1 (not "item in hand")</option>
 				<!-- TMPL_ELSE -->
 					<option value="1">1 - Sublevel 1 (not "item in hand")</option>
 				<!-- /TMPL_IF -->
-				<!-- TMPL_IF name="f172" -->
+				<!-- TMPL_IF name="f172" id="f172" -->
 					<option value="2" selected="selected">2 - Sublevel 2. The record is a prepublication (Cataloguing In Publication) record</option>
 				<!-- TMPL_ELSE -->
 					<option value="2">2 - Sublevel 2. The record is a prepublication (Cataloguing In Publication) record</option>
@@ -254,9 +255,9 @@
 	</tr>
 
 	<tr>
-		<td>18- Descriptive cataloging form</td>
+		<td><label for="f18">18- Descriptive cataloging form</label></td>
 		<td>
-			<select name="f18" size="1">
+			<select name="f18" id="f18" size="1">
 			<!-- TMPL_IF name="f18|" -->
             	<option value="|" selected="selected">|- Filling character</option>
             <!-- TMPL_ELSE -->
@@ -286,11 +287,11 @@
 		<td>19-24 Entry map &amp; lengths</td>
 		<td>(auto-filled)</td>
 	</tr>
-
-	<tr><td colspan="2"><input type="button" value="OK"  onclick="javascript:report()" /></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
+//<![CDATA[
 function report() {
 	    var doc   = opener.document; 
             var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
@@ -302,7 +303,8 @@ function report() {
 		window.close();
 		return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
 
-- 
1.7.0.4



More information about the Koha-patches mailing list