diff --git a/web/html/css/fonts.css b/web/html/css/fonts.css
index 3fc35e38..55cb2261 100644
--- a/web/html/css/fonts.css
+++ b/web/html/css/fonts.css
@@ -34,7 +34,7 @@
 		font-family:		trebuchet ms, tahoma, verdana;
 		font-size:			11px;
 	}
-	span.fixed /* Monospace fixed-font */
+	span.fix /* Monospace fixed-font */
 	{
 		color:				#000;
 		font-family:		monospace, fixed, terminal;
diff --git a/web/html/images/favicon.ico b/web/html/images/favicon.ico
new file mode 100644
index 00000000..a9f4e837
Binary files /dev/null and b/web/html/images/favicon.ico differ
diff --git a/web/html/template.php b/web/html/template.php
new file mode 100644
index 00000000..36d0b4cf
--- /dev/null
+++ b/web/html/template.php
@@ -0,0 +1,17 @@
+<?
+include("aur.inc");         # access AUR common functions
+include("index_po.inc");    # use some form of this for i18n support
+html_header();              # print out the HTML header
+
+
+# Any text you print out to the visitor, use the _() function
+# for i18n support.  See 'testpo.php' for more details.
+#
+print _("Hi, this is worth reading!")."<br/>\n";
+
+
+html_footer("\$Id$");      # Use the $Id$ keyword
+                           # NOTE: when checking in a new file, use the
+                           # 'svn propset svn:keywords "Id" filename.php
+                           # to tell svn to expand the "Id" keyword.
+?>
diff --git a/web/lib/aur.inc b/web/lib/aur.inc
index c45e1dd2..7b7602e3 100644
--- a/web/lib/aur.inc
+++ b/web/lib/aur.inc
@@ -7,7 +7,7 @@ function html_header() {
 	print "<title>AUR</title>\n";
 	print "<link rel='stylesheet' type='text/css' href='/css/fonts.css'/>\n";
 	print "<link rel='stylesheet' type='text/css' href='/css/containers.css'/>\n";
-	print "<link rel='shortcut icon' href='/favicon.ico'/>\n";
+	print "<link rel='shortcut icon' href='/images/favicon.ico'/>\n";
 	print "</head>\n";
 	print "<body bgcolor='white'>\n";
 	print "<table cellspacing='0' ";
@@ -22,8 +22,8 @@ function html_header() {
 	print "            <tr>\n";
 	print "                <td class='headerDisplay'><a href='";
 	print $_SERVER['PHP_SELF']."'>";
-	print "<img src='/images/aur.png' border='0'></a></td>\n";
-	print "                <td class='headerDisplay' align='right'>";
+	print "<img src='/images/AUR-logo-80.png' border='0'></a></td>\n";
+	print "                <td class='headerDisplay' valign='top' align='right'>";
 	print "<span class='fix'>ArchLinux User-community Repository</span></td>\n";
 	print "            </tr>\n";
 	print "            </table>\n";
@@ -40,10 +40,8 @@ function html_footer($ver="") {
 	print "\n\n<!-- End of main content -->";
 	print "<p>\n";
 	if ($ver) {
-		print "<table border='0' cellpadding='0' cellspacing='0' width='90%'>\n";
-		print "<tr><td align='right'>";
-	  print "<span class='fix'>".$ver."<span/>\n";
-		print "</td></tr>\n";
+		print "<table border='0' cellpadding='0' cellspacing='0' width='100%'>\n";
+		print "<tr><td align='right'><span class='fix'>".$ver."</span></td></tr>\n";
 		print "</table>\n";
 	}
 	print "</body>\n</html>";
