diff --git a/koha-tmpl/intranet-tmpl/npl/en/bull/statecollection.tmpl b/koha-tmpl/intranet-tmpl/npl/en/bull/statecollection.tmpl
index d2ac668b09..195f2d3555 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/bull/statecollection.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/bull/statecollection.tmpl
@@ -1,61 +1,56 @@
-<!-- TMPL_INCLUDE NAME="main-top-blank.inc" -->
-<!--------------------------MAIN BODY OF PAGE-------------------------->
-<div>
-<h1>Subscription for <!-- TMPL_VAR name="bibliotitle" --></h1>
-<a href="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="submit">Subscription</a>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription Details for <!-- TMPL_VAR name="bibliotitle" --><!-- TMPL_INCLUDE NAME="doc-head-circ-close.inc" -->
+<!-- TMPL_INCLUDE NAME="masthead.inc" -->
+<!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
 
-<div>
-	<h2>Subscription summary</h2>
+<div id="main">
+<h1>Subscription for <!-- TMPL_VAR name="bibliotitle" --></h1>
+<form action="subscription-detail.pl" method="get"><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /><input type="submit" value="Edit Subscription" class="submit" /></form>
+
+<div class="data">
 	<form method="post" name="f" action="statecollection.pl">
-		<input type="hidden" name="op" value="modsubscriptionhistory">
-		<input type="hidden" name="serial" value="<!-- TMPL_VAR name="serial" -->">
-		<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->">
-		<input type="hidden" name="user" value="<!-- TMPL_VAR name="user" -->">
-		<p><label>Librarian</label><!-- TMPL_VAR name="user" --></p>
-		<p><label>Beginnning date (*)</label><input type="text" name="histstartdate" value="<!-- TMPL_VAR name="histstartdate" -->"></p>
-		<p><label>End date</label><input type="text" name="enddate" value="<!-- TMPL_VAR name="enddate" -->"></p>
-		<p>Arrived Numbers</p>
-		<p>&nbsp;<textarea name="recievedlist" COLS=60 ROWS=5><!-- TMPL_VAR name="recievedlist" --></textarea></p>
-		<p>Gapped Numbers</p>
-		<p>&nbsp;<textarea name="missinglist" COLS=60 ROWS=2><!-- TMPL_VAR name="missinglist" --></textarea></p>
-		<p>Opac's note</p>
-		<p>&nbsp;<textarea name="opacnote" COLS=60 ROWS=5><!-- TMPL_VAR name="opacnote" --></textarea></p>
-		<p>Intra's note</p>
-		<p>&nbsp;<textarea name="librariannote" COLS=60 ROWS=5><!-- TMPL_VAR name="librariannote" --></textarea></p>
-		<input type="submit" value="Save changes" class="submit">
+		<input type="hidden" name="op" value="modsubscriptionhistory" />
+		<input type="hidden" name="serial" value="<!-- TMPL_VAR name="serial" -->" />
+		<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" />
+		<input type="hidden" name="user" value="<!-- TMPL_VAR name="user" -->" />
+		<table>
+		<caption>Subscription Summary</caption>
+		<tr><th><label>Librarian:</label></th><td><!-- TMPL_VAR name="user" --></td></tr>
+		<tr><th><label for="histstartdate">Beginnning date<sup>*</sup>:</label></th><td><input type="text" name="histstartdate" id="histstartdate" value="<!-- TMPL_VAR name="histstartdate" -->" /></td></tr>
+		<tr><th><label for="enddate">End date:</label></th><td><input type="text" id="enddate" name="enddate" value="<!-- TMPL_VAR name="enddate" -->" /></td></tr>
+		<tr><th><label for="recievedlist">Arrived Numbers:</label></th><td><textarea id="recievedlist" name="recievedlist" cols="40" rows="2"><!-- TMPL_VAR name="recievedlist" --></textarea></td></tr>
+		<tr><th><label for="missinglist">Gapped Numbers:</label></th><td><textarea id="missinglist" name="missinglist" cols="40" rows="2"><!-- TMPL_VAR name="missinglist" --></textarea></td></tr>
+		<tr><th><label for="opacnote">OPAC Note:</label></th><td><textarea id="opacnote" name="opacnote" cols="40" rows="2"><!-- TMPL_VAR name="opacnote" --></textarea></td></tr>
+		<tr><th><label for="librariannote">Intranet Note:</label></th><td><textarea name="librariannote" cols="40" id="librariannote" rows="2"><!-- TMPL_VAR name="librariannote" --></textarea></td></tr>
+</table>
+		<p><input type="submit" value="Save changes" class="submit" /></p>
 	</form>
 </div>
 
-<div>
-<h2>waited or late numbers</h2>
+<div class="data">
 	<form method="post" name="f" action="statecollection.pl">
-		<input type="hidden" name="op" value="serialchangestatus">
-		<input type="hidden" name="serial" value="<!-- TMPL_VAR name="serial" -->">
-		<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->">
-		<input type="hidden" name="user" value="<!-- TMPL_VAR name="user" -->">
-	<table class="small">
+		<input type="hidden" name="op" value="serialchangestatus" />
+		<input type="hidden" name="serial" value="<!-- TMPL_VAR name="serial" -->" />
+		<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" />
+		<input type="hidden" name="user" value="<!-- TMPL_VAR name="user" -->" />
+	<table>
+	<caption>Awaited or Late Numbers</caption>
 	<tr>
-		<th>
-			Numbered
-		</th>
-		<th>
-			planned for
-		</th>
-		<th>
-			Status
-		</th>
+		<th scope="col">Numbered</th>
+		<th scope="col">Expected</th>
+		<th scope="col">Status</th>
 	</tr>
 	<!-- TMPL_LOOP name="serialslist" -->
 		<tr>
 			<td>
-				<input type="text" name="serialseq" value="<!-- TMPL_VAR name="serialseq" -->" size=50 maxlength=100>
+				<input type="text" name="serialseq" value="<!-- TMPL_VAR name="serialseq" -->" size="50" maxlength="100" />
 			</td>
 			<td>
-				<input type="text" name="planneddate" value="<!-- TMPL_VAR name="planneddate" -->" size=10 maxlength=15>
+				<input type="text" name="planneddate" value="<!-- TMPL_VAR name="planneddate" -->" size="10" maxlength="15" />
 			</td>
 			<td>
-				<input type="hidden" name="serialid" value="<!-- TMPL_VAR name="serialid" -->">
-				<select name="status" size="1">
+				<input type="hidden" name="serialid" value="<!-- TMPL_VAR name="serialid" -->" />
+				<select name="status">
 					<!--TMPL_IF name="status1" -->
 						<option value="1" selected>Waited</option>
 					<!-- /TMPL_IF -->
@@ -79,15 +74,14 @@
 		</tr>
 	<!-- /TMPL_LOOP -->
 	</table>
-	<input type="submit" value="Save changes" accesskey="w" class="submit">
+	<p><input type="submit" value="Save changes" accesskey="w" class="submit" /></p>
 	<!-- TMPL_IF name="hassubscriptionexpired" -->
 		<p>Subscription has expired. Waited last issue status can't be changed. <a href="#" onClick="popup()" class="submit">Renew</a> your subscription</p>
 	<!-- /TMPL_IF -->
-	</form>
+	</div>
+</form>	
 </div>
 
-</form>
-</table>
 <script language="JavaScript" type="text/javascript">
 
 function popup()
diff --git a/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-add.tmpl b/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-add.tmpl
index 0d8a7050ad..e4a822b5fa 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-add.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-add.tmpl
@@ -13,15 +13,15 @@
 	<h1>Add a subscription</h1>
 	<form method="post" name="f">
 <!-- /TMPL_IF -->
-<div class="details">
+<div class="data">
 	<table>
-	<caption>Subscription information</caption>
+	<caption>Subscription information for <i><!-- TMPL_VAR name="bibliotitle" --></i></caption>
 		<tr><th><input type="hidden" name="op" value="addsubscription">
 		<input type="hidden" name="user" value="<!-- TMPL_VAR name="user" -->">
-		Librarian</th><td><!-- TMPL_VAR name="user" --></td></tr>
-		<tr><th><label>Supplier</label></th><td><input type="text" name="aqbooksellerid" value="<!-- TMPL_VAR name="aqbooksellerid" -->" size="4"> (<input type="text" name="aqbooksellername" value="<!-- TMPL_VAR name="aqbooksellername" -->" disabled readonly>) <input type="button" class="submit" value="Search..." onclick="FindAcqui(f); return false;" /></td></tr>
-		<tr><th><label>Biblio</label></th><td><input type="text" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" size="4"> (<input type="text" name="title" value="<!-- TMPL_VAR name="title" -->" disabled readonly>) <input type="button" class="submit" value="Search..." onclick="Plugin(f); return false;" /></td></tr>
-		<tr><th><label>Notes</label></th><td><textarea name="notes" cols="30" rows="2"><!-- TMPL_VAR name="notes" --></textarea></td></tr>
+		Librarian: </th><td><!-- TMPL_VAR name="user" --></td></tr>
+		<tr><th><label for="aqbooksellerid">Supplier: </label></th><td><input type="text" id="aqbooksellerid" name="aqbooksellerid" value="<!-- TMPL_VAR name="aqbooksellerid" -->" size="4"> (<input type="text" name="aqbooksellername" value="<!-- TMPL_VAR name="aqbooksellername" -->" disabled readonly>) <input type="button" class="submit" value="Search..." onclick="FindAcqui(f); return false;" /></td></tr>
+		<tr><th><label for="biblionumber">Bibliographic Record: </label></th><td><input type="text" id="biblionumber" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" size="4"> (<input type="text" name="title" value="<!-- TMPL_VAR name="bibliotitle" -->" disabled readonly>) <input type="button" class="submit" value="Search..." onclick="Plugin(f); return false;" /></td></tr>
+		<tr><th><label for="notes-field">Notes</label></th><td><textarea id="notes-field" name="notes" cols="30" rows="2"><!-- TMPL_VAR name="notes" --></textarea></td></tr>
 </table>
 		Warning!
 		<ul>
@@ -29,11 +29,12 @@
 			<li>You also must have selected a supplier if you want to ask for late issues</li>
 		</ul>
 </div>
-<div class="details">
-	<h2>Planning</h2>
-	<p><label>Beginnning date:</label> <input type="text" name="startdate" value="<!-- TMPL_VAR name="startdate" -->" size="13" maxlength="10"></p>
-	<p><label>Frequency (*)</label>
-			<select name="periodicity" size="1">
+<div class="data">
+	<table>
+	<caption>Planning</caption>
+	<tr><th><label for="startdate">Beginnning date:</label></th><td><input type="text" id="startdate" name="startdate" value="<!-- TMPL_VAR name="startdate" -->" size="13" maxlength="10"></td></tr>
+	<tr><th><label for="periodicity">Frequency (*)</label></th><td>
+			<select name="periodicity" size="1" id="periodicity">
 				<option value="" selected>Unknown</option>
 				<!-- TMPL_IF name="periodicity1" -->
 					<option value="1" selected>1/day</option>
@@ -91,9 +92,9 @@
 					<option value="11">1/2 years</option>
 				<!-- /TMPL_IF -->
 			</select>
-	</p>
-	<p><label>Arrives on</label>
-			<select name="dow" size="1">
+	</td></tr>
+	<tr><th><label for="dow">Arrives on</label></th><td>
+			<select name="dow" id="dow">
 				<option value="">None</option>
 				<!-- TMPL_IF name="dow1" -->
 					<option value="1" selected>Monday</option>
@@ -130,85 +131,83 @@
 				<!-- TMPL_ELSE -->
 					<option value="7">Sunday</option>
 				<!-- /TMPL_IF -->
-			</select>
+			</select></td></tr>
+			</table>
 </div>
-<div class="details">
-	<h2>Subscription length</h2>
-	<p>* fill 1 from :</p>
-	<ul>
-		<p><label>Number of num</label><input type="text" name="numberlength" value="<!-- TMPL_VAR name="numberlength" -->"></p>
-		<p><label>Number of weeks</label><input type="text" name="weeklength" value="<!-- TMPL_VAR name="weeklength" -->"></p>
-		<p><label>Number of months</label><input type="text" name="monthlength" value="<!-- TMPL_VAR name="monthlength" -->"></p>
-	</ul>
+<div class="data">
+	<table>
+	<caption>Subscription Length (choose one)</caption>
+	<tr><th><label for="numberlength">Number of issues: </label></th><td><input type="text" id="numberlength" name="numberlength" value="<!-- TMPL_VAR name="numberlength" -->"></td></tr>
+	<tr><th><label for="weeklength">Number of weeks</label></th><td><input type="text" id="weeklength" name="weeklength" value="<!-- TMPL_VAR name="weeklength" -->"></td></tr>
+	<tr><th><label for="monthlength">Number of months</label></th><td><input type="text" id="monthlength" name="monthlength" value="<!-- TMPL_VAR name="monthlength" -->"></td></tr>
+</table>
 </div>
-<div>
+<div class="data">
 	<h2>Numbering calculation</h2>
 	<p>
-		<p>Numbering formula: <input type="text" name="numberingmethod" value="<!-- TMPL_VAR name="numberingmethod" -->"></p>
-		<table class="small">
+		<p><label for="numberingmethod">Numbering formula:</label> <input type="text" id="numberingmethod" name="numberingmethod" size="45" value="<!-- TMPL_VAR name="numberingmethod" -->" /></p>
+		<table>
+			<colgroup span="4">
+				<col span="1"></col>
+				<col span="1"></col>
+				<col span="1"></col>
+				<col span="1"></col>
+			</colgroup>
 			<tr>
 				<th>&nbsp;</th>
-				<th>X</th>
-				<th>Y</th>
-				<th>Z</th>
+				<th scope="col">X</th>
+				<th scope="col">Y</th>
+				<th scope="col">Z</th>
 			</tr>
 			<tr>
-				<td>Add</td>
-				<td>
-					<input type="text" name="add1" value="<!-- TMPL_VAR name="add1" -->">
-				</td>
-				<td>
-					<input type="text" name="add2" value="<!-- TMPL_VAR name="add2" -->">
-				</td>
-				<td>
-					<input type="text" name="add3" value="<!-- TMPL_VAR name="add3" -->">
-				</td>
+				<th scope="row"><label for="add1">Add:</label></th>
+				<td><input type="text" id="add1" name="add1" value="<!-- TMPL_VAR name="add1" -->" /></td>
+				<td><input type="text" id="add2" name="add2" value="<!-- TMPL_VAR name="add2" -->" /></td>
+				<td><input type="text" id="add3" name="add3" value="<!-- TMPL_VAR name="add3" -->" /></td></tr>
+			<tr>
+				<th scope="row"><label for="every1">...Once every:</label></th>
+				<td><input type="text" id="every1" name="every1" value="<!-- TMPL_VAR name="every1" -->"></td>
+				<td><input type="text" id="every2" name="every2" value="<!-- TMPL_VAR name="every2" -->"></td>
+				<td><input type="text" id="every3" name="every3" value="<!-- TMPL_VAR name="every3" -->"></td>
 			</tr>
 			<tr>
-				<td>once every</td>
-				<td><input type="text" name="every1" value="<!-- TMPL_VAR name="every1" -->"></td>
-				<td><input type="text" name="every2" value="<!-- TMPL_VAR name="every2" -->"></td>
-				<td><input type="text" name="every3" value="<!-- TMPL_VAR name="every3" -->"></td>
-			</tr>
-			<tr>
-				<td>When more than</td>
-				<td><input type="text" name="whenmorethan1" value="<!-- TMPL_VAR name="whenmorethan1" -->"></td>
-				<td><input type="text" name="whenmorethan2" value="<!-- TMPL_VAR name="whenmorethan2" -->"></td>
-				<td><input type="text" name="whenmorethan3" value="<!-- TMPL_VAR name="whenmorethan3" -->"></td>
+				<th scope="row"><label for="whenmorethan1">When more than:</label></th>
+				<td><input type="text" id="whenmorethan1" name="whenmorethan1" value="<!-- TMPL_VAR name="whenmorethan1" -->"></td>
+				<td><input type="text" id="whenmorethan2" name="whenmorethan2" value="<!-- TMPL_VAR name="whenmorethan2" -->"></td>
+				<td><input type="text" id="whenmorethan3" name="whenmorethan3" value="<!-- TMPL_VAR name="whenmorethan3" -->"></td>
 			</tr>
 			<!-- TMPL_IF name="mod" -->
 			<tr>
-				<td>The loop is for instance</td>
-				<td><input type="text" name="innerloop1" value="<!-- TMPL_VAR name="innerloop1" -->"></td>
-				<td><input type="text" name="innerloop2" value="<!-- TMPL_VAR name="innerloop2" -->"></td>
-				<td><input type="text" name="innerloop3" value="<!-- TMPL_VAR name="innerloop3" -->"></td>
+				<th scope="row"><label for="innerloop1">The loop is for instance: </label></th>
+				<td><input type="text" id="innerloop1" name="innerloop1" value="<!-- TMPL_VAR name="innerloop1" -->"></td>
+				<td><input type="text" id="innerloop2" name="innerloop2" value="<!-- TMPL_VAR name="innerloop2" -->"></td>
+				<td><input type="text" id="innerloop3" name="innerloop3" value="<!-- TMPL_VAR name="innerloop3" -->"></td>
 			</tr>
 			<!-- /TMPL_IF -->
 			<tr>
-				<td>Set back to</td>
-				<td><input type="text" name="setto1" value="<!-- TMPL_VAR name="setto1" -->"></td>
-				<td><input type="text" name="setto2" value="<!-- TMPL_VAR name="setto2" -->"></td>
-				<td><input type="text" name="setto3" value="<!-- TMPL_VAR name="setto3" -->"></td>
+				<th scope="row"><label for="setto1">...Set back to:</label></th>
+				<td><input type="text" id="setto1"  name="setto1" value="<!-- TMPL_VAR name="setto1" -->"></td>
+				<td><input type="text" id="setto2" name="setto2" value="<!-- TMPL_VAR name="setto2" -->"></td>
+				<td><input type="text" id="setto3" name="setto3" value="<!-- TMPL_VAR name="setto3" -->"></td>
 			</tr>
 			<tr>
-				<td>
+				<th scope="row"><label for="lastvalue1">
 					<!-- TMPL_IF name="mod" -->
-						Last value
+						Last value:
 					<!-- TMPL_ELSE -->
-						Begins with
+						Begins with:
 					<!-- /TMPL_IF -->
-				</td>
-				<td><input type="text" name="lastvalue1" value="<!-- TMPL_VAR name="lastvalue1" -->"></td>
-				<td><input type="text" name="lastvalue2" value="<!-- TMPL_VAR name="lastvalue2" -->"></td>
-				<td><input type="text" name="lastvalue3" value="<!-- TMPL_VAR name="lastvalue3" -->"></td>
+				</label></th>
+				<td><input type="text" id="lastvalue1" name="lastvalue1" value="<!-- TMPL_VAR name="lastvalue1" -->"></td>
+				<td><input type="text" id="lastvalue2" name="lastvalue2" value="<!-- TMPL_VAR name="lastvalue2" -->"></td>
+				<td><input type="text" id="lastvalue3" name="lastvalue3" value="<!-- TMPL_VAR name="lastvalue3" -->"></td>
 			</tr>
 		</table>
-	</p>
 </div>
 <!-- TMPL_IF name="mod" -->
-	<input type="button" value="Save subscription" onclick="Check(this.form)" accesskey="w" class="submit">
+	<input type="button" value="Save Subscription" onclick="Check(this.form); return false;" accesskey="w" class="submit">
 <!-- TMPL_ELSE -->
-	<input type="button" value="Add subscription" onclick="Check(this.form)" accesskey="w" class="submit">
+	<input type="button" value="Add Subscription" onclick="Check(this.form); return false;" accesskey="w" class="submit">
 <!-- /TMPL_IF -->
 </div>
 
diff --git a/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-detail.tmpl b/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-detail.tmpl
index 4219b7d185..20dce6133b 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-detail.tmpl
@@ -1,23 +1,28 @@
-<!-- TMPL_INCLUDE NAME="main-top-blank.inc" -->
-<div>
-<h1>Subscription</h1>
-<a href="subscription-add.pl?op=mod&subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="submit">Edit</a>
-<a href="statecollection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="submit">Issues</a>
-<a href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="submit">Biblio</a>
-<form method="post" name="f">
-<div>
-	<h2>Subscription information</h2>
-		<p>Librarian identity :</td><td> <!-- TMPL_VAR name="librarian" --></p>
-		<p><label>Supplier </label><!-- TMPL_VAR name="aqbooksellername" --></p>
-		<p><label>Cost</label><!-- TMPL_VAR name="cost" --></p>
-		<p><label>Budget </label><!-- TMPL_VAR name="bookfundid" --></p>
-		<p><label>Biblio</label><!-- TMPL_VAR name="bibliotitle" --></p>
-		<p><label>Notes:</label><!-- TMPL_VAR name="notes" --></p>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription Details for <!-- TMPL_VAR name="bibliotitle" --><!-- TMPL_INCLUDE NAME="doc-head-circ-close.inc" -->
+<!-- TMPL_INCLUDE NAME="masthead.inc" -->
+<!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
+
+<div id="main">
+<h1>Subscription: <!-- TMPL_VAR name="bibliotitle" --></h1>
+<form class="inline" action="subscription-add.pl" method="get"><input type="hidden" name="op" value="mod" /><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /><input type="submit" class="submit" value="Edit Subscription" /></form> <form class="inline" action="statecollection.pl" method="get"><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /><input type="submit" class="submit" value="View Issues" /></form> <form class="inline" action="/cgi-bin/koha/MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="submit" value="View Bibliographic Record" /></form>
+
+<div class="data">
+<table>
+	<caption>Subscription Information</caption>
+		<tr><th>Librarian identity:</th><td> <!-- TMPL_VAR name="librarian" --></td></tr>
+		<tr><th>Supplier: </th><td><!-- TMPL_VAR name="aqbooksellername" --></td></tr>
+		<tr><th>Cost:</th><td><!-- TMPL_VAR name="cost" --></td></tr>
+		<tr><th>Budget:</th><td><!-- TMPL_VAR name="bookfundid" --></td></tr>
+		<tr><th>Title:</th><td><a href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR name="bibliotitle" --></a></td></tr>
+		<tr><th>Notes:</th><td><!-- TMPL_VAR name="notes" --></td></tr>
+</table>
 </div>
-<div>
-	<h2>Planning</h2>
-	<p><label>Beginnning date:</label> <!-- TMPL_VAR name="startdate" --></p>
-	<p><label>Frequency (*):</label>
+<div class="data">
+<table>
+	<caption>Planning</caption>
+	<tr><th>Beginnning date:</th><td><!-- TMPL_VAR name="startdate" --></td></tr>
+	<tr><th>Frequency (*):</th><td>
 		<!--TMPL_IF name="periodicity1" -->
 				1/day
 		<!-- /TMPL_IF -->
@@ -51,8 +56,8 @@
 		<!--TMPL_IF name="periodicity11" -->
 				1/2 years
 		<!-- /TMPL_IF -->
-	</p>
-	<p><label>Arrives on:</label>
+	</td></tr>
+	<tr><th>Arrives on:</th><td>
 		<!--TMPL_IF name="arrival1" -->
 			Monday
 		<!-- /TMPL_IF -->
@@ -74,27 +79,27 @@
 		<!--TMPL_IF name="arrival7" -->
 				Sunday
 		<!-- /TMPL_IF -->
+		</td></tr></table>
 </div>
-<div>
-	<h2>Subscription length</h2>
-	<p><label>Number of num</label><!-- TMPL_VAR name="numberlength" --></p>
-	<p><label>Number of weeks</label><!-- TMPL_VAR name="weeklength" --></p>
-	<p><label>Number of months</label><!-- TMPL_VAR name="monthlength" --></p>
-
+<div class="data">
+	<table>
+	<caption>Subscription length</caption>
+	<tr><th>Number of issues:</th><td><!-- TMPL_VAR name="numberlength" --></td></tr>
+	<tr><th>Number of weeks:</th><td><!-- TMPL_VAR name="weeklength" --></td></tr>
+	<tr><th>Number of months:</th><td><!-- TMPL_VAR name="monthlength" --></td></tr>
+</table>
 </div>
-<div>
-	<h2>Numbering calculation</h2>
-	<p>
-		<p>Numbering formula: <!-- TMPL_VAR name="numberingmethod" --></p>
-		<table class="small" width="20%">
+<div class="data"><h2>Numbering calculation</h2>
+	<table>
+	<caption>Numbering formula: <!-- TMPL_VAR name="numberingmethod" --></caption>
 			<tr>
 				<th>&nbsp;</th>
-				<th>&nbsp;&nbsp;&nbsp;&nbsp;X&nbsp;&nbsp;&nbsp;&nbsp;</th>
-				<th>&nbsp;&nbsp;&nbsp;&nbsp;Y&nbsp;&nbsp;&nbsp;&nbsp;</th>
-				<th>&nbsp;&nbsp;&nbsp;&nbsp;Z&nbsp;&nbsp;&nbsp;&nbsp;</th>
+				<th scope="col">X</th>
+				<th scope="col">Y</th>
+				<th scope="col">Z</th>
 			</tr>
 			<tr>
-				<td>Add</td>
+				<th scope="row">Add</th>
 				<td>
 					<!-- TMPL_VAR name="add1" -->
 				</td>
@@ -106,13 +111,13 @@
 				</td>
 			</tr>
 			<tr>
-				<td>once every</td>
+				<th scope="row">once every</th>
 				<td><!-- TMPL_VAR name="every1" --></td>
 				<td><!-- TMPL_VAR name="every2" --></td>
 				<td><!-- TMPL_VAR name="every3" --></td>
 			</tr>
 			<tr>
-				<td>When more than</td>
+				<th scope="row">When more than</th>
 				<td><!-- TMPL_VAR name="whenmorethan1" --> <!-- TMPL_IF name="innerloop1" --><br/>
 					<i>(is <!-- TMPL_VAR name="innerloop1" -->)</i><!-- /TMPL_IF --></td>
 				<td><!-- TMPL_VAR name="whenmorethan2" --> <!-- TMPL_IF name="innerloop2" --><br/>
@@ -121,28 +126,26 @@
 					<i>(is <!-- TMPL_VAR name="innerloop3" -->)</i><!-- /TMPL_IF --></td>
 			</tr>
 			<tr>
-				<td>Set back to</td>
+				<th scope="row">Set back to</th>
 				<td><!-- TMPL_VAR name="setto1" --></td>
 				<td><!-- TMPL_VAR name="setto2" --></td>
 				<td><!-- TMPL_VAR name="setto3" --></td>
 			</tr>
 			<tr>
-				<td>
-						Last value
-				</td>
+				<th scope="row">Last value</th>
 				<td><!-- TMPL_VAR name="lastvalue1" --></td>
 				<td><!-- TMPL_VAR name="lastvalue2" --></td>
 				<td><!-- TMPL_VAR name="lastvalue3" --></td>
 			</tr>
 		</table>
 </div>
-<div>
-	<h2>Issues</h2>
-	<table class="small">
+<div class="data">
+	<table>
+	<caption>Issues</caption>
 	<tr>
-		<th>&nbsp;&nbsp;&nbsp;&nbsp;Issue number&nbsp;&nbsp;&nbsp;&nbsp;</th>
-		<th>&nbsp;&nbsp;&nbsp;&nbsp;Planned date&nbsp;&nbsp;&nbsp;&nbsp;</th>
-		<th>&nbsp;&nbsp;&nbsp;&nbsp;Status&nbsp;&nbsp;&nbsp;&nbsp;</th>
+		<th>Issue number</th>
+		<th>Planned date</th>
+		<th>Status</th>
 	</tr>
 	<!-- TMPL_LOOP name="serialslist" -->
 		<tr>
@@ -165,7 +168,6 @@
 					<!--TMPL_IF name="status4" -->
 						Missing
 					<!-- /TMPL_IF -->
-				</select>
 			</td>
 		</tr>
 	<!-- /TMPL_LOOP -->