diff --git a/rowers/forms.py b/rowers/forms.py
index 53139c5a..290e5f00 100644
--- a/rowers/forms.py
+++ b/rowers/forms.py
@@ -963,7 +963,6 @@ class PlannedSessionTeamForm(forms.Form):
             return
 
         cd = self.cleaned_data
-        print cd['team'],'aap'
         if not cd['team']:
             raise forms.ValidationError(
                 'You must select at least one team'
diff --git a/rowers/models.py b/rowers/models.py
index b5326f42..5db5bb25 100644
--- a/rowers/models.py
+++ b/rowers/models.py
@@ -1638,7 +1638,7 @@ class PlannedSession(models.Model):
         ('session','Training Session'),
         ('challenge','Challenge'),
         ('test','Mandatory Test'),
-        ('cycletarget','Cycle Target'),
+        ('cycletarget','Total for a time period'),
         ('coursetest','OTW test over a course'),
         ('race','Virtual Race'),
         )
diff --git a/rowers/templates/trainingplan.html b/rowers/templates/trainingplan.html
index 8e2e57d0..770f457b 100644
--- a/rowers/templates/trainingplan.html
+++ b/rowers/templates/trainingplan.html
@@ -6,6 +6,17 @@
 
 
 {% block main %}
+<script>
+  function toggle(source) {
+  checkboxes = document.querySelectorAll("input[type='checkbox']");
+  for (var i=0, n=checkboxes.length;i<n;i++) {
+      if (checkboxes[i].name.includes('selector')) {
+                                             checkboxes[i].checked = source.checked
+                                             }
+                                             }
+                                             }
+</script>
+
 <h1>Training Plan - {{ plan.name }}</h1>
 <p>This plan starts on {{ plan.startdate }} and ends on {{ plan.enddate }}.
   {% if plan.target %}
@@ -18,6 +29,7 @@
 
 <h2>Plan Macro, Meso and Micro Cycles</h2>
 
+<p><input type="checkbox" href="" onClick="toggle(this)" />Unfold/Fold all</p>
 <ul class="cd-accordion-menu animated">
   <!-- Start Macrocycle For Loop -->
   {% for key, macrocycle in cycles.items %}
@@ -46,8 +58,10 @@
                   /
                   <a href="/rowers/deletemacrocycle/{{ macrocycle.0.id }}/">delete</a>
                   /
+                  <a href='/rowers/sessions/create/user/{{ rower.user.id }}?when={{ macrocycle.0.startdate|date:"Y-m-d" }}/{{ macrocycle.0.enddate|date:"Y-m-d" }}'>add sessions</a>
+                  /
                   {% endif %}
-                  <a href='/rowers/sessions/{{ macrocycle.0.startdate|date:"Y-m-d" }}/{{ macrocycle.0.enddate|date:"Y-m-d" }}/user/{{ rower.user.id }}'>sessions</a>
+                  <a href='/rowers/sessions/user/{{ rower.user.id }}?when={{ macrocycle.0.startdate|date:"Y-m-d" }}/{{ macrocycle.0.enddate|date:"Y-m-d" }}'>view sessions</a>
                 </td>
               </tr>
               {% else %}
@@ -55,7 +69,7 @@
                 &nbsp;
               </tr>
               <tr>
-                <a href='/rowers/sessions/{{ macrocycle.0.startdate|date:"Y-m-d" }}/{{ macrocycle.0.enddate|date:"Y-m-d" }}/user/{{ rower.user.id }}'>sessions</a>
+                <a href='/rowers/sessions/user/{{ rower.user.id }}?when={{ macrocycle.0.startdate|date:"Y-m-d" }}/{{ macrocycle.0.enddate|date:"Y-m-d" }}'>view sessions</a>
               </tr>
               {% endif %}
             </table>
@@ -115,8 +129,10 @@
                     Replan by Months
                   </a>
                   /
+                  <a href='/rowers/sessions/create/user/{{ rower.user.id }}?when={{ macrocycle.0.startdate|date:"Y-m-d" }}/{{ macrocycle.0.enddate|date:"Y-m-d" }}'>add sessions</a>
+                  /
                   {% endif %}
-                  <a href='/rowers/sessions/{{ macrocycle.0.startdate|date:"Y-m-d" }}/{{ macrocycle.0.enddate|date:"Y-m-d" }}/user/{{ rower.user.id }}'>sessions</a>
+                  <a href='/rowers/sessions/user/{{ rower.user.id }}?when={{ macrocycle.0.startdate|date:"Y-m-d" }}/{{ macrocycle.0.enddate|date:"Y-m-d" }}'>view sessions</a>
                 </td>
               </tr>
               {% else %}
@@ -125,7 +141,7 @@
               </tr>
               <tr>
                 <td colspan="4">
-                  <a href='/rowers/sessions/{{ macrocycle.0.startdate|date:"Y-m-d" }}/{{ macrocycle.0.enddate|date:"Y-m-d" }}/user/{{ rower.user.id }}'>sessions</a>
+                  <a href='/rowers/sessions/user/{{ rower.user.id }}?when={{ macrocycle.0.startdate|date:"Y-m-d" }}/{{ macrocycle.0.enddate|date:"Y-m-d" }}'>view sessions</a>
                 </td>
               </tr>
               {% endif %}
@@ -162,8 +178,10 @@
                         /
                         <a href="/rowers/deletemesocycle/{{ mesocycle.0.id }}/">delete</a>
                         /
+                        <a href='/rowers/sessions/create/user/{{ rower.user.id }}?when={{ mesocycle.0.startdate|date:"Y-m-d" }}/{{ mesocycle.0.enddate|date:"Y-m-d" }}'>add sessions</a>
+                        /
                         {% endif %}
-                        <a href='/rowers/sessions/{{ mesocycle.0.startdate|date:"Y-m-d" }}/{{ mesocycle.0.enddate|date:"Y-m-d" }}/user/{{ rower.user.id }}'>sessions</a>
+                        <a href='/rowers/sessions/user/{{ rower.user.id }}?when={{ mesocycle.0.startdate|date:"Y-m-d" }}/{{ mesocycle.0.enddate|date:"Y-m-d" }}'>view sessions</a>
                       </td>
                     </tr>
                     {% endif %}
@@ -172,7 +190,7 @@
                       &nbsp;
                     </tr>
                     <tr>
-                      <a href='/rowers/sessions/{{ mesocycle.0.startdate|date:"Y-m-d" }}/{{ mesocycle.0.enddate|date:"Y-m-d" }}/user/{{ rower.user.id }}'>sessions</a>
+                      <a href='/rowers/sessions/user/{{ rower.user.id }}?when={{ mesocycle.0.startdate|date:"Y-m-d" }}/{{ mesocycle.0.enddate|date:"Y-m-d" }}'>view sessions</a>
                     </tr>
                     {% endif %}
                   </table>
@@ -232,8 +250,10 @@
                           Replan by Weeks
                         </a>
                         /
+                        <a href='/rowers/sessions/create/user/{{ rower.user.id }}?when={{ mesocycle.0.startdate|date:"Y-m-d" }}/{{ mesocycle.0.enddate|date:"Y-m-d" }}'>add sessions</a>
+                        /
                         {% endif %}
-                        <a href='/rowers/sessions/{{ mesocycle.0.startdate|date:"Y-m-d" }}/{{ mesocycle.0.enddate|date:"Y-m-d" }}/user/{{ rower.user.id }}'>sessions</a>
+                        <a href='/rowers/sessions/user/{{ rower.user.id }}?when={{ mesocycle.0.startdate|date:"Y-m-d" }}/{{ mesocycle.0.enddate|date:"Y-m-d" }}'>view sessions</a>
                       </td>
                     </tr>
                     {% else %}
@@ -242,7 +262,7 @@
                     </tr>
                     <tr>
                       <td colspan="4">
-                        <a href='/rowers/sessions/{{ mesocycle.0.startdate|date:"Y-m-d" }}/{{ mesocycle.0.enddate|date:"Y-m-d" }}/user/{{ rower.user.id }}'>sessions</a>
+                        <a href='/rowers/sessions/user/{{ rower.user.id }}?when={{ mesocycle.0.startdate|date:"Y-m-d" }}/{{ mesocycle.0.enddate|date:"Y-m-d" }}'>view sessions</a>
                       </td>
                     </tr>
                     {% endif %}
@@ -284,8 +304,10 @@
                             /
                             <a href="/rowers/deletemicrocycle/{{ microcycle.id }}/">delete</a>
                             /
+                            <a href='/rowers/sessions/create/user/{{ rower.user.id }}?when={{ microcycle.startdate|date:"Y-m-d" }}/{{ microcycle.enddate|date:"Y-m-d" }}'>add sessions</a>
+                        /
                             {% endif %}
-                            <a href='/rowers/sessions/{{ microcycle.startdate|date:"Y-m-d" }}/{{ microcycle.enddate|date:"Y-m-d" }}/user/{{ rower.user.id }}'>sessions</a>
+                            <a href='/rowers/sessions/user/{{ rower.user.id }}?when={{ microcycle.startdate|date:"Y-m-d" }}/{{ microcycle.enddate|date:"Y-m-d" }}'>view sessions</a>
                           </td>
                         </tr>
                         {% endif %}
@@ -296,7 +318,7 @@
                         </tr>
                         <tr>
                           <td colspan="4">
-                            <a href='/rowers/sessions/{{ microcycle.startdate|date:"Y-m-d" }}/{{ microcycle.enddate|date:"Y-m-d" }}/user/{{ rower.user.id }}'>sessions</a>
+                            <a href='/rowers/sessions/user/{{ rower.user.id }}?when={{ microcycle.startdate|date:"Y-m-d" }}/{{ microcycle.enddate|date:"Y-m-d" }}'>view sessions</a>
                           </td>
                         </tr>
                         {% endif %}
@@ -354,8 +376,10 @@
                             /
                             <a href="/rowers/deletemicrocycle/{{ microcycle.id }}">delete</a>
                             /
+                            <a href='/rowers/sessions/create/user/{{ rower.user.id }}?when={{ microcycle.startdate|date:"Y-m-d" }}/{{ microcycle.enddate|date:"Y-m-d" }}'>add sessions</a>
+                            /
                             {% endif %}
-                            <a href='/rowers/sessions/{{ microcycle.startdate|date:"Y-m-d" }}/{{ microcycle.enddate|date:"Y-m-d" }}/user/{{ rower.user.id }}'>sessions</a>
+                            <a href='/rowers/sessions/user/{{ rower.user.id }}?when={{ microcycle.startdate|date:"Y-m-d" }}/{{ microcycle.enddate|date:"Y-m-d" }}'>view sessions</a>
                           </td>
                         </tr>
                         {% else %}
@@ -364,7 +388,7 @@
                         </tr>
                         <tr>
                           <td colspan="4">
-                            <a href='/rowers/sessions/{{ microcycle.startdate|date:"Y-m-d" }}/{{ microcycle.enddate|date:"Y-m-d" }}/user/{{ rower.user.id }}'>sessions</a>
+                            <a href='/rowers/sessions/user/{{ rower.user.id }}?when={{ microcycle.startdate|date:"Y-m-d" }}/{{ microcycle.enddate|date:"Y-m-d" }}'>view sessions</a>
                           </td>
                         </tr>
                         {% endif %}
diff --git a/rowers/urls.py b/rowers/urls.py
index 2f84b1bb..eeb3a70e 100644
--- a/rowers/urls.py
+++ b/rowers/urls.py
@@ -358,8 +358,8 @@ urlpatterns = [
     url(r'^me/exportsettings/$',views.rower_exportsettings_view),
     url(r'^me/exportsettings/user/(?P<userid>\d+)$',views.rower_exportsettings_view),
     url(r'^team/(?P<id>\d+)/$',views.team_view),
-    url(r'^team/(?P<id>\d+)/memberstats$',views.team_members_stats_view),
-    url(r'^team/(?P<id>\d+)/edit$',views.team_edit_view),
+    url(r'^team/(?P<id>\d+)/memberstats/$',views.team_members_stats_view),
+    url(r'^team/(?P<id>\d+)/edit/$',views.team_edit_view),
     url(r'^team/(?P<id>\d+)/leaveconfirm/$',views.team_leaveconfirm_view),
     url(r'^team/(?P<id>\d+)/leave/$',views.team_leave_view),
     url(r'^team/(?P<id>\d+)/deleteconfirm/$',views.team_deleteconfirm_view),
diff --git a/rowers/views.py b/rowers/views.py
index cc854b2a..c412e2a8 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -14326,8 +14326,9 @@ def plannedsession_multicreate_view(request,
                       )
 
 
-        if when:
-            url += '?when='+when
+        startdatestring = startdate.strftime('%Y-%m-%d')
+        enddatestring = enddate.strftime('%Y-%m-%d')
+        url += '?when='+startdatestring+'/'+enddatestring
         
         return HttpResponseRedirect(url)
 
@@ -14394,6 +14395,9 @@ def plannedsession_teamcreate_view(request,
         sps += res
 
     sps = list(set(sps))
+    ids = [ps.id for ps in sps]
+    sps = PlannedSession.objects.filter(id__in=ids).order_by(
+        "preferreddate","startdate","enddate")
         
     if request.method == 'POST':
         sessioncreateform = PlannedSessionForm(request.POST)
@@ -14437,6 +14441,7 @@ def plannedsession_teamcreate_view(request,
 
             cd = sessionteamselectform.cleaned_data
             teams = cd['team']
+            request.session['teams'] = [team.id for team in teams]
             for team in teams:
                 add_team_session(team,ps)
                 rs = Rower.objects.filter(team__in=[team])
@@ -14444,11 +14449,12 @@ def plannedsession_teamcreate_view(request,
                     add_rower_session(r,ps)
                     
                     
-                    url = reverse(plannedsession_teamcreate_view)
-                if when:
-                    url += '?when='+when
-
-                return HttpResponseRedirect(url)
+            url = reverse(plannedsession_teamcreate_view)
+            startdatestring = startdate.strftime('%Y-%m-%d')
+            enddatestring = enddate.strftime('%Y-%m-%d')
+            url += '?when='+startdatestring+'/'+enddatestring
+            
+            return HttpResponseRedirect(url)
         else:
             timeperiod = startdate.strftime('%Y-%m-%d')+'/'+enddate.strftime('%Y-%m-%d')
             breadcrumbs = [
@@ -14481,10 +14487,19 @@ def plannedsession_teamcreate_view(request,
             'enddate':enddate,
             'preferreddate':startdate,
             }
-        
+
+        if 'teams' in request.session:
+            teams = request.session['teams']
+            theteams = Team.objects.filter(id__in=teams)
+            initialteam = {
+                'team':theteams
+                }
+        else:
+            initialteam = {}
+            
         sessioncreateform = PlannedSessionForm(initial=initial)
         sessionteamselectform = PlannedSessionTeamForm(
-            request.user
+            request.user,initial=initialteam
         )
 
         timeperiod = startdate.strftime('%Y-%m-%d')+'/'+enddate.strftime('%Y-%m-%d')
@@ -14561,6 +14576,9 @@ def plannedsession_teamedit_view(request,
 
 
     sps = list(set(sps))
+    ids = [ps.id for ps in sps]
+    sps = PlannedSession.objects.filter(id__in=ids).order_by(
+        "preferreddate","startdate","enddate")
         
     if request.method == 'POST':
         sessioncreateform = PlannedSessionForm(request.POST,instance=ps)
@@ -14621,8 +14639,10 @@ def plannedsession_teamedit_view(request,
                               'sessionid':sessionid,
                           })
 
-            if when:
-                url += '?when='+when
+            startdatestring = startdate.strftime('%Y-%m-%d')
+            enddatestring = enddate.strftime('%Y-%m-%d')
+            url += '?when='+startdatestring+'/'+enddatestring
+        
             
             return HttpResponseRedirect(url)
     else:
@@ -15060,11 +15080,6 @@ def plannedsession_clone_view(request,id=0,userid=0):
     r = getrequestrower(request,userid=userid)
 
     
-    if when:
-        timeperiod = when
-    else:
-        timeperiod = 'thisweek'
-
     startdate,enddate = get_dates_timeperiod(request)
 
     try:
@@ -15109,8 +15124,10 @@ def plannedsession_clone_view(request,id=0,userid=0):
                       }
     )
 
-    if when:
-        url += '?when='+when
+    startdatestring = startdate.strftime('%Y-%m-%d')
+    enddatestring = enddate.strftime('%Y-%m-%d')
+    url += '?when='+startdatestring+'/'+enddatestring
+
 
     return HttpResponseRedirect(url)
 
@@ -15175,8 +15192,9 @@ def plannedsession_edit_view(request,id=0,userid=0):
                               'userid':r.user.id,
                           })
 
-            if when:
-                url += '?when='+when
+            startdatestring = startdate.strftime('%Y-%m-%d')
+            enddatestring = enddate.strftime('%Y-%m-%d')
+            url += '?when='+startdatestring+'/'+enddatestring
             
             return HttpResponseRedirect(url)
     else:
@@ -16695,11 +16713,8 @@ def rower_trainingplan_view(request,
                             thismesoid=0):
 
 
-    when = request.GET.get('when')
-    if when:
-        startdate,enddate = get_dates_timeperiod(request)
-    else:
-        startdate = datetime.date.today()
+    startdate,enddate = get_dates_timeperiod(request)
+
         
     try:
         plan = TrainingPlan.objects.get(id=id)