diff --git a/admin/listclients.xsl b/admin/listclients.xsl
index 8a1a2697..c70de045 100644
--- a/admin/listclients.xsl
+++ b/admin/listclients.xsl
@@ -8,7 +8,6 @@
 </head>
 <body>
 <h2>Icecast2 Admin</h2>
-<p><br /></p>
 
 <div class="roundcont">
 <div class="roundtop">
@@ -49,8 +48,8 @@
                 </xsl:when>
                 <xsl:otherwise>
                     <td align="right">
-                        <a href="{@mount}.m3u">M3U</a>
-                        <a href="{@mount}.xspf">XSPF</a>
+                        <a href="{@mount}.m3u">M3U </a>
+                        <a href="{@mount}.xspf">XSPF </a>
                         <a href="{@mount}.vclt">VCLT</a>
                     </td>
                 </xsl:otherwise>
diff --git a/admin/listmounts.xsl b/admin/listmounts.xsl
index 0a89dcab..79756ce4 100644
--- a/admin/listmounts.xsl
+++ b/admin/listmounts.xsl
@@ -8,7 +8,6 @@
 </head>
 <body>
 <h2>Icecast2 Admin</h2>
-<br />
 
 <div class="roundcont">
 <div class="roundtop">
@@ -27,9 +26,7 @@
 <img src="/corner_bottomleft.jpg" class="corner" style="display: none" alt="" />
 </div>
 </div>
-<br />
-<br />
-
+<p><br /></p>
 
 <h1>Active Mountpoints</h1>
 <div class="roundcont">
@@ -71,7 +68,7 @@
 	</table>
 <br />
 <p><xsl:value-of select="listeners" /> Listener(s)</p>
-<br></br>
+<p><br /></p>
 </xsl:for-each>
 <xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;
 </div>
diff --git a/admin/manageauth.xsl b/admin/manageauth.xsl
index 49d7ee18..b6a56673 100644
--- a/admin/manageauth.xsl
+++ b/admin/manageauth.xsl
@@ -6,9 +6,8 @@
 <title>Icecast Streaming Media Server</title>
 <link rel="stylesheet" type="text/css" href="/style.css" />
 </head>
-<body
+<body>
 <h2>Icecast2 Admin</h2>
-<br />
 
 <div class="roundcont">
 <div class="roundtop">
@@ -27,8 +26,7 @@
 <img src="/corner_bottomleft.jpg" class="corner" style="display: none" alt="" />
 </div>
 </div>
-<br />
-<br />
+<p><br /></p>
 
 <div class="roundcont">
 <div class="roundtop">
@@ -52,7 +50,7 @@
 	    </td></tr>
 	</table>
 <br></br>
-<form method="GET" action="manageauth.xsl">
+<form method="get" action="manageauth.xsl">
 <table cellpadding="2" cellspacing="4" border="0" >
 		<tr>
 				<td ><b>User Id</b></td>
@@ -76,7 +74,7 @@
 				<td ><input type="text" name="password" /></td>
 		</tr>
 		<tr>
-				<td colspan="2"><input type="Submit" name="Submit" value="Add New User" /></td>
+				<td colspan="2"><input type="submit" name="Submit" value="Add New User" /></td>
 		</tr>
 </table>
 <input type="hidden" name="mount" value="{@mount}"/>
diff --git a/admin/moveclients.xsl b/admin/moveclients.xsl
index 8ee029a9..333bb16f 100644
--- a/admin/moveclients.xsl
+++ b/admin/moveclients.xsl
@@ -8,7 +8,6 @@
 </head>
 <body>
 <h2>Icecast2 Admin</h2>
-<br />
 
 <div class="roundcont">
 <div class="roundtop">
@@ -27,8 +26,7 @@
 <img src="/corner_bottomleft.jpg" class="corner" style="display: none" alt="" />
 </div>
 </div>
-<br />
-<br />
+<p><br /></p>
 
 <xsl:variable name = "currentmount" ><xsl:value-of select="current_source" /></xsl:variable>
 <h1>Moving Listeners From (<xsl:value-of select="current_source" />)</h1>
diff --git a/admin/response.xsl b/admin/response.xsl
index a5167e01..7c87357a 100644
--- a/admin/response.xsl
+++ b/admin/response.xsl
@@ -8,7 +8,6 @@
 </head>
 <body>
 <img align="left" src="/icecast.png" /><h2><center>Icecast2 Admin</center></h2>
-<br />
 
 <div class="roundcont">
 <div class="roundtop">
@@ -27,8 +26,7 @@
 <img src="/corner_bottomleft.jpg" class="corner" style="display: none" alt="" />
 </div>
 </div>
-<br />
-<br />
+<p><br /></p>
 
 <h1>Icecast Server Response</h1>
 <div class="roundcont">
diff --git a/admin/stats.xsl b/admin/stats.xsl
index 116e418a..a6d08448 100644
--- a/admin/stats.xsl
+++ b/admin/stats.xsl
@@ -8,7 +8,6 @@
 </head>
 <body>
 <h2>Icecast2 Admin</h2>
-<br />
 <!--header menu -->
 <div class="roundcont">
 <div class="roundtop">
@@ -27,8 +26,7 @@
 <img src="/corner_bottomleft.jpg" class="corner" style="display: none" alt="" />
 </div>
 </div>
-<br />
-<br />
+<p><br /></p> 
 <!--end header menu -->
 
 <!--global server stats-->
@@ -43,7 +41,7 @@
 <xsl:for-each select="*">
 <xsl:if test = "name()!='source'"> 
 <tr>
-	<td width="130"><xsl:value-of select="name()" /></td>
+	<td style="width: 130"><xsl:value-of select="name()" /></td>
 	<td class="streamdata"><xsl:value-of select="." /></td>
 </tr>
 </xsl:if>
@@ -55,8 +53,7 @@
 <img src="/corner_bottomleft.jpg" class="corner" style="display: none" alt="" />
 </div>
 </div>
-<br />
-<br />
+<p><br /></p>
 <!--end global server stats-->
 
 <!--mount point stats-->
@@ -79,8 +76,8 @@
                     </xsl:when>
                     <xsl:otherwise>
                         <td align="right">
-                            <a href="{@mount}.m3u">M3U</a>
-                            <a href="{@mount}.xspf">XSPF</a>
+                            <a href="{@mount}.m3u">M3U </a>
+                            <a href="{@mount}.xspf">XSPF </a>
                             <a href="{@mount}.vclt">VCLT</a>
                         </td>
                     </xsl:otherwise>
@@ -101,7 +98,7 @@
 <table cellpadding="5" cellspacing="0" border="0">
 	<xsl:for-each select="*">
 	<tr>
-		<td width="130"><xsl:value-of select="name()" /></td>
+		<td style="width: 130"><xsl:value-of select="name()" /></td>
 		<td class="streamdata"><xsl:value-of select="." /></td>
 	</tr>
 	</xsl:for-each>
diff --git a/admin/updatemetadata.xsl b/admin/updatemetadata.xsl
index ee67fa8f..94e578bb 100644
--- a/admin/updatemetadata.xsl
+++ b/admin/updatemetadata.xsl
@@ -8,7 +8,6 @@
 </head>
 <body>
 <h2>Icecast2 Admin</h2>
-<br />
 
 <div class="roundcont">
 <div class="roundtop">
@@ -27,8 +26,7 @@
 <img src="/corner_bottomleft.jpg" class="corner" style="display: none" alt="" />
 </div>
 </div>
-<br />
-<br />
+<p><br /></p>
 
 <h1>Update Metadata</h1>
 <div class="roundcont">
@@ -41,17 +39,18 @@
 <xsl:if test="server_name"><xsl:value-of select="server_name" /> </xsl:if>
 (<xsl:value-of select="@mount" />)</h3>
 
-<form method="GET" action="/admin/metadata.xsl">
+<form method="get" action="/admin/metadata.xsl">
 <table border="0" cellpadding="4">
-<tr><td>Metadata : <input type="text" name="song"/></td></tr>
-<tr><td><input type="Submit" value="Update"/></td></tr>
+	<tr><td><p>Metadata : <input type="text" name="song"/></p></td></tr>
+<tr><td><input type="submit" value="Update"/></td></tr>
 </table>
-<input type="hidden" name="mount" value="{@mount}"/>
-<input type="hidden" name="mode" value="updinfo"/>
-<input type="hidden" name="charset" value="UTF-8"/>
+<div>
+	<input type="hidden" name="mount" value="{@mount}"/>
+	<input type="hidden" name="mode" value="updinfo"/>
+	<input type="hidden" name="charset" value="UTF-8"/>
+</div>
 </form>
 
-<br />
 <br />
 </xsl:for-each>
 <xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;
