diff --git a/templates/default/en/error.php b/templates/default/en/error.php
index 08f27a37f9fdb28f3380cd586a6bae0d5d23da3a..39a6c270977b708551f0c6daef74bc5b09158557 100644
--- a/templates/default/en/error.php
+++ b/templates/default/en/error.php
@@ -22,7 +22,7 @@ if(array_key_exists('trackid', $this->data)) {
 ?>
 	<div class="trackidtext">
 		If you report this error, please also report this tracking ID which makes it possible to locate your session in the logs which are available to the system administrator: 
-			<span class="trackid"><?php echo $this->data['trackid']; ?><span>
+			<span class="trackid"><?php echo $this->data['trackid']; ?></span>
 	</div>
 <?php
 }
@@ -59,7 +59,7 @@ if (!empty($this->data['errorreportaddress'])) {
 	
 		<p>
 		<textarea style="width: 300px; height: 100px" name="text">Explain what you did to get this error...</textarea>
-		</p></p>
+		</p><p>
 		<input type="hidden" name="action" value="error" />
 		<input type="hidden" name="techemail" value="<?php echo $this->data['email']; ?>" />
 		<input type="hidden" name="version" value="<?php echo $this->data['version']; ?>" />
diff --git a/templates/default/en/frontpage.php b/templates/default/en/frontpage.php
index 8ae064e7b2df13e57ae82dcdf38b12716c451ced..1c1b1af9fe7422a33b0fd9f8952ad6eb416e871e 100644
--- a/templates/default/en/frontpage.php
+++ b/templates/default/en/frontpage.php
@@ -41,7 +41,7 @@ $icon_disabled = '<img src="/' . $data['baseurlpath'] . 'resources/icons/delete.
 				}
 			?>
 			</ul>
-		</p>
+
 		
 		<h2>Metadata</h2>
 			<ul>
@@ -52,7 +52,6 @@ $icon_disabled = '<img src="/' . $data['baseurlpath'] . 'resources/icons/delete.
 				}
 			?>
 			</ul>
-		</p>
 		
 		<h2>Documentation</h2>
 			<ul>
@@ -63,7 +62,6 @@ $icon_disabled = '<img src="/' . $data['baseurlpath'] . 'resources/icons/delete.
 				}
 			?>
 			</ul>
-		</p>
 		
 		<?php
 			if (array_key_exists('warnings', $this->data) && is_array($this->data['warnings']) && !empty($this->data['warnings'])) {
diff --git a/www/example-simple/saml2-example.php b/www/example-simple/saml2-example.php
index b2d032c029e1989eb28f8118c0e31de1a07057f0..05dab6f7611933a1c714a1dd395835a2a44e1979 100644
--- a/www/example-simple/saml2-example.php
+++ b/www/example-simple/saml2-example.php
@@ -64,7 +64,7 @@ $t->data['remaining'] = $session->remainingTime();
 $t->data['sessionsize'] = $session->getSize();
 $t->data['attributes'] = $attributes;
 $t->data['icon'] = 'bino.png';
-$t->data['logout'] = '<p>[ <a href="/' . $config->getBaseURL() . 'saml2/sp/initSLO.php?RelayState=/' . 
+$t->data['logout'] = '[ <a href="/' . $config->getBaseURL() . 'saml2/sp/initSLO.php?RelayState=/' . 
 	$config->getBaseURL() . 'logout.html">Logout</a> ]';
 $t->show();