diff --git a/phpBB/includes/page_tail.php b/phpBB/includes/page_tail.php
index 9adf612948..fae8635166 100644
--- a/phpBB/includes/page_tail.php
+++ b/phpBB/includes/page_tail.php
@@ -22,36 +22,50 @@
  * 
  ***************************************************************************/ 
 
+//
 // Load/parse the footer template we need based on pagetype.
+//
 switch($pagetype) 
 {
- case 'index':
-   $template->pparse("footer");
-   break;
-   
- case 'viewforum':
-   
-   $template->assign_vars(array("PHPEX" => $phpEx,
-			    "FORUM_ID" => $forum_id));	
-   $template->pparse("footer");
-   break;
- case 'viewtopic':
-   $template->pparse("footer");
-   break;
+	case 'index':
+		$template->pparse("footer");
+		break;
+	
+	case 'viewforum':
+		$template->pparse("footer");
+		break;
+		
+	case 'viewtopic':
+		$template->pparse("footer");
+		break;
+
+	case 'viewonline':
+		$template->pparse("footer");
+		break;
+
 }
 
+//
 // Show the overall footer.
+//
 if($userdata['session_logged_in']) 
 {
-   $admin_link = "<a href=\"admin/index.php\">Administration Panel</a>";
+	$admin_link = "<a href=\"admin/index.php\">Administration Panel</a>";
 }
 $template->assign_vars(array("PHPBB_VERSION" => "2.0-alpha",
-			 "ADMIN_LINK" => $admin_link));
+	"ADMIN_LINK" => $admin_link));
+
 $template->pparse("overall_footer");
 
+//
 // Close our DB connection.
+//
 $db->sql_close();
 
+
+//
+// Output page creation time
+//
 $mtime = microtime();
 $mtime = explode(" ",$mtime);
 $mtime = $mtime[1] + $mtime[0];
@@ -60,4 +74,6 @@ $totaltime = ($endtime - $starttime);
 
 printf("<center><font size=-2>phpBB Created this page in %f seconds.</font></center>", $totaltime);
 
+exit;
+
 ?>
diff --git a/phpBB/templates/Default/viewonline_footer.tpl b/phpBB/templates/Default/viewonline_footer.tpl
index 9744b9c3d1..bb22397c56 100644
--- a/phpBB/templates/Default/viewonline_footer.tpl
+++ b/phpBB/templates/Default/viewonline_footer.tpl
@@ -1,5 +1,5 @@
 	<tr>
-	  <td>
+	  <td align="right">
 	   <table border="0" bgcolor="#000000" cellpadding="0" cellspacing="1">
 	    <tr>                           
 	      <td align="right">