diff --git a/rowers/templates/menu_workouts.html b/rowers/templates/menu_workouts.html
index 170bdea6..e3768073 100644
--- a/rowers/templates/menu_workouts.html
+++ b/rowers/templates/menu_workouts.html
@@ -48,7 +48,13 @@
     <ul>
       {% for member in user|team_members %}
       <a href="/rowers/u/{{ member.id }}/list-workouts/{{ startdate|date:"Y-m-d" }}/{{ enddate|date:"Y-m-d" }}">
-        <i class="fas fa-user fa-fw"></i>&nbsp;{{ member.first_name }} {{ member.last_name }}
+        <i class="fas fa-user fa-fw"></i>
+        {% if member == rower.user %}
+        &bull;
+        {% else %}
+        &nbsp;
+        {% endif %}
+        {{ member.first_name }} {{ member.last_name }}
       </a>
       {% endfor %}
     </ul>
diff --git a/rowers/templates/race_submit.html b/rowers/templates/race_submit.html
index 4b4b397b..5b148760 100644
--- a/rowers/templates/race_submit.html
+++ b/rowers/templates/race_submit.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "newbase.html" %}
 {% load staticfiles %}
 {% load rowerfilters %}
 
@@ -16,36 +16,33 @@
 {% endblock %}
 
 
-{% block content %}
-<div class="grid_12 alpha">
-  <div class="grid_6 alpha">
-    <h1>Submit Your Result for {{ race.name }}</h1>
-  </div>
+{% block main %}
+<h1>Submit Your Result for {{ race.name }}</h1>
 
-</div>
-
-<form id="race_submit_form" 
-      method="post">
-<div class="grid_12 alpha">
-    <p>Select one of the following workouts that you rowed within the race window</p>
-    <table width="100%">
-      <tr>
-        {% for field in w_form.hidden_fields %}
-        {{ field }}
-        {% endfor %}
-        {% for field in w_form.visible_fields %}
-        <td>
-          {{ field.label }}
+<ul>
+  <li class="grid_2">
+    <form id="race_submit_form" 
+          method="post">
+      <p>Select one of the following workouts that you rowed within the race window</p>
+      <table width="100%">
+        <tr>
+          {% for field in w_form.hidden_fields %}
           {{ field }}
-        </td>
-      {% endfor %}
-      </tr>
-    </table>
-</div>
-<div class="grid_2 prefix_2 suffix_8">
-  {% csrf_token %}
-  <input class="button green" type="submit" value="Submit">
-</div>
+        {% endfor %}
+          {% for field in w_form.visible_fields %}
+          <td>
+            {{ field.label }}
+            {{ field }}
+          </td>
+          {% endfor %}
+        </tr>
+      </table>
+      <p>
+        {% csrf_token %}
+        <input class="button green" type="submit" value="Submit">
+      </p>
+  </li>
+</ul>
 
 
 </form>
@@ -53,3 +50,7 @@
 
 {% block scripts %}
 {% endblock %}
+
+{% block sidebar %}
+{% include 'menu_racing.html' %}
+{% endblock %}