diff --git a/rowers/templates/plannedsessionteamcreate.html b/rowers/templates/plannedsessionteamcreate.html
index 8d1e17df..b35ee0ac 100644
--- a/rowers/templates/plannedsessionteamcreate.html
+++ b/rowers/templates/plannedsessionteamcreate.html
@@ -7,7 +7,7 @@
 {% block main %}
 <h1>Create Team Session</h1>
 
-<form enctype="multipart/form-data" action="{{ formloc }}" method="post">
+<form enctype="multipart/form-data" action="" method="post">
   {% if form.errors %}
   <p style="color: red;">
     Please correct the error{{ form.errors|pluralize }} below.
diff --git a/rowers/templates/plannedsessionteamedit.html b/rowers/templates/plannedsessionteamedit.html
index 016a13c5..3e36dfe5 100644
--- a/rowers/templates/plannedsessionteamedit.html
+++ b/rowers/templates/plannedsessionteamedit.html
@@ -1,151 +1,106 @@
-{% extends "base.html" %}
+{% extends "newbase.html" %}
 {% load staticfiles %}
 {% load rowerfilters %}
 
 {% block title %}New Planned Session{% endblock %}
 
-{% block content %}
-<div class="grid_12 alpha">
-  {% include "planningbuttons.html" %}
-</div>
+{% block main %}
+<h1>Edit Team Session</h1>
+<form enctype="multipart/form-data" action="" method="post">
+  {% if form.errors %}
+  <p style="color: red;">
+    Please correct the error{{ form.errors|pluralize }} below.
+  </p>
+  {% endif %}
+  {% csrf_token %}
 
-<div class="grid_12 alpha">
-  <div id="left" class="grid_6 alpha">
-    <h1>Edit Team Session</h1>
-  </div>
-  <div id="timeperiod" class="grid_2 dropdown">
-    <button class="grid_2 alpha button gray small dropbtn">Select Time Period  ({{ timeperiod|verbosetimeperiod }})</button>
-    <div class="dropdown-content">
-    <a class="button gray small alpha"
-       href="/rowers/sessions/create/today/rower/{{ rower.id }}">
-      Today
-    </a>
-    <a class="button gray small alpha"
-       href="/rowers/sessions/create/thisweek/rower/{{ rower.id }}">
-      This Week
-    </a>
-    <a class="button gray small alpha"
-       href="/rowers/sessions/create/thismonth/rower/{{ rower.id }}">
-      This Month
-    </a>
-    <a class="button gray small alpha"
-       href="/rowers/sessions/create/lastweek/rower/{{ rower.id }}">
-      Last Week
-    </a>
-    <a class="button gray small alpha"
-       href="/rowers/sessions/create/lastmonth/rower/{{ rower.id }}">
-      Last Month
-    </a>
-    <a class="button gray small alpha"
-       href="/rowers/sessions/create/nextweek/rower/{{ rower.id }}">
-      Next Week
-    </a>
-    <a class="button gray small alpha"
-       href="/rowers/sessions/create/nextmonth/rower/{{ rower.id }}">
-      Next Month
-    </a>
-    </div>
-  </div>
-</div>
-
-<div class="grid_12 alpha">
-    <form enctype="multipart/form-data" action="{{ formloc }}" method="post">
-      {% if form.errors %}
-      <p style="color: red;">
-        Please correct the error{{ form.errors|pluralize }} below.
-      </p>
-      {% endif %}
-      {% csrf_token %}
-      
-      <div id="right" class="grid_6 alpha">
-    <h1>Select Team</h1>
-    <p>
-      Selecting a team assigns this session to all members of the team.
-      Unselecting a team does not remove rowers
-      who are already assigned to this session. Use the Rowers selection for that. 
+  <ul class="main-content">
+    <li class="grid_2">
+      <h1>Select Team</h1>
+      <p>
+        Selecting a team assigns this session to all members of the team.
+        Unselecting a team does not remove rowers
+        who are already assigned to this session. Use the Rowers selection for that. 
     </p><p>
-    <table>
-     {{ teamform.as_table }} 
-    </table></p>
-    <h1>Select Rowers</h1>
-    <p>
-      <table>
-        {{ rowersform.as_table }}
-      </table>
+        <table>
+          {{ teamform.as_table }} 
+      </table></p>
+      <h1>Select Rowers</h1>
+      <p>
+        <table>
+          {{ rowersform.as_table }}
+        </table>
       </p>
-    {% if plannedsessions %}
-    <h1>Team Plan Sessions</h1>
-    <p>
-    <table class="listtable shortpadded" width="80%">
-      <thead>
-        <tr>
-          <th>After</th>
-          <th>Before</th>
-          <th>Name</th>
-          <th>Value</th>
-          <th>&nbsp;</th>
-          <th>Edit</th>
-          <th>Clone</th>
-          <th>Delete</th>
-        </tr>
-      </thead>
-      <tbody>
-        {% for ps in plannedsessions %}
-        <tr>
-          <td> {{ ps.startdate|date:"Y-m-d" }} </td>
-          <td> {{ ps.enddate|date:"Y-m-d" }} </td>
-          <td>
-            {% if ps.name != '' %}
-            <a class="small"
-               href="/rowers/sessions/{{ ps.id }}">{{ ps.name }}</a>
-            {% else %}
-            <a class="small"
-               href="/rowers/sessions/{{ ps.id }}">Unnamed Session</a>
-            {% endif %}
-          </td>
-          <td> {{ ps.sessionvalue }} </td>
-          <td> {{ ps.sessionunit }} </td>
-          <td>
-            <a class="small" href="/rowers/sessions/{{ ps.id }}/edit">Edit</a>
-          </td>
-          <td>
-            <a class="small" href="/rowers/sessions/{{ ps.id }}/clone">Clone</a>
-          </td>
+      {% if plannedsessions %}
+      <h1>Team Plan Sessions</h1>
+      <p>
+        <table class="listtable shortpadded" width="80%">
+          <thead>
+            <tr>
+              <th>After</th>
+              <th>Before</th>
+              <th>Name</th>
+              <th>Value</th>
+              <th>&nbsp;</th>
+              <th>Edit</th>
+              <th>Clone</th>
+              <th>Delete</th>
+            </tr>
+          </thead>
+          <tbody>
+            {% for ps in plannedsessions %}
+            <tr>
+              <td> {{ ps.startdate|date:"Y-m-d" }} </td>
+              <td> {{ ps.enddate|date:"Y-m-d" }} </td>
+              <td>
+                {% if ps.name != '' %}
+                <a class="small"
+                   href="/rowers/sessions/{{ ps.id }}">{{ ps.name }}</a>
+                {% else %}
+                <a class="small"
+                   href="/rowers/sessions/{{ ps.id }}">Unnamed Session</a>
+                {% endif %}
+              </td>
+              <td> {{ ps.sessionvalue }} </td>
+              <td> {{ ps.sessionunit }} </td>
+              <td>
+                <a class="small" href="/rowers/sessions/{{ ps.id }}/edit">Edit</a>
+              </td>
+              <td>
+                <a class="small" href="/rowers/sessions/{{ ps.id }}/clone">Clone</a>
+              </td>
+              
+              <td>
+                <a class="small" href="/rowers/sessions/{{ ps.id }}/deleteconfirm">Delete</a>
+              </td>
+            </tr>
+            {% endfor %}
+          </tbody>
+        </table>
+      </p>      
+      {% endif %}
+    </li>
+    <li class="grid_2">
 
-          <td>
-            <a class="small" href="/rowers/sessions/{{ ps.id }}/deleteconfirm">Delete</a>
-          </td>
-        </tr>
-        {% endfor %}
-      </tbody>
-    </table>
-    </p>      
-    {% endif %}
-  </div>
-  
-
-
-  <div class="grid_6 omega">
-    <h1>Session {{ plannedsession.name }}</h1>
+      <h1>Session {{ plannedsession.name }}</h1>
       <table>
         {{ form.as_table }}
       </table>
-      <div class="grid_1 prefix_2 alpha">
-        <a class="red button small" href="/rowers/sessions/{{ plannedsession.id }}/deleteconfirm">Delete</a>
-      </div>
-      <div class="grid_1">
-        <a class="gray button small" href="/rowers/sessions/{{ plannedsession.id }}/clone">Clone</a>
-      </div>
-      <div id="formbutton" class="grid_1 suffix_1 omega">
+      <p>
+        <a href="/rowers/sessions/{{ plannedsession.id }}/deleteconfirm">Delete</a>
+      </p>
+      <p>
+        <a href="/rowers/sessions/{{ plannedsession.id }}/clone">Clone</a>
+      </p>
+      <p>
         <input class="button green" type="submit" value="Save">
-      </div>
-    </form>
-    <div class="grid_6" id="id_guidance">
+      </p>
+    <div id="id_guidance" class="padded">
 
     </div>
-    </div>
-
-</div>
+    </li>
+  </ul>
+</form>
 {% endblock %}
 
 {% block scripts %}
@@ -258,3 +213,7 @@
 
 </script>
 {% endblock %}
+
+{% block sidebar %}
+{% include 'menu_plan.html' %}
+{% endblock %}
diff --git a/rowers/views.py b/rowers/views.py
index fbd9ba5c..22cdbcd7 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -13989,6 +13989,8 @@ def plannedsession_teamcreate_view(request,timeperiod='thisweek',
 def plannedsession_teamedit_view(request,timeperiod='thisweek',
                                    sessionid=0):
 
+    r = getrequestrower(request)
+    
     try:
         ps = PlannedSession.objects.get(id=sessionid)
     except PlannedSession.DoesNotExist:
@@ -14098,6 +14100,8 @@ def plannedsession_teamedit_view(request,timeperiod='thisweek',
                   {
                       'plannedsession':ps,
                       'plan':trainingplan,
+                      'rower':r,
+                      'active':'nav-plan',
                       'teams':get_my_teams(request.user),
                       'form':sessioncreateform,
                       'teamform':sessionteamselectform,