diff --git a/rowers/models.py b/rowers/models.py
index a5e38523..44d0380f 100644
--- a/rowers/models.py
+++ b/rowers/models.py
@@ -678,6 +678,17 @@ class TrainingTarget(models.Model):
         default=timezone.now()+datetime.timedelta(days=182))
     notes = models.TextField(max_length=300,blank=True)
 
+class TrainingTargetForm(ModelForm):
+    class Meta:
+        model = TrainingTarget
+        fields = ['name','date','notes']
+
+	widgets = {
+	    'date': SelectDateWidget(
+                years=range(
+                    timezone.now().year-1,timezone.now().year+1)),
+	    }
+
 # SportTracks has a TrainingGoal like this
 #class TrainingGoal(models.Model):
 #    rower = models.ForeignKey(Rower)
@@ -701,6 +712,21 @@ class TrainingPlan(models.Model):
     enddate = models.DateField(
         default=timezone.now()+datetime.timedelta(days=182))
 
+class TrainingPlanForm(ModelForm):
+    class Meta:
+        model = TrainingPlan
+        fields = ['name','target','startdate','enddate']
+
+	widgets = {
+	    'startdate': SelectDateWidget(
+                years=range(
+                    timezone.now().year-1,timezone.now().year+1)),
+	    'enddate': SelectDateWidget(
+                years=range(
+                    timezone.now().year-1,timezone.now().year+1)),
+	    }
+
+    
 cycletypechoices = (
     ('filler','System Defined'),
     ('userdefined','User Defined')
diff --git a/rowers/plannedsessions.py b/rowers/plannedsessions.py
index 438e2e44..3de50ad2 100644
--- a/rowers/plannedsessions.py
+++ b/rowers/plannedsessions.py
@@ -82,14 +82,24 @@ def is_session_complete(ps):
 def rank_results(ps):
     return 1
 
-def add_team(t,ps):
+def add_team_session(t,ps):
     ps.team.add(t)
     ps.save()
 
     return 1
 
-def add_rower(r,ps):
+def add_rower_session(r,ps):
     ps.rower.add(r)
     ps.save()
     
     return 1
+
+def remove_team_session(t,ps):
+    ps.team.remove(t)
+
+    return 1
+
+def remove_rower_session(r,ps):
+    ps.rower.remove(r)
+
+    return 1
diff --git a/templates/base.html b/templates/base.html
index 21de4904..c1b47ac0 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,42 +1,49 @@
 {% extends "basebase.html" %}
 {% block filters %}
-  {% load rowerfilters %}
+{% load rowerfilters %}
+{% endblock %}
+
+{% block plans %}
+{% if user.rower.rowerplan == 'pro' or user.rower.rowerplan == 'coach' %}
+<p><a class="button gray small" href="/rowers/sessions/">Plans</a></p>
+{% else %}
+<p><a class="button gray small" href="/rowers/promembership/">Plans</a></p>
+{% endif %}
 {% endblock %}
 
 
-
 {% block teams %}
-          {% if user.is_authenticated and user|has_teams %}
-          <div class="grid_1 alpha dropdown">
-              <button class="grid_1 alpha button gray small dropbtn">
-                Teams 
-              </button>
-              <div class="dropdown-content">
-                <a class="button gray small" href="/rowers/me/teams/">Manage Teams</a>
-                {% if user|is_manager %}
-                <a class="button gray small" href="/rowers/workout/upload/team/">Upload Team Member Workout</a>
-                {% endif %}
-            {% for t in user|user_teams %}
-            <a class="button gray small" href="/rowers/list-workouts/team/{{ t.id }}/">{{ t.name }}</a>
-            {% endfor %}
-              </div>
-            </div>
-          <span class="tooltiptext">See recent workouts for your team</span>
-          {% elif user.is_authenticated and user.rower.team.all %}
-          <div class="grid_1 alpha dropdown">
-              <button class="grid_1 alpha button gray small dropbtn">
-                Teams
-              </button>
-              <div class="dropdown-content">
-            {% for t in user.rower.team.all %}
-            <a class="button gray small" href="/rowers/list-workouts/team/{{ t.id }}/">{{ t.name }}</a>
-            {% endfor %}
-              </div>
-            </div>
-          <span class="tooltiptext">See recent workouts for your team</span>
-          {% else %}
-	  <p>&nbsp;</p>
-	  {% endif %}
+{% if user.is_authenticated and user|has_teams %}
+<div class="grid_1 alpha dropdown">
+  <button class="grid_1 alpha button gray small dropbtn">
+    Teams 
+  </button>
+  <div class="dropdown-content">
+    <a class="button gray small" href="/rowers/me/teams/">Manage Teams</a>
+    {% if user|is_manager %}
+    <a class="button gray small" href="/rowers/workout/upload/team/">Upload Team Member Workout</a>
+    {% endif %}
+    {% for t in user|user_teams %}
+    <a class="button gray small" href="/rowers/list-workouts/team/{{ t.id }}/">{{ t.name }}</a>
+    {% endfor %}
+  </div>
+</div>
+<span class="tooltiptext">See recent workouts for your team</span>
+{% elif user.is_authenticated and user.rower.team.all %}
+<div class="grid_1 alpha dropdown">
+  <button class="grid_1 alpha button gray small dropbtn">
+    Teams
+  </button>
+  <div class="dropdown-content">
+    {% for t in user.rower.team.all %}
+    <a class="button gray small" href="/rowers/list-workouts/team/{{ t.id }}/">{{ t.name }}</a>
+    {% endfor %}
+  </div>
+</div>
+<span class="tooltiptext">See recent workouts for your team</span>
+{% else %}
+<p>&nbsp;</p>
+{% endif %}
 {% endblock %}
 
 {% block content %}
diff --git a/templates/basebase.html b/templates/basebase.html
index 2a97d27c..662f60c3 100644
--- a/templates/basebase.html
+++ b/templates/basebase.html
@@ -201,6 +201,14 @@
           {% block teams %}
           {% endblock %}
         </div>
+        <div class="grid_1 tooltip">
+          {% block plans %}
+          {% endblock %}
+        </div>
+        <div class="grid_1 tooltip">
+          {% block challenges %}
+          {% endblock %}
+        </div>
       </div>