diff --git a/rowers/templates/planningbuttons.html b/rowers/templates/planningbuttons.html
index 324efd56..57113b33 100644
--- a/rowers/templates/planningbuttons.html
+++ b/rowers/templates/planningbuttons.html
@@ -10,7 +10,9 @@
         {% else %}
         <a class="button gray small" href="/rowers/sessions">Sessions Overview</a>
         {% endif %}
+        {% if plan %}
         <a class="button gray small" href="/rowers/plan/{{ plan.id }}">Plan Overview</a>
+        {% endif %}
       </div>
   </div>
 </div>
diff --git a/rowers/views.py b/rowers/views.py
index 90acf0b8..88dc3293 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -12465,8 +12465,18 @@ def plannedsession_multiclone_view(
 
     dateshiftform = SessionDateShiftForm()
 
+    try:
+        trainingplan = TrainingPlan.objects.filter(
+            startdate__lte =  startdate,
+            rower = r,
+            enddate__gte =  enddate)[0]
+    except IndexError:
+        trainingplan = None
+
+
     return render(request, 'plannedsessions_multiclone_select.html',
                   {'plannedsessions':sps,
+                   'plan':trainingplan,
                    'dateform':dateform,
                    'startdate':startdate,
                    'enddate':enddate,
@@ -12581,10 +12591,19 @@ def plannedsession_create_view(request,timeperiod='thisweek',rowerid=0):
         sessioncreateform = PlannedSessionForm(initial=forminitial)
 
     sps = get_sessions(r,startdate=startdate,enddate=enddate)
+    try:
+        trainingplan = TrainingPlan.objects.filter(
+            startdate__lte =  startdate,
+            rower = r,
+            enddate__gte =  enddate)[0]
+    except IndexError:
+        trainingplan = None
+
         
     return render(request,'plannedsessioncreate.html',
                   {
                       'teams':get_my_teams(request.user),
+                      'plan':trainingplan,
                       'form':sessioncreateform,
                       'plannedsessions':sps,
                       'rower':r,
@@ -12601,6 +12620,14 @@ def plannedsession_multicreate_view(request,timeperiod='thisweek',
     r = getrequestrower(request,rowerid=rowerid)
 
     startdate,enddate = get_dates_timeperiod(timeperiod)
+    try:
+        trainingplan = TrainingPlan.objects.filter(
+            startdate__lte =  startdate,
+            rower = r,
+            enddate__gte =  enddate)[0]
+    except IndexError:
+        trainingplan = None
+
     sps = get_sessions(r,startdate=startdate,enddate=enddate)
 
     m = Rower.objects.get(user=request.user)
@@ -12675,6 +12702,7 @@ def plannedsession_multicreate_view(request,timeperiod='thisweek',
     context = {
         'ps_formset':ps_formset,
         'rower':r,
+        'plan':trainingplan,
         'timeperiod':timeperiod,
         'teams':get_my_teams(request.user),
         'extrasessions': extrasessions+1
@@ -12700,6 +12728,14 @@ def plannedsession_teamcreate_view(request,timeperiod='thisweek',
 
     startdate,enddate = get_dates_timeperiod(timeperiod)
 
+    try:
+        trainingplan = TrainingPlan.objects.filter(
+            startdate__lte =  startdate,
+            rower = r,
+            enddate__gte =  enddate)[0]
+    except IndexError:
+        trainingplan = None
+
     sps = []
     for team in teams:
         res = get_sessions_manager(request.user,startdate=startdate,enddate=enddate)
@@ -12772,6 +12808,7 @@ def plannedsession_teamcreate_view(request,timeperiod='thisweek',
     return render(request,'plannedsessionteamcreate.html',
                   {
                       'teams':get_my_teams(request.user),
+                      'plan':trainingplan,
                       'form':sessioncreateform,
                       'teamform':sessionteamselectform,
                       'timeperiod':timeperiod,
@@ -12799,6 +12836,14 @@ def plannedsession_teamedit_view(request,timeperiod='thisweek',
 
     startdate,enddate = get_dates_timeperiod(timeperiod)
 
+    try:
+        trainingplan = TrainingPlan.objects.filter(
+            startdate__lte =  startdate,
+            rower = r,
+            enddate__gte =  enddate)[0]
+    except IndexError:
+        trainingplan = None
+
     sps = []
     rowers = []
     for team in teams:
@@ -12885,6 +12930,7 @@ def plannedsession_teamedit_view(request,timeperiod='thisweek',
     return render(request,'plannedsessionteamedit.html',
                   {
                       'plannedsession':ps,
+                      'plan':trainingplan,
                       'teams':get_my_teams(request.user),
                       'form':sessioncreateform,
                       'teamform':sessionteamselectform,
@@ -12900,6 +12946,8 @@ def plannedsessions_coach_view(request,timeperiod='thisweek',
 
     startdate,enddate = get_dates_timeperiod(timeperiod)
 
+    trainingplan = None
+
     if teamid != 0:
         try:
             theteam = Team.objects.get(id=teamid)
@@ -12949,6 +12997,7 @@ def plannedsessions_coach_view(request,timeperiod='thisweek',
                   {
                       'myteams':myteams,
                       'plannedsessions':sps,
+                      'plan':trainingplan,
                       'statusdict':statusdict,
                       'timeperiod':timeperiod,
                       'rowers':rowers,
@@ -12968,6 +13017,7 @@ def plannedsessions_view(request,timeperiod='thisweek',rowerid=0):
     try:
         trainingplan = TrainingPlan.objects.filter(
             startdate__lte =  startdate,
+            rower = r,
             enddate__gte =  enddate)[0]
     except IndexError:
         trainingplan = None
@@ -13011,6 +13061,14 @@ def plannedsessions_print_view(request,timeperiod='thisweek',rowerid=0):
 
     startdate,enddate = get_dates_timeperiod(timeperiod)
         
+    try:
+        trainingplan = TrainingPlan.objects.filter(
+            startdate__lte =  startdate,
+            rower = r,
+            enddate__gte =  enddate)[0]
+    except IndexError:
+        trainingplan = None
+
     sps = get_sessions(r,startdate=startdate,enddate=enddate)
 
     completeness = {}
@@ -13020,6 +13078,7 @@ def plannedsessions_print_view(request,timeperiod='thisweek',rowerid=0):
     return render(request,'plannedsessions_print.html',
                   {
                       'teams':get_my_teams(request.user),
+                      'plan':trainingplan,
                       'plannedsessions':sps,
                       'rower':r,
                       'startdate':startdate,
@@ -13040,6 +13099,14 @@ def plannedsessions_manage_view(request,timeperiod='thisweek',rowerid=0,
 
     startdate,enddate = get_dates_timeperiod(timeperiod)
                 
+    try:
+        trainingplan = TrainingPlan.objects.filter(
+            startdate__lte =  startdate,
+            rower = r,
+            enddate__gte =  enddate)[0]
+    except IndexError:
+        trainingplan = None
+
     sps = get_sessions(r,startdate=startdate,enddate=enddate)
     if initialsession==0:
         try:
@@ -13140,6 +13207,7 @@ def plannedsessions_manage_view(request,timeperiod='thisweek',rowerid=0,
     return render(request,'plannedsessionsmanage.html',
                   {
                       'teams':get_my_teams(request.user),
+                      'plan':trainingplan,
                       'plannedsessions':sps,
                       'workouts':ws,
                       'timeperiod':timeperiod,
@@ -13160,6 +13228,14 @@ def plannedsession_clone_view(request,id=0,rowerid=0,
 
     startdate,enddate = get_dates_timeperiod(timeperiod)
 
+    try:
+        trainingplan = TrainingPlan.objects.filter(
+            startdate__lte =  startdate,
+            rower = r,
+            enddate__gte =  enddate)[0]
+    except IndexError:
+        trainingplan = None
+
     try:
         ps = PlannedSession.objects.get(id=id)
     except PlannedSession.DoesNotExist:
@@ -13208,6 +13284,14 @@ def plannedsession_edit_view(request,id=0,timeperiod='thisweek',rowerid=0):
     startdate,enddate = get_dates_timeperiod(timeperiod)
 
 
+    try:
+        trainingplan = TrainingPlan.objects.filter(
+            startdate__lte =  startdate,
+            rower = r,
+            enddate__gte =  enddate)[0]
+    except IndexError:
+        trainingplan = None
+
     try:
         ps = PlannedSession.objects.get(id=id)
     except PlannedSession.DoesNotExist:
@@ -13257,6 +13341,7 @@ def plannedsession_edit_view(request,id=0,timeperiod='thisweek',rowerid=0):
     return render(request,'plannedsessionedit.html',
                   {
                       'teams':get_my_teams(request.user),
+                      'plan':trainingplan,
                       'form':sessioncreateform,
                       'plannedsessions':sps,
                       'thesession':ps,
@@ -13385,6 +13470,7 @@ def plannedsession_view(request,id=0,rowerid=0,
                       'manager':m,
                       'rower':r,
                       'ratio':ratio,
+                      'plan':trainingplan,
                       'status':status,
                       'results':resultsdict,
                       'plannedsession':ps,