diff --git a/rowers/templates/workout_join_select.html b/rowers/templates/workout_join_select.html
index ece4ea83..50a0d5bb 100644
--- a/rowers/templates/workout_join_select.html
+++ b/rowers/templates/workout_join_select.html
@@ -1,10 +1,10 @@
-{% extends "base.html" %}
+{% extends "newbase.html" %}
 {% load staticfiles %}
 {% load rowerfilters %}
 
 {% block title %}Workouts{% endblock %}
 
-{% block content %}
+{% block main %}
 
 <script>
   function toggle(source) {
@@ -65,103 +65,86 @@
 </script>
 
 
-<div class="grid_12 alpha">
-    {% include "teambuttons.html" with teamid=team.id team=team %}
-</div>
-<div class="grid_12 alpha">
-    <h3>{{ team.name }} Team Workouts</h3>
-</div>
-<div class="grid_12 alpha">
-  <div class="grid_6 alpha">
 
-    {% if team %}
-    <form enctype="multipart/form-data" action="/rowers/workouts-join-select/team/{{ team.id }}/" method="post">
-    {% else %}
-    <form enctype="multipart/form-data" action="/rowers/workouts-join-select/" method="post">
-      {% endif %}
-      <div class="grid_4 alpha">
-      <table>
-        {{ dateform.as_table }}
-      </table>
-      {% csrf_token %}
-      </div>
-  <div class="grid_2 omega">
-    <input name='daterange' class="button green" type="submit" value="Submit">	
-  </div>
-    </form>
-    {% if team %}
-    <form enctype="multipart/form-data" action="/rowers/workouts-join-select/team/{{ team.id }}/" method="post">
-    {% else %}
-    <form enctype="multipart/form-data" action="/rowers/workouts-join-select/" method="post">
-      {% endif %}
-      <div class="grid_4 alpha">
-      <table>
-        {{ modalityform.as_table }}
-      </table>
-      {% csrf_token %}
-      </div>
-  <div class="grid_2 omega">
-    <input name='modalityform' class="button green" type="submit" value="Submit">	
-  </div>
-    </form>
-  </div>
-<div class="grid_5 prefix_1 omega">
-  {% if team %}
-  <form id="searchform" action="/rowers/workouts-join-select/team/{{ team.id }}/{{ startdate|date:"Y-m-d" }}/{{ enddate|date:"Y-m-d" }}"
-        method="get" accept-charset="utf-8">
-    {% else %}
-  <form id="searchform" action="/rowers/workouts-join-select/{{ startdate|date:"Y-m-d" }}/{{ enddate|date:"Y-m-d" }}"
-        method="get" accept-charset="utf-8">
-{% endif %}    
-    <div class="grid_3 prefix_1 alpha">
-      <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>
-    </div>
-  </form>
-</div>
+<h1>{{ team.name }} Join Workouts</h1>
 
-</div>
-
-
-<form enctype="multipart/form-data" action="/rowers/workouts-join" method="post">
-  <div id="workouts_table" class="grid_8 alpha">
-
-
-  {% if workouts %}
+<ul class="main-content">
+  <li class="grid_2 maxheight">
+    <form enctype="multipart/form-data" action="/rowers/workouts-join" method="post">
+      {% if workouts %}
   
-  <input type="checkbox" onClick="toggle(this)" /> Toggle All<br/>
+      <input type="checkbox" onClick="toggle(this)" /> Toggle All<br/>
 
-  <table width="100%" class="listtable">
-    {{ form.as_table }}
-  </table>
+      <table width="100%" class="listtable">
+        {{ form.as_table }}
+      </table>
 
-{% else %}
-<p> No workouts found </p>
-{% endif %}
-</div>
-  <div id="form_settings" class="grid_4 alpha">
-    <p><b>Warning: You are on an experimental part of the site. Use at your own risk.</b></p>
+      {% else %}
+      <p> No workouts found </p>
+      {% endif %}
+  </li>
+  <li class="grid_2">
     <p>Select two or more workouts on the left,
       and press submit</p>
     <table>
       {{ joinparamform.as_table }}
     </table>
-  <div class="grid_1 prefix_2 suffix_1">
     <p>
-  {% csrf_token %}
+      {% csrf_token %}
       <input name='workoutselectform' class="button green" type="submit" value="Submit">
+    </p>
+  </form>
+</li>
+<li class="grid_2">
+  {% if team %}
+  <form enctype="multipart/form-data" action="/rowers/workouts-join-select/team/{{ team.id }}/" method="post">
+    {% else %}
+    <form enctype="multipart/form-data" action="/rowers/workouts-join-select/" method="post">
+      {% endif %}
+      <table>
+        {{ dateform.as_table }}
+      </table>
+      <p>
+        {% csrf_token %}
+        <input name='daterange' class="button green" type="submit" value="Submit">
       </p>
-  </div>
-  <div class="grid_4">
-    <p>You can use the date and search forms above to search through all
-      workouts from this team.</p>
-    </div>
-</div>
-</form>
+    </form>
+</li>
+<li>
+  {% if team %}
+  <form enctype="multipart/form-data" action="/rowers/workouts-join-select/team/{{ team.id }}/" method="post">
+    {% else %}
+    <form enctype="multipart/form-data" action="/rowers/workouts-join-select/" method="post">
+      {% endif %}
+      <table>
+        {{ modalityform.as_table }}
+      </table>
+      <p>
+        {% csrf_token %}
+        <input name='modalityform' class="button green" type="submit" value="Submit">
+      </p>
+    </form>
+</li>
+<li class="grid_2">
+  {% if team %}
+  <form id="searchform" action="/rowers/workouts-join-select/team/{{ team.id }}/{{ startdate|date:"Y-m-d" }}/{{ enddate|date:"Y-m-d" }}"
+        method="get" accept-charset="utf-8">
+    {% else %}
+    <form id="searchform" action="/rowers/workouts-join-select/{{ startdate|date:"Y-m-d" }}/{{ enddate|date:"Y-m-d" }}"
+          method="get" accept-charset="utf-8">
+      {% endif %}    
+      <input class="searchfield" id="searchbox" name="q" type="text" placeholder="Search">
+      <button class="button blue small" type="submit">
+        Search
+      </button>
+  </form>
+</li>
+</ul>
 
 
 {% endblock %}
+
+
+{% block sidebar %}
+{% include 'menu_workouts.html' %}
+{% endblock %}
diff --git a/rowers/views.py b/rowers/views.py
index b9891aa6..97bb0b4c 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -5092,6 +5092,7 @@ def workouts_join_select(request,
                    'dateform':dateform,
                    'startdate':startdate,
                    'enddate':enddate,
+                   'active':'nav-workouts',
                    'team':theteam,
                    'form':form,
                    'joinparamform':joinparamform,