diff --git a/clubs/directory.xml b/clubs/directory.xml
index fd2b3c9..d5bfe62 100644
--- a/clubs/directory.xml
+++ b/clubs/directory.xml
@@ -4,5 +4,5 @@
 
 <directory title="Clubs">
   <diritem title="Mailing Lists"
-    href="http://csclub.uwaterloo.ca/mailman/listinfo/" />
+    href="http://mailman.csclub.uwaterloo.ca/" />
 </directory>
diff --git a/clubs/index.xml b/clubs/index.xml
index 57d7e5f..9edf58e 100644
--- a/clubs/index.xml
+++ b/clubs/index.xml
@@ -63,7 +63,7 @@
 
  <section title="Mailing lists we host" id="lists">
  <p>We also host a number of <a
- href="http://csclub.uwaterloo.ca/cgi-bin/mailman/listinfo/">mailing lists</a>
+ href="http://mailman.csclub.uwaterloo.ca/">mailing lists</a>
  for various organisations, on-campus or in the community.  We provide
  archives of mailing list postings, as well as a web-based interface for
  administring lists.</p>
diff --git a/default.css b/default.css
index c624499..c3979cf 100644
--- a/default.css
+++ b/default.css
@@ -8,6 +8,13 @@ body {
     padding: 0 20px;
 }
 
+hr {
+    border: 0;
+    color: #ccc;
+    background-color: #ccc;
+    height: 1px;
+}
+
 h1 {
     font-size: x-large;
 }
@@ -85,10 +92,6 @@ th.news {
     font-size: x-small;
     text-align: left;
 }
-td.pagetitle {
-    font-size: large;
-    font-weight: bold;
-}
 th {
     background: #002288;
     color: white;
@@ -127,29 +130,37 @@ div.biglogo {
     background: url(./csc_welcome.jpg) -20px 25px transparent no-repeat;
     height: 340px;
 }
-div.uwlogo {
-    margin-top: 16px;
+div.biglogo div {
     float: left;
 }
-div.acmlogo {
+div.biglogo div.uwlogo {
+    margin-top: 16px;
+}
+div.biglogo div.acmlogo {
     margin-top: 12px;
-    float: left;
 }
 
-table.template-header {
-    border-bottom: 1px solid #ccc;
+div.template-header {
+    padding-top: 5px;
 }
 
 div.webtitle {
-    height: 60px;
-    width: 760px;
+    height: 46px;
+    width: 750px;
     background-color: #215498;
     border-bottom: 4px solid #104387;
+    padding-left: 10px;
+    padding-top: 12px;
 }
 
-div.webtitle div.webtitle-inner {
-    width: 760px;
-    padding: 0 10px;
+div.webtitle div {
+    float:left;
+    background-color: #215498;
+}
+
+div.webtitle div.csclogo {
+    padding-right: 10px;
+    background-color: #215498;
 }
 
 div.menubar {
diff --git a/events/index.xml b/events/index.xml
index 4b83a0b..fb62612 100644
--- a/events/index.xml
+++ b/events/index.xml
@@ -11,4 +11,4 @@
  </section>
 
  <footer />
-</cscpage>
\ No newline at end of file
+</cscpage>
diff --git a/logos/csc_title.png b/logos/csc_title.png
index 6208268..8438f93 100644
Binary files a/logos/csc_title.png and b/logos/csc_title.png differ
diff --git a/menu.xml b/menu.xml
index 7429a6a..140623b 100644
--- a/menu.xml
+++ b/menu.xml
@@ -10,10 +10,10 @@
  <menuitem title="Clubs" icon="clubs" href="clubs/"/>
 <!--<menuitem title="Stats" icon="stats" href="/stats/"/>-->
  <menuitem title="Media" icon="package_multimedia" href="media/"/>
- <menuitem title="Library" icon="koha" absolute="true" href="http://koha.csclub.uwaterloo.ca"/>
- <menuitem title="Wiki" icon="sunflower" absolute="true" href="http://wiki.csclub.uwaterloo.ca"/>
+ <menuitem title="Library" icon="koha" absolute="true" href="http://koha.csclub.uwaterloo.ca/"/>
+ <menuitem title="Wiki" icon="sunflower" absolute="true" href="http://wiki.csclub.uwaterloo.ca/"/>
  <menuitem title="Webmail" icon="horde" absolute="true" href="https://mail.csclub.uwaterloo.ca/"/>
- <menuitem title="Mailman" icon="mm-icon" absolute="true" href="http://mailman.csclub.uwaterloo.ca"/>
- <menuitem title="gopher" icon="gopher" absolute="true" href="gopher://csclub.uwaterloo.ca"/>
- <menuitem title="gitweb" icon="gitweb" absolute="true" href="http://gitweb.csclub.uwaterloo.ca"/>
+ <menuitem title="Mailman" icon="mm-icon" absolute="true" href="http://mailman.csclub.uwaterloo.ca/"/>
+ <menuitem title="gopher" icon="gopher" absolute="true" href="gopher://csclub.uwaterloo.ca/"/>
+ <menuitem title="gitweb" icon="gitweb" absolute="true" href="http://gitweb.csclub.uwaterloo.ca/"/>
 </menudefs>
diff --git a/xsl/common.xsl b/xsl/common.xsl
index bb116fe..4d5ceec 100644
--- a/xsl/common.xsl
+++ b/xsl/common.xsl
@@ -45,29 +45,20 @@
 
 <xsl:template match="header" name="header">
   <div id="vfeed" />
-  <div class="webtitle"><div class="webtitle-inner">
-    <table cellpadding="0" cellspacing="0" border="0"><tr>
-      <td>
-        <a href="{$pre}"><img src="{$pre}logos/csc_80_35_white.png" 
-            alt="CSC Logo" /></a>
-      </td><td>
-        <a href="{$pre}"><img src="{$pre}logos/csc_title.png" 
-            alt="CSC Title" /></a>
-      </td><td valign="top" align="right" />
-    </tr></table>
-  </div></div>
-  <table cellspacing="0" cellpadding="2" border="0" width="100%" 
-      class="template-header">
-    <tr>
-      <td colspan="2" class="pagetitle"><xsl:value-of select="@title" /></td>
-    </tr>
-    <tr>
-      <td colspan="2">
-        <xsl:apply-templates
-           select="document(concat($pwd, '/directory.xml'))/directory"/>
-      </td>
-    </tr>
-  </table>
+  <div class="webtitle">
+    <div class="csclogo">
+      <a href="{$pre}"><img src="{$pre}logos/csc_80_35_white.png" 
+          alt="CSC Logo" /></a>
+    </div>
+    <div>
+      <a href="{$pre}"><img src="{$pre}logos/csc_title.png" 
+          alt="Computer Science Club" /></a>
+    </div>
+  </div>
+  <div class="template-header">
+    <xsl:apply-templates
+        select="document(concat($pwd, '/directory.xml'))/directory"/>
+  </div>
 </xsl:template>
 
 <xsl:template match="footer" name="footer">
diff --git a/xsl/directory.xsl b/xsl/directory.xsl
index 976ebaa..a27115a 100644
--- a/xsl/directory.xsl
+++ b/xsl/directory.xsl
@@ -7,7 +7,7 @@
 <xsl:template match="directory">
   <xsl:variable name="href">
     <xsl:choose>
-      <xsl:when test="@href"><xsl:value-of select="@href"/></xsl:when>
+      <xsl:when test="@href != ''"><xsl:value-of select="@href"/></xsl:when>
       <xsl:otherwise>index.html</xsl:otherwise>
     </xsl:choose>
   </xsl:variable>
diff --git a/xsl/events.xsl b/xsl/events.xsl
index dcb1cb0..38efa74 100644
--- a/xsl/events.xsl
+++ b/xsl/events.xsl
@@ -8,7 +8,7 @@
   <tr>
     <th colspan="2" class="news">Upcoming Events</th>
   </tr>
-  <xsl:for-each select="document('../events.xml')/eventdefs/eventitem">
+  <xsl:for-each select="document(concat($pwd, '/../events.xml'))/eventdefs/eventitem">
     <xsl:sort select="translate(@date, '-', '')" 
         order="ascending" data-type="number" />
     <xsl:if test="translate(@date, '-', '') &gt;= translate($date, '-', '')">
@@ -36,10 +36,17 @@
   </tr>
 </xsl:template>
 
-<xsl:template match="events-this-term" name="events-by-term">
+<xsl:template match="events-this-term">
+  <xsl:call-template name="events-by-term">
+    <xsl:with-param name="date" select="$date" />
+  </xsl:call-template>
+</xsl:template>
+
+<xsl:template name="events-by-term">
+  <xsl:param name="date" />
   <p>The events for <xsl:value-of select="csc:term($date)" /> are listed here.
     You can also <a href="${pre}events.ics">download an ICS</a> of them.</p>
-  <xsl:for-each select="document('../events.xml')/eventdefs/eventitem">
+  <xsl:for-each select="document(concat($pwd, '/../events.xml'))/eventdefs/eventitem">
     <xsl:sort select="translate(@date, '-', '')" 
         order="ascending" data-type="number" />
     <xsl:if test="csc:term(@date) = csc:term($date)">
@@ -74,9 +81,10 @@
         <xsl:call-template name="header">
           <xsl:with-param name="title" select="@title" />
         </xsl:call-template>
+        <h2>Information</h2>
         <div>
-          Held in <xsl:value-of select="@room" /> at
-          <xsl:value-of select="@date" />, <xsl:value-of select="@time" />.
+          Held in <xsl:value-of select="@room" />, on
+          <xsl:value-of select="@date" />, at <xsl:value-of select="@time" />.
         </div>
         <h2>Abstract</h2>
         <xsl:apply-templates select="abstract/node()" />
@@ -87,13 +95,13 @@
 </xsl:template>
 
 <xsl:template match="generate-event-files">
-  <xsl:apply-templates select="document('../events.xml')/eventdefs" />
+  <xsl:apply-templates select="document(concat($pwd, '/../events.xml'))/eventdefs" />
 </xsl:template>
 
 <xsl:key name="eventterm" match="/eventdefs/eventitem" use="csc:term(@date)" />
 
 <xsl:template match="old-events">
-  <xsl:for-each select="document('events.xml')/eventdefs/eventitem">
+  <xsl:for-each select="document(concat($pwd, '/../events.xml'))/eventdefs/eventitem">
     <xsl:sort select="translate(@date, '-', '')" 
         order="descending" data-type="number" />
     <xsl:if test="not(preceding-sibling::*[csc:term(@date)=csc:term(current()/@date)]) and not(csc:term(@date) = csc:term($date))">