diff --git a/phpBB/styles/subSilver/template/ucp_header.html b/phpBB/styles/subSilver/template/ucp_header.html
index 8110d33491..a592043ff9 100644
--- a/phpBB/styles/subSilver/template/ucp_header.html
+++ b/phpBB/styles/subSilver/template/ucp_header.html
@@ -37,7 +37,7 @@ function marklist(form_name, status)
 
 //-->
 </script>
-<script language="javascript" type="text/javascript" src="styles/subSilver/template/editor.js"></script>
+<script language="javascript" type="text/javascript" src="{T_TEMPLATE_PATH}/editor.js"></script>
 
 <form method="post" name="ucp" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}><table width="95%" cellspacing="0" cellpadding="0" border="0" align="center">
 	<tr>
@@ -49,59 +49,76 @@ function marklist(form_name, status)
 	<tr>
 		<td>
 
-<table class="tablebg" width="20%" cellspacing="1" cellpadding="4" border="0" align="left">
+<table width="20%" cellspacing="0" cellpadding="0" border="0" align="left">
 	<tr>
-		<th>{L_OPTIONS}</th>
-	</tr>
-	<!-- BEGIN ucp_section -->
-	<tr>
-		<!-- IF ucp_section.S_SELECTED -->
-		<td class="row1" height="28"><b class="nav">{ucp_section.L_TITLE}</b>
-			<table width="100%" cellspacing="0" cellpadding="0" border="0">
-			<!-- BEGIN ucp_subsection -->
+		<td>
+
+			<table class="tablebg" width="100%" cellspacing="1" cellpadding="4" border="0">
 				<tr>
-					<td class="nav">&#187;&nbsp;</td>
-					<td class="nav" width="100%" height="20"><!-- IF ucp_section.ucp_subsection.S_SELECTED --><b>{ucp_section.ucp_subsection.L_TITLE}</b><!-- ELSE --><a href="{ucp_section.ucp_subsection.U_TITLE}">{ucp_section.ucp_subsection.L_TITLE}</a><!-- ENDIF --></td>
+					<th>{L_OPTIONS}</th>
 				</tr>
-			<!-- END ucp_subsection -->
+				<!-- BEGIN ucp_section -->
+				<tr>
+					<!-- IF ucp_section.S_SELECTED -->
+					<td class="row1" height="28"><b class="nav">{ucp_section.L_TITLE}</b>
+						<table width="100%" cellspacing="0" cellpadding="0" border="0">
+						<!-- BEGIN ucp_subsection -->
+							<tr>
+								<td class="nav">&#187;&nbsp;</td>
+								<td class="nav" width="100%" height="20"><!-- IF ucp_section.ucp_subsection.S_SELECTED --><b>{ucp_section.ucp_subsection.L_TITLE}</b><!-- ELSE --><a href="{ucp_section.ucp_subsection.U_TITLE}">{ucp_section.ucp_subsection.L_TITLE}</a><!-- ENDIF --></td>
+							</tr>
+						<!-- END ucp_subsection -->
+						</table>
+					<!-- ELSE -->
+					<td class="row2" height="25" nowrap="nowrap" onmouseover="this.className='row1'" onmouseout="this.className='row2'"><a class="nav" href="{ucp_section.U_TITLE}">{ucp_section.L_TITLE}</a>
+					<!-- ENDIF -->
+					</td>
+				</tr>
+				<!-- END ucp_section -->
 			</table>
-		<!-- ELSE -->
-		<td class="row2" height="25" nowrap="nowrap" onmouseover="this.className='row1'" onmouseout="this.className='row2'"><a class="nav" href="{ucp_section.U_TITLE}">{ucp_section.L_TITLE}</a>
-		<!-- ENDIF -->
+
+			<table cellspacing="0" cellpadding="0" border="0">
+				<tr>
+					<td><img src="images/spacer.gif" height="2" alt="" /></td>
+				</tr>
+			</table>
+
+			<table class="tablebg" width="100%" cellspacing="1" cellpadding="4" border="0">
+				<tr>
+					<th>{L_FRIENDS}</th>
+				</tr>
+				<tr>
+					<td class="row1"><table width="100%" cellspacing="1" cellpadding="0" border="0">
+						<tr>
+							<td class="genmed" height="20" align="center"><b style="color:green">{L_FRIENDS_ONLINE}</td>
+						</tr>
+						<!-- BEGIN friends_online -->
+						<tr>
+							<td class="gensmall" align="center"><a href="{friends_online.U_PROFILE}">{friends_online.USERNAME}</a></td>
+						</tr>
+						<!-- BEGINELSE -->
+						<tr>
+							<td class="genmed" align="center">{L_NO_FRIENDS_ONLINE}</td>
+						</tr>
+						<!-- END friends_online -->
+						<tr>
+							<td class="genmed" height="20" align="center"><b style="color:red">{L_FRIENDS_OFFLINE}</td>
+						</tr>
+						<!-- BEGIN friends_offline -->
+						<tr>
+							<td class="gensmall" align="center"><a href="{friends_offline.U_PROFILE}">{friends_offline.USERNAME}</a></td>
+						</tr>
+						<!-- BEGINELSE -->
+						<tr>
+							<td class="genmed" align="center">{L_NO_FRIENDS_OFFLINE}</td>
+						</tr>
+						<!-- END friends_offline -->
+					</table></td>
+				</tr>
+			</table>
+
 		</td>
 	</tr>
-	<!-- END ucp_section -->
-	<tr>
-		<th>{L_FRIENDS}</th>
-	</tr>
-	<tr>
-		<td class="row1"><table width="100%" cellspacing="1" cellpadding="0" border="0">
-			<tr>
-				<td class="genmed" height="20" align="center"><b style="color:green">{L_FRIENDS_ONLINE}</td>
-			</tr>
-			<!-- BEGIN friends_online -->
-			<tr>
-				<td class="gensmall" align="center"><a href="{friends_online.U_PROFILE}">{friends_online.USERNAME}</a></td>
-			</tr>
-			<!-- BEGINELSE -->
-			<tr>
-				<td class="genmed" align="center">{L_NO_FRIENDS_ONLINE}</td>
-			</tr>
-			<!-- END friends_online -->
-			<tr>
-				<td class="genmed" height="20" align="center"><b style="color:red">{L_FRIENDS_OFFLINE}</td>
-			</tr>
-			<!-- BEGIN friends_offline -->
-			<tr>
-				<td class="gensmall" align="center"><a href="{friends_offline.U_PROFILE}">{friends_offline.USERNAME}</a></td>
-			</tr>
-			<!-- BEGINELSE -->
-			<tr>
-				<td class="genmed" align="center">{L_NO_FRIENDS_OFFLINE}</td>
-			</tr>
-			<!-- END friends_offline -->
-		</table></td>
-	</tr>
 </table>
 
 <table cellspacing="0" cellpadding="0" border="0" align="left">