diff --git a/build.py b/build.py
index ddfdfa3..3762049 100755
--- a/build.py
+++ b/build.py
@@ -332,7 +332,7 @@ def BuildList(lst, fs, pagePos, cList):
 		elif (pagePos > curPos) and (pagePos < nextPos):
 			content = content + BuildList(cList[curPos], fs, pagePos, cList)
 
-	content = content + '</ul>\n'
+	content = content + '\n</ul>\n'
 
 	return content
 
@@ -396,10 +396,10 @@ def BuildOnePageSidebar(fs):
 def CreateLinkSidebar(fs, pos, childList):
 
 	# Build the list recursively from the top level nodes
-	#content = BuildList(FindTopLevelNodes(fs), fs, pos, childList)
 	content = BuildList(FindTopLevelNodes(fs), fs, pos, childList)
 	# Shove the TOC link and one file link at the top...
-	content = content[:7] + '<dt><dt><a href="/toc/">Table of Contents</a></dt><dd></dd>\n' + content[7:]
+	active = ' class=active' if pos<0 else ''
+	content = content.replace('<ul>','<ul><li' + active + '><a href="/toc/">Table of Contents</a></li>\n',1)
 
 	return content
 
diff --git a/onepage-template.txt b/onepage-template.txt
index 215e536..640d83c 100644
--- a/onepage-template.txt
+++ b/onepage-template.txt
@@ -23,11 +23,9 @@
 			</div> <!-- tree -->
 
 			<div class="span12" id="content">
-				<div id="content-main">
 
-					{{ content }}
+				{{ content }}
 
-				</div> <!-- content-main -->
 			</div> <!-- content -->
 		</div> <!-- row-fluid -->
 	</div> <!-- container-fluid -->
diff --git a/page-template.txt b/page-template.txt
index 06dd49d..465ed98 100644
--- a/page-template.txt
+++ b/page-template.txt
@@ -51,20 +51,16 @@
 			<div class="span12" id="content">
 
 				{% breadcrumbs %}
+				{% githubedit %}
 
-				<div id="content-main">
+				<h1 class="title">{{ page.title }}</h1>
 
-					{% githubedit %}
+				{{ content }}
 
-					<h1 class="title">{{ page.title }}</h1>
+				<div class="clearer"></div>
 
-					{{ content }}
+				{% prevnext %}
 
-					<div class="clearer"></div>
-
-					{% prevnext %}
-
-				</div> <!-- content-main -->
 			</div> <!-- content -->
 		</div> <!-- row-fluid -->
 	</div> <!-- container-fluid -->
diff --git a/source/css/app.css b/source/css/app.css
index 9da882f..2acd072 100644
--- a/source/css/app.css
+++ b/source/css/app.css
@@ -54,11 +54,11 @@ ul.inside li, ol.inside li {
 #tree a {
   display: inline !important;
   font-size: 0.88em;
-  font-weight: normal;
+  /*font-weight: normal;*/
   line-height: 2em;
   color: #E4E4E4;
   border-bottom: 1px solid transparent;
-  padding-bottom: .1ex;
+  /*padding-bottom: .1ex;*/
 }
 
 #tree a:hover {
@@ -68,8 +68,7 @@ ul.inside li, ol.inside li {
 
 #tree .active > a {
   display: inline;
-  color: #da0808;
-  border-bottom: 1px solid #FFF;
+  color: #FF8080;
 }
 
 #content {
@@ -78,11 +77,6 @@ ul.inside li, ol.inside li {
   line-height: 2em;
 }
 
-#content-main {
-  padding-top: 1ex;
-  padding-left: .5em;
-}
-
 #content h1,
 #content h2,
 #content h3,
@@ -98,7 +92,7 @@ ul.inside li, ol.inside li {
 	clear:both;
 }
 
-#content h1.title {
+#content h1 {
   font-size: 1.8em;
   margin: 0 0 2ex 0;
   padding-bottom: .8ex;
@@ -367,33 +361,11 @@ samp:after {
   content:"\AB";
 }
 
-#subtopics ul {
-  font-weight:bold;
-}
-
 #content dfn {
   font-weight: bold;
   font-style: normal;
 }
 
-#content img.right {
-  margin: 0 0 1em 1em;
-  float:right;
-  clear:right;
-}
-
-#content img.left {
-  margin:0 1em 1em 0;
-  float:left;
-  clear:left;
-}
-
-#content img.center {
-  display: block;
-  margin:1em auto 1em auto;
-	clear: both;
-}
-
 #content img.mini {
   width:200px;
 }
@@ -415,12 +387,6 @@ samp:after {
   margin-bottom: 1em;
   border-style: solid;
   border-width: 1px 1px 1px 8px;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
 }
 
 #content code {
diff --git a/source/css/luadoc.css b/source/css/luadoc.css
index b8a6777..dec6a89 100644
--- a/source/css/luadoc.css
+++ b/source/css/luadoc.css
@@ -31,7 +31,7 @@ div.luafooter              { text-align:center; font-size:80%; color: #888; marg
 #luaref table.classmembers th      { text-align:left; border-bottom:1px solid black; padding-top:1em; }
 #luaref table.classmembers td.def  { text-align:right; padding-right:.5em;  white-space: nowrap; font-family:mono; }
 #luaref table.classmembers td.decl { text-align:left; padding-left:.5em; white-space: nowrap; font-family:mono;}
-#luaref table.classmembers td.doc  { text-align:left; padding-left:.6em; line-height: 1.2em; font-size:85%; }
+#luaref table.classmembers td.doc  { text-align:left; padding-left:.6em; font-size:85%; }
 #luaref table.classmembers td.doc div.dox { background-color:#eee; padding: .1em 1em; }
 #luaref table.classmembers td.doc p { margin: .5em 0; font-size:110%; }
 #luaref table.classmembers td.doc p.para-returns {font-size:inherit; }