diff --git a/admin/listclients.xsl b/admin/listclients.xsl
index 79642763..67b9a4a7 100644
--- a/admin/listclients.xsl
+++ b/admin/listclients.xsl
@@ -11,10 +11,11 @@
 					<h2><xsl:value-of select="$title" /></h2>
 
 					<xsl:for-each select="source">
-						<div class="article">
-							<h3>Mountpoint <xsl:value-of select="@mount" /></h3>
+						<section class="box">
+							<h3 class="box_title">Mountpoint <code><xsl:value-of select="@mount" /></code></h3>
 							<!-- Mount nav -->
 							<xsl:call-template name="mountnav" />
+							<h4>Listeners</h4>
 							<xsl:choose>
 								<xsl:when test="listener">
 									<table class="table-flipscroll">
@@ -50,7 +51,7 @@
 									<p>No listeners connected</p>
 								</xsl:otherwise>
 							</xsl:choose>
-						</div>
+						</section>
 					</xsl:for-each>
 
 				</div>
diff --git a/admin/moveclients.xsl b/admin/moveclients.xsl
index 107a4f0f..7ee6d44f 100644
--- a/admin/moveclients.xsl
+++ b/admin/moveclients.xsl
@@ -9,8 +9,8 @@
 	<xsl:template name="content">
 				<div class="section">
 					<h2><xsl:value-of select="$title" /></h2>
-					<div class="article">
-						<h3>Mountpoint <xsl:value-of select="current_source" /></h3>
+					<section class="box">
+						<h3 class="box_title">Mountpoint <code><xsl:value-of select="@mount" /></code></h3>
 						<!-- Mount nav -->
 						<xsl:call-template name="mountnav">
 							<xsl:with-param name="mount" select="current_source"/>
@@ -38,6 +38,7 @@
 										</xsl:for-each>
 									</select>
 									<input type="hidden" name="mount" value="{current_source}" />
+									&#160;
 									<input type="submit" value="Move listeners" />
 								</form>
 							</xsl:when>
@@ -48,7 +49,7 @@
 								</p>
 							</xsl:otherwise>
 						</xsl:choose>
-					</div>
+					</section>
 				</div>
 	</xsl:template>
 </xsl:stylesheet>
diff --git a/admin/updatemetadata.xsl b/admin/updatemetadata.xsl
index 7d60093c..3021a5cc 100644
--- a/admin/updatemetadata.xsl
+++ b/admin/updatemetadata.xsl
@@ -11,19 +11,22 @@
 					<h2><xsl:value-of select="$title" /></h2>
 
 					<xsl:for-each select="source">
-						<div class="article">
-							<h3>Mountpoint  <xsl:value-of select="@mount" /></h3>
+						<section class="box">
+							<h3 class="box_title">Mountpoint <code><xsl:value-of select="@mount" /></code></h3>
 							<!-- Mount nav -->
 							<xsl:call-template name="mountnav" />
+							<h4>Update Metadata</h4>
 							<form method="post" action="/admin/metadata.xsl">
-								<label for="metadata" class="hidden">Metadata</label>
-								<input type="text" id="metadata" name="song" value="" placeholder="Click to edit" required="required" />
 								<input type="hidden" name="mount" value="{@mount}" />
 								<input type="hidden" name="mode" value="updinfo" />
 								<input type="hidden" name="charset" value="UTF-8" />
+
+								<label for="metadata" class="hidden">Metadata:</label>
+								<input type="text" id="metadata" name="song" value="" placeholder="Click to edit" required="required" />
+								&#160;
 								<input type="submit" value="Update Metadata" />
 							</form>
-						</div>
+						</section>
 					</xsl:for-each>
 
 				</div>