diff --git a/phpBB/templates/PSO/agreement.tpl b/phpBB/templates/PSO/agreement.tpl
index 51eb55f7f9..18b6f53560 100644
--- a/phpBB/templates/PSO/agreement.tpl
+++ b/phpBB/templates/PSO/agreement.tpl
@@ -1,3 +1,9 @@
+<div align="center"><table width="98%" cellspacing="0" cellpadding="4" border="0">
+	<tr>
+		<td align="left"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}" color="{T_FONTCOLOR1}"><a href="/">{SITENAME}&nbsp;{L_INDEX}</a></font></td>
+	</tr>
+</table></div>
+
 <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/index_body.tpl b/phpBB/templates/PSO/index_body.tpl
index 00f32324eb..aad71bfaa4 100644
--- a/phpBB/templates/PSO/index_body.tpl
+++ b/phpBB/templates/PSO/index_body.tpl
@@ -26,7 +26,7 @@
 				<td bgcolor="{T_TD_COLOR1}" width="5%" align="center" valign="middle"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}">{catrow.forumrow.TOPICS}</font></td>
 				<td bgcolor="{T_TD_COLOR2}" width="5%" align="center" valign="middle"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}">{catrow.forumrow.POSTS}</font></td>
 				<td bgcolor="{T_TD_COLOR1}" width="15%" align="center" valign="middle"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}">{catrow.forumrow.LAST_POST}</font></td>
-				<td bgcolor="{T_TD_COLOR2}" width="5%" align="center" valign="middle"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}">{catrow.forumrow.MODERATORS}</td></tr>
+				<td bgcolor="{T_TD_COLOR2}" width="5%" align="center" valign="middle"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}">{catrow.forumrow.MODERATORS}</td></tr>
 			</tr>
 			<!-- END forumrow -->
 			<!-- END catrow -->
diff --git a/phpBB/templates/PSO/overall_footer.tpl b/phpBB/templates/PSO/overall_footer.tpl
index 588b27eb00..f6c11b191e 100644
--- a/phpBB/templates/PSO/overall_footer.tpl
+++ b/phpBB/templates/PSO/overall_footer.tpl
@@ -1,11 +1,12 @@
+<br clear="all">
 <center>
-<font face="{T_FONTFACE1}" size="{T_FONTSIZE1}" color="{T_FONTCOLO1}">{ADMIN_LINK}</font>
-<br clear="all" />
-<font face="{T_FONTFACE1}" size="{T_FONTSIZE1}" color="{T_FONTCOLO1}">Powered By <a href="http://www.phpbb.com/" target="_phpbb">phpBB</a> Version: {PHPBB_VERSION} - Fully templated and themed [ Paul's dev version ]</font>
-<br clear="all" />
+<font face="{T_FONTFACE1}" size="{T_FONTSIZE1}" color="{T_FONTCOLOR1}">{ADMIN_LINK}</font>
+<br clear="all">
+<font face="{T_FONTFACE1}" size="{T_FONTSIZE1}" color="{T_FONTCOLOR1}">Powered By <a href="http://www.phpbb.com/" target="_phpbb">phpBB</a> Version: {PHPBB_VERSION} - Fully templated and themed [ Paul's dev version ]</font>
+<br clear="all">
 <font face="{T_FONTFACE1}" size="{T_FONTSIZE1}" color="{T_FONTCOLOR1}">
 Copyright &copy; 2001 phpBB Group, All Rights Reserved</font>
-<br />
+<br>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/phpBB/templates/PSO/overall_header.tpl b/phpBB/templates/PSO/overall_header.tpl
index 0aa5af4f9c..66607f7092 100644
--- a/phpBB/templates/PSO/overall_header.tpl
+++ b/phpBB/templates/PSO/overall_header.tpl
@@ -21,19 +21,19 @@
 				<td bgcolor="{T_TH_COLOR2}"><table width="100%" cellspacing="0" border="0">
 					<tr>
 						<td><a href="{U_INDEX}"><font face="Impact,sans-serif" size="+5" point-size="36">phpBB2</font></a><font face="Verdana,serif" size="1" point-size="10"> : A forum that's free</font></td>
-						<td align="right" valign="bottom"><font face="Arial,Helvetica,sans-serif" size="1"><a href="/">Back To {SITENAME}</a></font></td>
+						<td align="right" valign="bottom"><font face="Arial,Helvetica,sans-serif" size="1"><a href="http://www.phpbb.com/">Goto phpBB.com</a></font></td>
 					</tr>
 				</table></td>
 			</tr>
 			<tr>
 				<td bgcolor="{T_TD_COLOR1}"><table width="100%" cellspacing="0" cellpadding="4" border="0">
-					<tr><form method="post" action="{S_LOGIN_ACTION}">
-						<td colspan="2" bgcolor="{T_TD_COLOR1}" align="right"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}">{L_USERNAME}: <input class="text" type="text" name="username">&nbsp;&nbsp;&nbsp;{L_PASSWORD}: <input type="password" name="password">&nbsp;&nbsp;&nbsp;{L_AUTO_LOGIN}</font>:&nbsp;<input class="text" type="checkbox" name="autologin">&nbsp;&nbsp;&nbsp;<input type="submit" name="submit" value="{L_LOGIN}">&nbsp;</font></td>
-					</form></tr>
 					<tr>
 						<td><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}"><a href="{U_REGISTER}">{L_REGISTER}</a>&nbsp;|&nbsp<a href="{U_MEMBERLIST}">{L_MEMBERLIST}</a>&nbsp;|&nbsp;<a href="{U_SEARCH}">{L_SEARCH}</a>&nbsp;|&nbsp;<a href="{U_FAQ}">{L_FAQ}</a></font></td>
-						<td align="right"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}"><a href="{U_PRIVATEMSGS}">{L_PRIVATEMSGS}</a>&nbsp;|&nbsp;<a href="{U_PROFILE}">{L_PROFILE}</a>&nbsp;|&nbsp;<a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a></font></td>
+						<td align="right"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}"><a href="{U_PRIVATEMSGS}">{L_PRIVATEMSGS}</a>&nbsp;|&nbsp;<a href="{U_PROFILE}">{L_PROFILE}</a>&nbsp;|&nbsp;<a href="{U_GROUP_ADMIN}">{L_USERGROUPS}</a>&nbsp;|&nbsp;<a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a></font></td>
 					</tr>
+					<tr><form method="post" action="{S_LOGIN_ACTION}">
+						<td colspan="2" align="right" valign="bottom"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}">{L_USERNAME}: <input class="text" type="text" name="username">&nbsp;&nbsp;&nbsp;{L_PASSWORD}: <input type="password" name="password">&nbsp;&nbsp;&nbsp;{L_AUTO_LOGIN}</font>:&nbsp;<input class="text" type="checkbox" name="autologin">&nbsp;&nbsp;&nbsp;<input type="submit" name="submit" value="{L_LOGIN}">&nbsp;</font></td>
+					</form></tr>
 				</table></td>
 			</tr>
 		</table></td>
diff --git a/phpBB/templates/PSO/viewtopic_body.tpl b/phpBB/templates/PSO/viewtopic_body.tpl
index 9a703866c2..fe11d601f5 100644
--- a/phpBB/templates/PSO/viewtopic_body.tpl
+++ b/phpBB/templates/PSO/viewtopic_body.tpl
@@ -24,7 +24,7 @@
 			<tr bgcolor="{postrow.ROW_COLOR}">
 				<td width="20%" align="left" valign="top"><table height="100%" cellspacing="0" cellpadding="0" border="0">
 					<tr>
-						<td valign="top"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}"><b>{postrow.POSTER_NAME}</b></font><br><font face="{T_FONTFACE2}" size="{T_FONTSIZE1}">{postrow.POSTER_RANK}<br><br>{L_JOINED}: {postrow.POSTER_JOINED}<br>{L_POSTS}: {postrow.POSTER_POSTS}<br>{postrow.POSTER_FROM}</font><br><br>{postrow.POSTER_AVATAR}<br><br></td>
+						<td valign="top"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}"><b>{postrow.POSTER_NAME}</b></font><br><font face="{T_FONTFACE2}" size="{T_FONTSIZE1}">{postrow.POSTER_RANK}<br>{postrow.RANK_IMAGE}<br><br>{L_JOINED}: {postrow.POSTER_JOINED}<br>{L_POSTS}: {postrow.POSTER_POSTS}<br>{postrow.POSTER_FROM}</font><br><br>{postrow.POSTER_AVATAR}<br><br></td>
 					</tr>
 					<tr>
 						<td valign="bottom"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}"><a href="#top">Back to top</a></font></td>