diff --git a/koha-tmpl/intranet-tmpl/npl/en/bull/bull-home.tmpl b/koha-tmpl/intranet-tmpl/npl/en/bull/bull-home.tmpl
index b2274e5725..1c6b8bea7c 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/bull/bull-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/bull/bull-home.tmpl
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Serials Subscriptions<!-- TMPL_INCLUDE NAME="doc-head-circ-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Serials Subscriptions<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="masthead.inc" -->
 <!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
@@ -12,7 +12,6 @@
 			<th>ISSN</th>
 			<th colspan="2">&nbsp;</th>
 		</tr>
-		<!-- TMPL_IF NAME="subscriptions" -->
 		<tr>
 			<td>
 				<input type="text" size="40" maxlength="40" name="title" value="<!-- TMPL_VAR name="title" -->">
@@ -20,10 +19,10 @@
 			<td>
 				<input type="text" size="11" maxlength="11" name="ISSN" value="<!-- TMPL_VAR name="ISSN" -->">
 			</td>
-			<td colspan="3">
-				<input type="submit" value="Filter" class="submit">
+			<td colspan="2">
+				<input type="submit" value="Search" class="submit">
 			</td>
-		</tr><!-- /TMPL_IF -->
+		</tr>
 		<!-- TMPL_IF NAME="subscriptions" -->
 		<!-- TMPL_LOOP name="subscriptions" -->
 			<tr>
@@ -34,16 +33,14 @@
 					<!-- TMPL_VAR name="ISSN" -->
 				</td>
 				<td>
-					<a href="bull/subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Detail</a>
-					<a href="bull/statecollection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Recieve</a>
-				</td>
+					<a href="bull/subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Detail</a></td><td><a href="bull/statecollection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Receive</a></td>
 			</tr>
 		<!-- /TMPL_LOOP -->
 		<!-- TMPL_ELSE -->
-		<tr><td colspan="3">There are no subscriptions.</td></tr>
+		<tr><td colspan="3">Enter search terms above to display subscriptions</td></tr>
 		<!-- /TMPL_IF -->
 	</table></form>
-	<a href="/cgi-bin/koha/bull/subscription-add.pl">Add subscription</a>
+	<p><form action="/cgi-bin/koha/bull/subscription-add.pl" method="get"><input type="submit" class="submit" value="Add Subscription" /></form></p>
 </div>
 
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/npl/en/bull/lateissues.tmpl b/koha-tmpl/intranet-tmpl/npl/en/bull/lateissues.tmpl
new file mode 100644
index 0000000000..7adb7cf062
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/npl/en/bull/lateissues.tmpl
@@ -0,0 +1,37 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Serials Subscriptions<!-- 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>Late issues</h1>
+<form action="lateissues.pl" method="post">
+<label for="supplier">Supplier: </label>
+<!-- TMPL_VAR name="CGIsupplier" -->
+<input type="submit" value="Filter" class="submit">
+</form>
+<!-- TMPL_IF NAME="lateissues" -->
+	<table>
+		<tr>
+			<th>Supplier</th>
+			<th>Title</th>
+			<th>Issue number</th>
+			<th>Late since</th>
+			<th colspan="2">&nbsp;</th>
+		</tr>
+<!-- TMPL_LOOP name="lateissues" -->
+			<tr>
+				<td><!-- TMPL_VAR name="name" --></td>
+				<td><!-- TMPL_VAR name="Title" --></td>
+				<td><!-- TMPL_VAR name="serialseq" --></td>
+				<td><!-- TMPL_VAR name="planneddate" --></td>
+				<td><a href="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Details</a></td><td><a href="statecollection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Receive</a></td>
+			</tr>
+	<!-- /TMPL_LOOP -->
+	</table>
+<!-- /TMPL_IF -->
+</div>
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+
diff --git a/koha-tmpl/intranet-tmpl/npl/en/bull/order.tmpl b/koha-tmpl/intranet-tmpl/npl/en/bull/order.tmpl
index a1ce4c0020..c4a8d79bb3 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/bull/order.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/bull/order.tmpl
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="main-top.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Supplier Search Results<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <div id="main-compact">
 	<h1>Supplier Search Results</h1>
 		<div class="results">You searched for  <span class="ex"><!-- TMPL_VAR name="supplier" --></span>. <!-- TMPL_VAR name="count" --> results found</div>
diff --git a/koha-tmpl/intranet-tmpl/npl/en/bull/result.tmpl b/koha-tmpl/intranet-tmpl/npl/en/bull/result.tmpl
index 377bcbc3d0..762570c002 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/bull/result.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/bull/result.tmpl
@@ -6,8 +6,8 @@
 				<a class="pages" href="subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->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="current"> <!-- TMPL_VAR NAME="number" --> </span><!-- TMPL_ELSE -->
-					 <a class="pages" href="subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><!-- TMPL_VAR NAME=number --></a>
+				<!-- TMPL_IF NAME=highlight --><span class="current"><!-- TMPL_VAR NAME="number" --></span><!-- TMPL_ELSE -->
+					  <a class="pages" href="subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->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 -->
@@ -39,9 +39,7 @@
 						<!-- TMPL_IF name="size" --> ; <!-- TMPL_VAR name="size" --><!-- /TMPL_IF -->
 					</p>
 				</td>
-				<td><!-- TMPL_UNLESS NAME="norequests" -->
-				<form action="#" method="post"><input type="submit" class="submit" value="Choose" onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR name="title" -->'); return false;" /></form><!-- TMPL_ELSE -->Not Reservable<!-- /TMPL_UNLESS -->
-				</td>
+				<td><form action="#" method="post"><input type="submit" class="submit" value="Choose" onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR name="title" -->'); return false;" /></form></td>
 			</tr>
 			<!-- /TMPL_LOOP -->
 		</table>
diff --git a/koha-tmpl/intranet-tmpl/npl/en/bull/search-supply.tmpl b/koha-tmpl/intranet-tmpl/npl/en/bull/search-supply.tmpl
index d6ac9c07b3..8ecc3e3c3c 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/bull/search-supply.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/bull/search-supply.tmpl
@@ -1,5 +1,4 @@
-<!-- TMPL_INCLUDE NAME="main-top.inc" -->
-
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Search supplier for serial subscription<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <div id="main-compact">
 <h1>Search supplier for serial subscription</h1>
 <div class="details">
diff --git a/koha-tmpl/intranet-tmpl/npl/en/bull/search.tmpl b/koha-tmpl/intranet-tmpl/npl/en/bull/search.tmpl
index cad3308e14..332a949aff 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/bull/search.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/bull/search.tmpl
@@ -12,7 +12,7 @@
 			<input type="hidden" name="and_or" value="and">
 			<input type="hidden" name="excluding" value="">
 			<input type="hidden" name="operator" value="contains">
-			<input type="text" id="keyword" name="value" onchange="sql_update()"></td></tr>
+			<input type="text" id="keyword" name="value"> (<a href="<!-- TMPL_VAR NAME="SCRIP_NAME" -->" onclick="PopupSuggestion(); return false;">Suggestions</a>)</td></tr>
 		<tr><th><label for="resultsperpage">Results per page:</label></th><td><select align="right" name="resultsperpage" id="resultsperpage" size="1">
 				<option value="20">20</option>
 				<option value="50">50</option>
@@ -26,8 +26,7 @@
 				<option value="biblioitems.publishercode">Publisher</option>
 			</select></td></tr>
 		</table>		
-		<p><input type="submit" value="Start search" class="submit">
-			<a href="javascript:PopupSuggestion()" class="button catalogue">Suggestions</a></p>
+		<p><input type="submit" value="Start search" class="submit"></p>
 	</div>
 	<div>
 
diff --git a/koha-tmpl/intranet-tmpl/npl/en/bull/statecollection.tmpl b/koha-tmpl/intranet-tmpl/npl/en/bull/statecollection.tmpl
index 195f2d3555..0825245d29 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/bull/statecollection.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/bull/statecollection.tmpl
@@ -18,10 +18,10 @@
 		<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="recievedlist">Received Issues:</label></th><td><textarea id="recievedlist" name="recievedlist" cols="40" rows="2"><!-- TMPL_VAR name="recievedlist" --></textarea></td></tr>
+		<tr><th><label for="missinglist">Missing Issues:</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>
+<!-- 		<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>
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 e4a822b5fa..976f91f447 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-add.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-add.tmpl
@@ -1,26 +1,26 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- <!-- TMPL_IF name="mod" -->Modify a Subscription<!-- TMPL_ELSE -->Add a New Subscription<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-circ-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- <!-- TMPL_IF name="mod" -->Modify a Subscription<!-- TMPL_ELSE -->Add a New Subscription<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="masthead.inc" -->
 <!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-nav-brief.inc" -->
 
 <div id="main">
 <!-- TMPL_IF name="mod" -->
 	<h1>Modify subscription</h1>
 	<form method="post" name="f" action="subscription-detail.pl">
-		<input type="hidden" name="op" value="modsubscription">
-		<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->">
+		<input type="hidden" name="op" value="modsubscription" />
+		<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" />
 <!-- TMPL_ELSE -->
 	<h1>Add a subscription</h1>
-	<form method="post" name="f">
+	<form method="post" name="f" action="subscription-detail.pl">
 <!-- /TMPL_IF -->
 <div class="data">
 	<table>
 	<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" -->">
+		<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 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="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="disabled" readonly="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="disabled" readonly="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!
@@ -32,62 +32,62 @@
 <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="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>
+				<option value="" selected="selected">Unknown</option>
 				<!-- TMPL_IF name="periodicity1" -->
-					<option value="1" selected>1/day</option>
+					<option value="1" selected="selected">1/day</option>
 				<!-- TMPL_ELSE -->
 					<option value="1">1/day</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="periodicity2" -->
-					<option value="2" selected>1/week</option>
+					<option value="2" selected="selected">1/week</option>
 				<!-- TMPL_ELSE -->
 					<option value="2">1/week</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="periodicity3" -->
-					<option value="3" selected>1/2 weeks</option>
+					<option value="3" selected="selected">1/2 weeks</option>
 				<!-- TMPL_ELSE -->
 					<option value="3">1/2 weeks</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="periodicity4" -->
-					<option value="4" selected>1/3 weeks</option>
+					<option value="4" selected="selected">1/3 weeks</option>
 				<!-- TMPL_ELSE -->
 					<option value="4">1/3 weeks</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="periodicity5" -->
-					<option value="5" selected>1/month</option>
+					<option value="5" selected="selected">1/month</option>
 				<!-- TMPL_ELSE -->
 					<option value="5">1/month</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="periodicity6" -->
-					<option value="6" selected>1/2 months</option>
+					<option value="6" selected="selected">1/2 months</option>
 				<!-- TMPL_ELSE -->
 					<option value="6">1/2 months</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="periodicity7" -->
-					<option value="7" selected>1/3 months</option>
+					<option value="7" selected="selected">1/3 months</option>
 				<!-- TMPL_ELSE -->
 					<option value="7">1/3 months</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="periodicity8" -->
-					<option value="8" selected>1/quarter</option>
+					<option value="8" selected="selected">1/quarter</option>
 				<!-- TMPL_ELSE -->
 					<option value="8">1/quarter</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="periodicity9" -->
-					<option value="9" selected>1/2 quarters</option>
+					<option value="9" selected="selected">1/2 quarters</option>
 				<!-- TMPL_ELSE -->
 					<option value="9">1/2 quarters</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="periodicity10" -->
-					<option value="10" selected>1/year</option>
+					<option value="10" selected="selected">1/year</option>
 				<!-- TMPL_ELSE -->
 					<option value="10">1/year</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="periodicity11" -->
-					<option value="11" selected>1/2 years</option>
+					<option value="11" selected="selected">1/2 years</option>
 				<!-- TMPL_ELSE -->
 					<option value="11">1/2 years</option>
 				<!-- /TMPL_IF -->
@@ -97,37 +97,37 @@
 			<select name="dow" id="dow">
 				<option value="">None</option>
 				<!-- TMPL_IF name="dow1" -->
-					<option value="1" selected>Monday</option>
+					<option value="1" selected="selected">Monday</option>
 				<!-- TMPL_ELSE -->
 					<option value="1">Monday</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="dow2" -->
-					<option value="2" selected>Tuesday</option>
+					<option value="2" selected="selected">Tuesday</option>
 				<!-- TMPL_ELSE -->
 					<option value="2">Tuesday</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="dow3" -->
-					<option value="3" selected>Wednesday</option>
+					<option value="3" selected="selected">Wednesday</option>
 				<!-- TMPL_ELSE -->
 					<option value="3">Wednesday</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="dow4" -->
-					<option value="4" selected>Thursday</option>
+					<option value="4" selected="selected">Thursday</option>
 				<!-- TMPL_ELSE -->
 					<option value="4">Thursday</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="dow5" -->
-					<option value="5" selected>Friday</option>
+					<option value="5" selected="selected">Friday</option>
 				<!-- TMPL_ELSE -->
 					<option value="5">Friday</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="dow6" -->
-					<option value="6" selected>Saturday</option>
+					<option value="6" selected="selected">Saturday</option>
 				<!-- TMPL_ELSE -->
 					<option value="6">Saturday</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="dow7" -->
-					<option value="7" selected>Sunday</option>
+					<option value="7" selected="selected">Sunday</option>
 				<!-- TMPL_ELSE -->
 					<option value="7">Sunday</option>
 				<!-- /TMPL_IF -->
@@ -137,14 +137,13 @@
 <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>
+	<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 class="data">
 	<h2>Numbering calculation</h2>
-	<p>
 		<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">
@@ -166,29 +165,29 @@
 				<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>
+				<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>
 				<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>
+				<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>
 				<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>
+				<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>
 				<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>
+				<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>
 				<th scope="row"><label for="lastvalue1">
@@ -198,21 +197,21 @@
 						Begins with:
 					<!-- /TMPL_IF -->
 				</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>
+				<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>
 </div>
 <!-- TMPL_IF name="mod" -->
-	<input type="button" value="Save Subscription" onclick="Check(this.form); return false;" 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); return false;" accesskey="w" class="submit">
+	<input type="button" value="Add Subscription" onclick="Check(this.form); return false;" accesskey="w" class="submit" />
 <!-- /TMPL_IF -->
-</div>
+
 
 </form>
-
+</div>
 
 <script language="JavaScript" type="text/javascript">