diff --git a/rowers/templates/list_courses.html b/rowers/templates/list_courses.html
index 559a554a..5648405d 100644
--- a/rowers/templates/list_courses.html
+++ b/rowers/templates/list_courses.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "newbase.html" %}
 {% load staticfiles %}
 {% load rowerfilters %}
 
@@ -8,7 +8,7 @@
 
 {% endblock %}
 
-{% block content %}
+{% block main %}
 <style>
   #mypointer {
   cursor: pointer;
@@ -17,12 +17,12 @@
 
 
 
-<div class="grid_12">
+<h1>Courses</h1>
 
-  <div id="courses_table" class="grid_8 alpha">
-    <h1>Courses</h1>
-    
+<ul class="main-content">
+  <li class="grid_3">
     {% if courses %}
+    <p>
     <table width="100%" class="listtable shortpadded">
       <thead>
         <tr>
@@ -51,100 +51,90 @@
         {% endfor %}
       </tbody>
     </table>
+    </p>
     {% else %}
     <p> No courses found </p>
     {% endif %}
-
-  <div class="grid_6 alpha">
-    <div class="grid_2 prefix_1 alpha">
-      <a class="button small green" href="/rowers/courses/upload">Add Courses</a>
-    </div>
-    <p>&nbsp;</p>
-    <form id="searchform" action="/rowers/list-courses/"
-          method="get" accept-charset="utf-8">
-      <div class="grid_3 prefix_1 alpha">
+  </li>
+  <li>
+    <p>
+      <form id="searchform" action="/rowers/list-courses/"
+            method="get" accept-charset="utf-8">
         <input class="searchfield" id="searchbox" name="q" type="text" placeholder="Search">
-      </div>
-      <div class="grid_1 omega">
         <button class="button blue small" type="submit">
           Search
         </button>
+      </form>
+    </p>
+    <p>
+      <a class="button small green" href="/rowers/courses/upload">Add Courses</a>
+    </p>
+    {% if announcements %}
+    <h3>What's New?</h3>
+    {% for a in announcements %}
+    <div class="site-announcement-box">
+      <div class="site-announcement">
+        <i>{{ a.created }}:</i>
+        {{ a.announcement|urlize }}
       </div>
-    </form>
-  </div>
-  <div class="grid_2 omega">
-    &nbsp;
-  </div>
-
-
-  </div>
-  
-  
-  
-  <div class="grid_4 omega">
-    <div class="grid_4" id="announcements">
-      {% if announcements %}
-      <h3>What's New?</h3>
-      {% for a in announcements %}
-      <div class="site-announcement-box">
-        <div class="site-announcement">
-          <i>{{ a.created }}:</i>
-          {{ a.announcement|urlize }}
-        </div>
-      </div>
-      {% endfor %}
-      <p>&nbsp;</p>
-      {% endif %}
     </div>
-    <div class="grid_4" id="about">
-      <h2>How-to</h2>
-      <p>
-        Courses allow you to mark the start & finish lines of your
-        test pieces and measure the time spent on the course (as opposed
-        to the total duration of a workout). This allows you to row and rank
-        marked courses.
+    {% endfor %}
+    <p>&nbsp;</p>
+    {% endif %}
+    
+  </li>
 
-        To create a course, you use <a href="earth.google.com">Google Earth</a>
-        to mark the start and finish lines using polygons. The process is identical
-        to creating custom courses for the
-        <a href="http://performancephones.com/crewnerd/">CrewNerd</a>
-        app.      
+  <li class="grid_4">
+    <h2>How-to</h2>
+    <p>
+      Courses allow you to mark the start & finish lines of your
+      test pieces and measure the time spent on the course (as opposed
+      to the total duration of a workout). This allows you to row and rank
+      marked courses.
+      
+      To create a course, you use <a href="earth.google.com">Google Earth</a>
+      to mark the start and finish lines using polygons. The process is identical
+      to creating custom courses for the
+      <a href="http://performancephones.com/crewnerd/">CrewNerd</a>
+      app.      
+      
+    </p>
 
-      </p>
+    <p>CrewNerd has published a nice video tutorial of the process.
+      <a href="https://youtu.be/whhWFmMJbhM">Click here</a> to see the video. The part
+      we're interested in starts at 2:05.
+    </p>
+    
+    <p>
+      In addition to start and finish areas, on rowsandall.com you can add additional
+      polygons to mark areas that you must pass (in that order). This allows for
+      courses with turns around buoys, respecting buoy lines, or respecting traffic
+      patterns on rivers and lakes. 
+    </p>
+    
+    <p>
+      <ul>
+        <li>Open Google Earth</li>
+        <li>Create a folder "Courses" under "Temporary Places" or under "My Places"</li>
+        <li>Create a folder for each Course under "Courses", and for each course:</li>
+        <li>Create Start polygon</li>
+        <li>Optional: Create First "must row through" polygon</li>
+        <li>Optional: Create subsequent "must row through" polygons</li>
+        <li>Create Finish polygon</li>
+        <li>Save "Courses" as KML file</li>
+        <li>Upload the file to rowsandall.com using the "Add Courses" button</li>
+      </ul>
+    </p>
 
-      <p>CrewNerd has published a nice video tutorial of the process.
-        <a href="https://youtu.be/whhWFmMJbhM">Click here</a> to see the video. The part
-        we're interested in starts at 2:05.
-      </p>
+    <p>You are allowed to have multiple courses in one KML file.
+      Your CrewNerd "courses.kml" file works out of the box</p>
+    
+    <p>The site doesn't test for duplicate courses.</p>
 
-      <p>
-        In addition to start and finish areas, on rowsandall.com you can add additional
-        polygons to mark areas that you must pass (in that order). This allows for
-        courses with turns around buoys, respecting buoy lines, or respecting traffic
-        patterns on rivers and lakes. 
-      </p>
-
-      <p>
-        <ul>
-          <li>Open Google Earth</li>
-          <li>Create a folder "Courses" under "Temporary Places" or under "My Places"</li>
-          <li>Create a folder for each Course under "Courses", and for each course:</li>
-          <li>Create Start polygon</li>
-          <li>Optional: Create First "must row through" polygon</li>
-          <li>Optional: Create subsequent "must row through" polygons</li>
-          <li>Create Finish polygon</li>
-          <li>Save "Courses" as KML file</li>
-          <li>Upload the file to rowsandall.com using the "Add Courses" button</li>
-        </ul>
-      </p>
-
-      <p>You are allowed to have multiple courses in one KML file.
-        Your CrewNerd "courses.kml" file works out of the box</p>
-
-      <p>The site doesn't test for duplicate courses.</p>
-    </div>
-  </div>
-
-
-</div>
+  </li>
+</ul>
   {% endblock %}
+
+{% block sidebar %}
+{% include 'menu_racing.html' %}
+{% endblock %}
diff --git a/rowers/templates/race_submit.html b/rowers/templates/race_submit.html
index 5b148760..c4fd6468 100644
--- a/rowers/templates/race_submit.html
+++ b/rowers/templates/race_submit.html
@@ -19,8 +19,8 @@
 {% block main %}
 <h1>Submit Your Result for {{ race.name }}</h1>
 
-<ul>
-  <li class="grid_2">
+<ul class="main-content">
+  <li class="grid_4">
     <form id="race_submit_form" 
           method="post">
       <p>Select one of the following workouts that you rowed within the race window</p>
diff --git a/rowers/views.py b/rowers/views.py
index 345f8e42..5ca1d336 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -6323,6 +6323,7 @@ def courses_view(request):
     
     return render(request,'list_courses.html',
                   {'courses':courses,
+                   'active':'nav-racing',
                    'rower':r,
                    })
 
@@ -14312,6 +14313,7 @@ def virtualevent_submit_result_view(request,id=0):
                   {
                       'race':race,
                       'workouts':ws,
+                      'active':'nav-racing',
                       'rower':r,
                       'w_form':w_form,
                       })