diff --git a/phpBB/templates/PSO/index_body.tpl b/phpBB/templates/PSO/index_body.tpl
index 7de74aadde..0a2f364da7 100644
--- a/phpBB/templates/PSO/index_body.tpl
+++ b/phpBB/templates/PSO/index_body.tpl
@@ -30,6 +30,20 @@
 			</tr>
 			<!-- END forumrow -->
 			<!-- END catrow -->
+			<tr>
+				<td class="cat" colspan="6"><span class="cattitle"><b><a href="{U_PRIVATEMSGS}">Private Messages</a></b></span></td>
+			</tr>
+			<tr>
+				<td class="row1" width="7%" align="center" valign="middle"><img src="images/mailbox.gif"></td>
+				<td class="row2" colspan="5" align="left"><span class="gen">{L_PRIVATE_MESSAGE_INFO}</span></td>
+			</tr>
+			<tr>
+				<td class="cat" colspan="6"><span class="cattitle"><b><a href="{U_VIEWONLINE}">Who is Online</a></b></span></td>
+			</tr>
+			<tr>
+				<td class="row1" width="7%" align="center" valign="middle"><img src="images/whosonline.gif"></td>
+				<td class="row2" colspan="5" align="left"><span class="gensmall">{TOTAL_USERS_ONLINE}</span><br><span class="gen">{LOGGED_IN_USER_LIST}</span></td>
+			</tr>
 		</table></td>
 	</tr>
 </table>
@@ -49,30 +63,6 @@
 	</tr>
 </table>
 
-<br clear="all">
-
-<table width="98%" cellpadding="1" cellspacing="0" border="0" align="center">
-	<tr>
-		<td class="tablebg"><table width="100%" cellpadding="3" cellspacing="1" border="0">
-			<tr>
-				<td class="cat" colspan="2"><span class="cattitle"><b><a href="{U_PRIVATEMSGS}">Private Messages</a></b></span></td>
-			</tr>
-			<tr>
-				<td class="row1" width="7%" align="center" valign="middle"><img src="images/mailbox.gif"></td>
-				<td class="row2" align="left"><span class="gen">{L_PRIVATE_MESSAGE_INFO}</span></td>
-			</tr>
-			<tr>
-				<td class="cat" colspan="2"><span class="cattitle"><b><a href="{U_VIEWONLINE}">Who is Online</a></b></span></td>
-			</tr>
-			<tr>
-				<td class="row1" width="7%" align="center" valign="middle"><img src="images/whosonline.gif"></td>
-				<td class="row2" align="left"><span class="gensmall">{TOTAL_USERS_ONLINE}</span><br><span class="gen">{LOGGED_IN_USER_LIST}</span></td>
-			</tr>
-		</table></td>
-	</tr>
-</table>
-
-
 <!-- div align="center"><table width="98%" cellpadding="1" cellspacing="0" border="0">
 	<tr>
 		<td bgcolor="{T_TH_COLOR1}"><table border="0" cellpadding="3" cellspacing="1" width="100%">
diff --git a/phpBB/templates/PSO/profile_add_body.tpl b/phpBB/templates/PSO/profile_add_body.tpl
index 839a75e521..92ae2fe1a1 100644
--- a/phpBB/templates/PSO/profile_add_body.tpl
+++ b/phpBB/templates/PSO/profile_add_body.tpl
@@ -8,7 +8,7 @@
 	<tr><form action="{S_PROFILE_ACTION}" enctype="multipart/form-data" method="post">
 		<td class="tablebg"><table border="0" cellpadding="3" cellspacing="1" width="100%">
 			<tr>
-				<th class="secondary" colspan="2">&nbsp;<b>{L_REGISTRATION_INFO}</b> <span class="gensmall">[{L_ITEMS_REQUIRED}]</span>&nbsp;</th>
+				<td class="cat" colspan="2"><span class="cattitle"><b>{L_REGISTRATION_INFO}</b></span><br><span class="gensmall">{L_ITEMS_REQUIRED}</span>&nbsp;</th>
 			</tr>
 			<tr>
 				<td class="row1" width="38%"><span class="gen">{L_USERNAME}: *</b><br>{L_USER_UNIQ}</td>
@@ -27,7 +27,7 @@
 				<td class="row2"><input type="password" name="password_confirm" size="35" maxlength="100" value="{PASSWORD_CONFIRM}"></td>
 			</tr>
 			<tr>
-				<th class="secondary" colspan="2">&nbsp;<b>{L_PROFILE_INFO}</b> <span class="gensmall">[{L_PROFILE_INFO_NOTICE}]</span></td>
+				<td class="cat" colspan="2"><span class="cattitle"><b>{L_PROFILE_INFO}</b></span><br><span class="gensmall">{L_PROFILE_INFO_NOTICE}</span></td>
 			</tr>
 			<tr>
 				<td class="row1"><span class="gen">{L_ICQ_NUMBER}:</span></td>
@@ -66,7 +66,7 @@
 				<td class="row2"><textarea name="signature" rows="6" cols="45">{SIGNATURE}</textarea></td>
 			</tr>
 			<tr>
-				<th class="secondary" colspan="2">&nbsp;<b>{L_PREFERENCES}</b></td>
+				<td class="cat" colspan="2"><span class="cattitle"><b>{L_PREFERENCES}</b></span></td>
 			</tr>
 			<tr>
 				<td class="row1"><span class="gen">{L_PUBLIC_VIEW_EMAIL}:</span></td>
@@ -118,7 +118,7 @@
 			</tr>
 			<!-- BEGIN avatarblock -->
 			<tr>
-				<th class="secondary" colspan="2">&nbsp;<b>{L_AVATAR_PANEL}</b></td>
+				<td class="cat" colspan="2"><span class="cattitle"><b>{L_AVATAR_PANEL}</b></span></td>
 			</tr>
 			<tr>
 				<td class="row1" colspan="2" align="center"><table width="70%" cellspacing="2" cellpadding="0" border="0">
diff --git a/phpBB/templates/PSO/profile_view_body.tpl b/phpBB/templates/PSO/profile_view_body.tpl
index 389dee7c6c..04ddefa618 100644
--- a/phpBB/templates/PSO/profile_view_body.tpl
+++ b/phpBB/templates/PSO/profile_view_body.tpl
@@ -8,7 +8,7 @@
 	<tr>
 		<td class="tablebg"><table border="0" cellpadding="3" cellspacing="1" width="100%">
 			<tr>
-				<td class="cat" colspan="2" align="center"><span class="cattitle"><b>{L_VIEWING_PROFILE} {USERNAME}</b></td>
+				<td class="cat" colspan="2"><span class="cattitle"><b>{L_VIEWING_PROFILE} <i>{USERNAME}</i></b></td>
 			</tr>
 			<tr>
 	           <td class="row1" width="20%" height="25"><span class="gen">{L_USERNAME}:</span></td>