diff --git a/default.css b/default.css
index cd5dd19..c54ea36 100644
--- a/default.css
+++ b/default.css
@@ -194,6 +194,11 @@ div.menuitem a:hover {
     border: 1px solid #ccc;
 }
 
+div.menuitem p {
+    margin: 0;
+    padding: 0;
+}
+
 a.diritem, a.diritem:link, a.diritem:visited, a.diritem:active {
     font-family: 'Lucida Grande', Sans, Sans-serif;
     border-left: 4px solid #ccc;
@@ -229,9 +234,9 @@ div.footer {
     color: #666;
 }
 
-p.infobox {
+div.infobox {
     border: 1px solid #ccc;
-    padding: 5px 10px;
+    padding: 0px 10px;
 }
 
 p.mediafile {
diff --git a/docs/machine_usage-change-20070819.xml b/docs/machine_usage-change-20070819.xml
index 683eb9f..7b0de3d 100644
--- a/docs/machine_usage-change-20070819.xml
+++ b/docs/machine_usage-change-20070819.xml
@@ -82,8 +82,8 @@ any account.
 <p>
 An account may only be used by the person assigned to it. <em>Do not
 tell your password to anybody, or let anyone else use your account</em>.
-Users should consider the security implications of their actions.<br/>
-For example:
+Users should consider the security implications of their actions. For
+example:
 </p>
 <ul>
 <li>Passwords for accounts on CSC machines should not be used on
@@ -142,8 +142,7 @@ CSC, which has, or requests, an account on a Computer Science Club machine.
 </p>
 <p>
 Clubs are given accounts to provide them with e-mail and WWW pages, but are
-subject to the following to certain rules.<br/>
-They are as follows:
+subject to the following to certain rules. They are as follows:
 </p>
 <ol>
 <li>
diff --git a/docs/machine_usage.xml b/docs/machine_usage.xml
index 683eb9f..7b0de3d 100644
--- a/docs/machine_usage.xml
+++ b/docs/machine_usage.xml
@@ -82,8 +82,8 @@ any account.
 <p>
 An account may only be used by the person assigned to it. <em>Do not
 tell your password to anybody, or let anyone else use your account</em>.
-Users should consider the security implications of their actions.<br/>
-For example:
+Users should consider the security implications of their actions. For
+example:
 </p>
 <ul>
 <li>Passwords for accounts on CSC machines should not be used on
@@ -142,8 +142,7 @@ CSC, which has, or requests, an account on a Computer Science Club machine.
 </p>
 <p>
 Clubs are given accounts to provide them with e-mail and WWW pages, but are
-subject to the following to certain rules.<br/>
-They are as follows:
+subject to the following to certain rules. They are as follows:
 </p>
 <ol>
 <li>
diff --git a/events.xml b/events.xml
index c3cf829..2b9dff4 100644
--- a/events.xml
+++ b/events.xml
@@ -796,8 +796,10 @@ and optional. After some remarks about constraints and opportunities in
 the near future, I'll open the floor to discussion, and hope to hear
 some candid comments about the state of CS at UW and how it might be
 improved.
-</p><br></br>
-About the speaker:<br></br>
+</p>
+<p>
+About the speaker:
+</p>
 <p>
 Prabhakar Ragde is a Professor in the School of Computer Science at UW.
 He was Associate Chair for Curricula during the period that saw the
diff --git a/office/webcam-streaming.xml b/office/webcam-streaming.xml
index 35f0ce7..19b86ff 100644
--- a/office/webcam-streaming.xml
+++ b/office/webcam-streaming.xml
@@ -8,11 +8,11 @@
 
 <p>Spy on the office, see whether it's open or who is passing by the door!</p>
 
-<div class="webcam">
+<div class="webcam"><p>
 <img src="http://glucose-fructose.csclub.uwaterloo.ca:8080/" width="640" height="480" alt="Sugar's Webcam"/>
-<br/><br/>
+</p><p>
 <img src="http://phosphoric-acid.csclub.uwaterloo.ca:8080/" width="640" height="480" alt="Phosphoric-acid's Webcam"/>
-</div>
+</p></div>
 
 <p>Tired of streaming? Try the <a href="webcam.html">regular version</a>.</p>
 
diff --git a/office/webcam.xml b/office/webcam.xml
index 7af2b05..306e3e0 100644
--- a/office/webcam.xml
+++ b/office/webcam.xml
@@ -8,11 +8,11 @@
 
 <p>Spy on the office, see whether it's open or who is passing by the door!</p>
 
-<div class="webcam">
+<div class="webcam"><p>
 <img src="http://glucose-fructose.csclub.uwaterloo.ca:8080/singleframe" width="640" height="480" alt="Sugar's Webcam"/>
-<br/><br/>
+</p><p>
 <img src="http://phosphoric-acid.csclub.uwaterloo.ca:8080/singleframe" width="640" height="480" alt="Phosphoric-acid's Webcam"/>
-</div>
+</p></div>
 
 <p>Try the <a href="webcam-streaming.html">streaming version</a> for
 streamy goodness.</p>
diff --git a/xsl/common.xsl b/xsl/common.xsl
index 2da46b6..2ab9d43 100644
--- a/xsl/common.xsl
+++ b/xsl/common.xsl
@@ -67,19 +67,20 @@
   <a href="#pagetop" class="pagetop">Go to top</a>
   <div class="footer">
   <xsl:call-template name="menu" />
-  <p>This page was generated on <xsl:value-of select="$g_date" /> at 
-    <xsl:value-of select="$g_time" />.</p>
-  <p class="infobox">
+  <div class="infobox"><p>
+    This page was generated on <xsl:value-of select="$g_date" /> at 
+    <xsl:value-of select="$g_time" />.
+    </p><p>
     The overall layout is designed specially for modern browsers. If you
     experience any problems, please report them, along with the version of
     your browser and operating system, to the 
     <a href="mailto:www@csclub.uwaterloo.ca">Webmaster</a>.
-    <br /><br />
+    </p><p>
     This site supports TLS/SSL using a certificate signed by the 
     "CSC Certificate Authority". Click <a href="{$pre}csclub.pem">here</a>
     (PEM format) or <a href="{$pre}csclub.der">here</a> (DER format) to
     install the certificate authority into your browser.
-  </p>
+  </p></div>
   <p>
     <a href="http://validator.w3.org/check?uri=referer">
     <img src="http://www.w3.org/Icons/valid-xhtml10"
diff --git a/xsl/menu.xsl b/xsl/menu.xsl
index 66a04ff..4e089ef 100644
--- a/xsl/menu.xsl
+++ b/xsl/menu.xsl
@@ -17,8 +17,8 @@
     </xsl:choose>
   </xsl:variable>
   <div class="menuitem">
-    <a href="{$preabs}{@href}"><img src="{$pre}buttons/{@icon}.png" width="40" 
-      height="40" alt="{@title}" /><br /><xsl:value-of select="@title" /></a>
+    <a href="{$preabs}{@href}"><p><img src="{$pre}buttons/{@icon}.png" width="40" 
+      height="40" alt="{@title}" /></p><p><xsl:value-of select="@title" /></p></a>
   </div>
 </xsl:template>