diff --git a/www/analyzer/annotations.html b/www/analyzer/annotations.html
index cd92026..7f6fe38 100644
--- a/www/analyzer/annotations.html
+++ b/www/analyzer/annotations.html
@@ -9,6 +9,7 @@
 </head>
 <body>
 
+<div id="page">
 <!--#include virtual="menu.html.incl"-->
 
 <div id="content">
@@ -384,6 +385,7 @@
 </pre>
 
 </div>
+</div>
 </body>
 </html>
 
diff --git a/www/analyzer/available_checks.html b/www/analyzer/available_checks.html
index 3956bae..0d34882 100644
--- a/www/analyzer/available_checks.html
+++ b/www/analyzer/available_checks.html
@@ -9,6 +9,7 @@
 </head>
 <body>
 
+<div id="page">
 <!--#include virtual="menu.html.incl"-->
 
 <div id="content">
@@ -30,6 +31,7 @@
 
 
 </div>
+</div>
 </body>
 </html>
 
diff --git a/www/analyzer/content.css b/www/analyzer/content.css
index 3f47e3b..0567467 100644
--- a/www/analyzer/content.css
+++ b/www/analyzer/content.css
@@ -2,8 +2,11 @@
 
 html, body {
   padding:0px;
+  margin:0px;
   font-size:small; font-family:"Lucida Grande", "Lucida Sans Unicode", Arial, Verdana, Helvetica, sans-serif; background-color: #fff; color: #222;
   line-height:1.5;
+  background-color: #808080;
+  
 }
 
 h1, h2, h3, tt { color: #000 }
@@ -27,7 +30,19 @@
     margin-right: auto
 }
 
+#page { width:820px;  text-align: left; margin: 0 auto; padding:0;
+        background-color: white; height:100%;
+        border-left: 1px solid #EBF0FA;
+}
+
+#content {
+  clear: left;
+  padding: 1em 2em 0 2em;
+  background-color: #ffffff;
+}
+
 .itemTitle { color:#2d58b7 }
 
+
 /* Tables */
 tr { vertical-align:top }
diff --git a/www/analyzer/dev_cxx.html b/www/analyzer/dev_cxx.html
index d3c940b..58a4d16 100644
--- a/www/analyzer/dev_cxx.html
+++ b/www/analyzer/dev_cxx.html
@@ -9,8 +9,8 @@
 </head>
 <body>
 
+<div id="page">
 <!--#include virtual="menu.html.incl"-->
-
 <div id="content">
 
 <h1>C++ Support</h1>
@@ -46,6 +46,7 @@
 </ul>
 
 </div>
+</div>
 </body>
 </html>
 
diff --git a/www/analyzer/filing_bugs.html b/www/analyzer/filing_bugs.html
index daf05d0..c86457a 100644
--- a/www/analyzer/filing_bugs.html
+++ b/www/analyzer/filing_bugs.html
@@ -9,8 +9,8 @@
 </head>
 <body>
 
+<div id="page">
 <!--#include virtual="menu.html.incl"-->
-
 <div id="content">
 
 <h1>Filing Bugs and Feature Requests</h1>
@@ -55,8 +55,7 @@
 <h2>Apple-internal Users</h2>
 
 <p>Please file bugs in Radar against the <b>llvm - checker</b> component.</p>
-
-
+</div>
 </div>
 </body>
 </html>
diff --git a/www/analyzer/index.html b/www/analyzer/index.html
index b5b1046..814070f 100644
--- a/www/analyzer/index.html
+++ b/www/analyzer/index.html
@@ -9,14 +9,19 @@
 </head>
 <body>
 
+<div id="page">
 <!--#include virtual="menu.html.incl"-->
 
 <div id="content">
-<table style="margin-top:0px" border="0" cellpadding="0" cellspacing="0">
-<tr><td>
+
 <h1>Clang Static Analyzer</h1>  
+
+<table style="margin-top:0px" width="100%" border="0" cellpadding="0px" cellspacing="0">
+<tr><td>
 <p>The Clang Static Analyzer consists of both a source code analysis framework
-and a standalone tool that finds bugs in C and Objective-C programs. The
+and a standalone tool that finds bugs in C and Objective-C programs.</p>
+
+<p>The
 standalone tool is invoked from the command-line, and is intended to run in
 tandem with a build of a project or code base.</p>
 
@@ -76,7 +81,7 @@
   #wrappedcontent { padding:15px;}
 </style>
 
-<div style="margin-left:25px; margin-right:25px; padding:0px; font-size: 80%">
+<div style="padding:0px; font-size: 90%">
  <b class="spiffy">
  <b class="spiffy1"><b></b></b>
  <b class="spiffy2"><b></b></b>
@@ -108,6 +113,13 @@
  <b class="spiffy1"><b></b></b></b>
 </div>
 
+</td><td style="padding-left:10px">
+<a href="images/analyzer_xcode.png"><img src="images/analyzer_xcode.png" width="450x"></a>
+<center><b>Viewing static analyzer results in Xcode 3.2</b></center>
+<a href="images/analyzer_html.png"><img src="images/analyzer_html.png" width="450px"></a>
+<center><b>Viewing static analyzer results in a web browser</b></center>
+</td></tr></table>
+
 <h2 id="StaticAnalysis">What is Static Analysis?</h2>
 
 <p>The term &quot;static analysis&quot; is conflated, but here we use it to mean
@@ -124,16 +136,6 @@
 programs that is freely available, extensible, and has a high quality of
 implementation.</p>
 
-
-
-
-</td><td>
-<a href="images/analyzer_xcode.png"><img src="images/analyzer_xcode.png" width="450x"></a>
-<center><b>Viewing static analyzer results in Xcode 3.2</b></center>
-<a href="images/analyzer_html.png"><img src="images/analyzer_html.png" width="450px"></a>
-<center><b>Viewing static analyzer results in a web browser</b></center>
-</td></tr></table>
-
 <h3 id="Clang">Part of Clang and LLVM</h3>
 
 <p>As its name implies, the Clang Static Analyzer is built on top of <a
@@ -193,6 +195,7 @@
 patches.</p>
 
 </div>
+</div>
 </body>
 </html>
 
diff --git a/www/analyzer/installation.html b/www/analyzer/installation.html
index ceb2aed..75ecabd 100644
--- a/www/analyzer/installation.html
+++ b/www/analyzer/installation.html
@@ -9,8 +9,8 @@
 </head>
 <body>
 
+<div id="page">
 <!--#include virtual="menu.html.incl"-->
-
 <div id="content">
 
 <h1>Obtaining the Static Analyzer</h1>
@@ -107,7 +107,7 @@
 are subject to change.</p></li>
 
 </ul>
-
+</div>
 </div>
 </body>
 </html>
diff --git a/www/analyzer/menu.css b/www/analyzer/menu.css
index a402d5a..e18b8e0 100644
--- a/www/analyzer/menu.css
+++ b/www/analyzer/menu.css
@@ -1,10 +1,14 @@
 /* From 'A list apart', 'dropdowns' */
-body {
-  background-color: #EBF0FA;
-}
+
 #nav {
+  clear: left;
+  margin:0;
+  padding:0;
   font-weight: bold;
-  color: #2d58b7;
+  width:100%;
+  background-color: #EBF0FA;
+  border-bottom: 1px solid;
+  font-size: 80%;
 }
 #nav a {
   text-decoration: none;
@@ -12,42 +16,37 @@
 #nav a:hover {
   text-decoration: underline;
 }
-.menubar {
-  font-size: 80%;
-}
 .menubar ul {
-  padding: 0;
-  margin: 0;
-  list-style: none;
+  list-style: none inside;
 }
 .menubar li {
+  margin: 0;
+  padding: 5px;  
   text-align: center;
-  padding: 5px;
-  list-style: none;
+  text-indent: 0px;
+  list-style-position: inside;
+  list-style:none;
   float: left;
   position: relative;
-  width: 11em;
+  width: 13em;
   cursor: default;
   background-color: #EBF0FA;
 }
 .menubar li ul /* second level lists */ {
   display: none;
   position: absolute; 
-  top: 1em;
   left: 0;
 }
 .menubar li>ul {
+  border-left: 1px solid;
+  border-right: 1px solid;
+  border-bottom: 1px solid;
   padding: 0;
-  margin: 0;
-  top:auto;
+  margin: 5px 0;
   left:auto;
   font-weight: normal;
 }
 .menubar li:hover ul, li.over ul { /* lists nested under hovered list items */
   display: block;
 }
-#content {
-  clear: left;
-  padding-top: 10px;
-  background-color: #ffffff;
-}
+
diff --git a/www/analyzer/menu.html.incl b/www/analyzer/menu.html.incl
index 2c43079..80f9b6e 100644
--- a/www/analyzer/menu.html.incl
+++ b/www/analyzer/menu.html.incl
@@ -1,37 +1,39 @@
-<div id="nav">
+<table width="100%" id="nav" cellspacing=0 cellpadding=0>
+<tr><td>
+<ul style="margin:0; padding:0" class="menubar">
+<li>
+  <a href="/index.html">About</a>
   <ul class="menubar">
-    <li>
-      <a href="/index.html">About</a>
-      <ul>
-        <li><a href="/index.html">About the Analyzer</a></li>
-        <li><a href="http://llvm.org/">LLVM Project</a></li>
-        <li><a href="http://clang.llvm.org/">Clang Project</a></li>
-      </ul>
-    </li>
-    <li>
-      <a href="/filing_bugs.html">Filing Bugs</a>
-    </li>
-    <li>
-      User Manual
-      <ul>
-        <li><a href="/installation.html">Obtaining the Analyzer</a></li>
-        <li><a href="/scan-build.html">Running the Analyzer</tt></a></li>
-        <li><a href="/available_checks.html">Available Checks</a></li>
-        <li><a href="/annotations.html">Source-level Annotations</a></li>
-      </ul>
-    </li>
-    <li>
-      Development
-      <ul>
-        <li><a href="/dev_cxx.html">Analysis support for C++</a></li>
-      </ul>
-    </li>
-    <li>
-      Mailing Lists
-      <ul>
-        <li><a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-dev">cfe-dev</a></li>
-        <li><a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits">cfe-commits</a></li>
-      </ul>
-    </li>
+    <li><a href="/index.html">About the Analyzer</a></li>
+    <li><a href="http://llvm.org/">LLVM Project</a></li>
+    <li><a href="http://clang.llvm.org/">Clang Project</a></li>
   </ul>
-</div>
+</li>
+<li>
+  <a href="/filing_bugs.html">Filing Bugs</a>
+</li>
+<li>
+  User Manual
+  <ul>
+    <li><a href="/installation.html">Obtaining the Analyzer</a></li>
+    <li><a href="/scan-build.html">Running the Analyzer</tt></a></li>
+    <li><a href="/available_checks.html">Available Checks</a></li>
+    <li><a href="/annotations.html">Source-level Annotations</a></li>
+  </ul>
+</li>
+<li>
+  Development
+  <ul>
+    <li><a href="/dev_cxx.html">Analysis support for C++</a></li>
+  </ul>
+</li>
+<li>
+  Mailing Lists
+  <ul>
+    <li><a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-dev">cfe-dev</a></li>
+    <li><a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits">cfe-commits</a></li>
+  </ul>
+</li>
+</ul>
+</td></tr>
+</table>
diff --git a/www/analyzer/scan-build.html b/www/analyzer/scan-build.html
index 884530b..26b9fc1 100644
--- a/www/analyzer/scan-build.html
+++ b/www/analyzer/scan-build.html
@@ -26,8 +26,8 @@
 </head>
 <body>
 
+<div id="page">
 <!--#include virtual="menu.html.incl"-->
-
 <div id="content">
 
 <h1>Running the Analyzer</h1>
@@ -246,6 +246,7 @@
  -->
 
 </div>
+</div>
 </body>
 </html>