diff --git a/courseware.html b/courseware.html
index 04bf2c8907..7dd3131a16 100644
--- a/courseware.html
+++ b/courseware.html
@@ -1,4 +1,5 @@
 <%inherit file="main.html" />
+
 <!-- TODO: http://docs.jquery.com/Plugins/Validation -->
 <script type="text/javascript">
 $(function() {
@@ -21,34 +22,14 @@ $('#hide_acc').click(function() {
 });
 </script>
 
-<div id="coursenav" align=right width=100%>
-  <a href="/book">Textbook</a> 
-  <span class="ui-icon ui-icon-bullet" style="display:inline-block;"></span> 
-  <a href="/courseware"><b>Courseware</b></a> 
-  <span class="ui-icon ui-icon-bullet" style="display:inline-block;"></span> 
-  <a href="/discussion">Discussion</a> 
-  <span class="ui-icon ui-icon-bullet" style="display:inline-block;"></span> 
-  <a href="/wiki">Wiki</a> 
-  <span class="ui-icon ui-icon-bullet" style="display:inline-block;"></span> 
-  <a href="/profile">Profile</a> 
-  <span class="ui-icon ui-icon-bullet" style="display:inline-block;"></span> 
-  <a href="/s/help.html">Help</a> <span class="ui-icon ui-icon-bullet" style="display:inline-block;"></span> 
-  <a href="/logout">Log out</a>
-</div>
+<%include file="navigation.html" />
 
-<div id="bodyContent">
-  <table width=100% cellpadding=0><tr>
-      <td width=276 valign=top>
-        <div id="accordion" style="position:relative; top:-6px; ">
-          ${accordion}
-        </div>
-      </td>
+<div>
+  <div id="accordion" style="position:relative; top:-6px; ">
+    ${accordion}
+  </div>
 
-      <td valign=top>
-        <div>
-          ${content}
-        </div>
-      </td>
-    </tr>
-  </table>
+  <div>
+    ${content}
+  </div>
 </div>
diff --git a/navigation.html b/navigation.html
new file mode 100644
index 0000000000..33c6b9bf8d
--- /dev/null
+++ b/navigation.html
@@ -0,0 +1,9 @@
+<ul id="coursenav">
+  <li><a href="/book">Textbook</a></li>
+  <li><a href="/courseware">Courseware</a></li>
+  <li><a href="/discussion">Discussion</a></li>
+  <li><a href="/wiki">Wiki</a></li>
+  <li><a href="/profile">Profile</a></li>
+  <li><a href="/s/help.html">Help</a></li>
+  <li><a href="/logout">Log out</a></li>
+</ul>