diff --git a/rowers/templates/show_graph.html b/rowers/templates/show_graph.html
index c14bd873..00cdab68 100644
--- a/rowers/templates/show_graph.html
+++ b/rowers/templates/show_graph.html
@@ -43,7 +43,16 @@
 </p>
 {% endif %}
 </div>
-<div class="grid_2 suffix_8 omega">
+<div class="grid_2">
+  {% if user.is_authenticated and user == rower.user %}
+  <p>
+    <a class="button gray small" href="/rowers/workout/{{ graph.workout.id }}/workflow">Workflow View</a>
+  </p>
+  {% else %}
+  <p>&nbsp;</p>
+  {% endif %}
+</div>
+<div class="grid_2 suffix_6 omega">
 {% if user.is_authenticated and user == rower.user %}
 		<p>
 		<a class="button red small" href="/rowers/graph/{{ graph.id }}/deleteconfirm">Delete Chart</a>
diff --git a/rowers/templates/workflowconfig2.html b/rowers/templates/workflowconfig2.html
index 86b1e7f5..abdfe052 100644
--- a/rowers/templates/workflowconfig2.html
+++ b/rowers/templates/workflowconfig2.html
@@ -21,7 +21,7 @@
     <p>On this page, you can configure the content of your "Workflow" page
       for each workout. If you want to remove an element, change it to "None".
       You can add one new element at a time.</p>
-    <div class="grid_6 alpha">
+    <div class="grid_4 alpha">
       <h2>Left Panel</h2>
       <form enctype="multipart/form-data" action="" method="post">
         {{ leftpanel_formset.management_form }}
@@ -33,7 +33,7 @@
     </form>
     </div>
 
-    <div class="grid_6 omega ">
+    <div class="grid_4">
       <h2>Middle Panel</h2>
       <form enctype="multipart/form-data" action="" method="post">
         {{ middlepanel_formset.management_form }}
@@ -45,6 +45,18 @@
       </form>
     </div>
 
+    <div class="grid_4 omega">
+      <div class="grid_2 prefix_2 alpha">
+        {% if rower.defaultlandingpage == 'workout_edit_view' %}
+        <p>Default landing page is Edit View. Set default landing page to</p>
+        <a class="button green small" href="/rowers/me/workflowdefault">Workflow View</a>
+        {% else %}
+        <p>Default landing page is Workflow View. Set default landing page to</p>
+        <a class="button green small" href="/rowers/me/workflowdefault">Edit View</a>
+        {% endif %}
+      </div>
+    </div>
+
   </div>
 </div>
 
diff --git a/rowers/urls.py b/rowers/urls.py
index 5ba765db..9a4653f9 100644
--- a/rowers/urls.py
+++ b/rowers/urls.py
@@ -320,6 +320,7 @@ urlpatterns = [
     url(r'^me/favoritecharts/$',views.rower_favoritecharts_view),
     url(r'^me/workflowconfig$',views.workout_workflow_config_view),
     url(r'^me/workflowconfig2$',views.workout_workflow_config2_view),
+    url(r'^me/workflowdefault$',views.workflow_default_view),
     url(r'^email/send/$', views.sendmail),
     url(r'^email/thankyou/$', TemplateView.as_view(template_name='thankyou.html'), name='thankyou'),
     url(r'^email/$', TemplateView.as_view(template_name='email.html'), name='email'),
diff --git a/rowers/views.py b/rowers/views.py
index ac1a4750..e44ba678 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -6147,7 +6147,23 @@ def workout_comparison_view2(request,id1=0,id2=0,xparam='distance',
 		   'plottype':plottype,
 		   'promember':promember,
 		   })
-	
+
+# Change default landing page
+@login_required()
+def workflow_default_view(request):
+    r = getrower(request.user)
+    if r.defaultlandingpage == 'workout_edit_view':
+        r.defaultlandingpage = 'workout_workflow_view'
+    else:
+        r.defaultlandingpage = 'workout_edit_view'
+
+    r.save()
+
+    url = reverse(workout_workflow_config2_view)
+    
+    return HttpResponseRedirect(url)
+
+
 # Workflow Configuration
 @login_required()
 def workout_workflow_config_view(request):
@@ -6257,10 +6273,10 @@ def workout_workflow_config2_view(request):
     
     
     tmplt = 'workflowconfig2.html'
-        
+
     return render(request,tmplt,
                   {
-                      'rower':r,
+                      'rower':getrower(request.user),
                       'leftpanel_formset':leftpanel_formset,
                       'middlepanel_formset':middlepanel_formset,
                       'workoutid': workoutid,
@@ -6287,6 +6303,10 @@ def workout_workflow_view(request,id):
     if request.user == row.user.user:
 	mayedit=1
 
+    comments = WorkoutComment.objects.filter(workout=row)
+
+    aantalcomments = len(comments)
+
     workouttype = 'ote'
     if row.workouttype in ('water','coastal'):
         workouttype = 'otw'
@@ -6348,6 +6368,7 @@ def workout_workflow_view(request,id):
                       'mapdiv':mapdiv,
                       'statcharts':statcharts,
                       'rower':r,
+                      'aantalcomments':aantalcomments,
                   })
 
 # The famous flex chart
@@ -7644,7 +7665,9 @@ def workout_getstravaworkout_view(request,stravaid):
         messages.error(request,message)
 
 
-    url = reverse(workout_edit_view,
+    r = getrower(request.user)
+        
+    url = reverse(r.defaultlandingpage,
                   kwargs = {
                       'id':int(id),
                   })
@@ -7665,7 +7688,9 @@ def workout_getrunkeeperworkout_view(request,runkeeperid):
     if message:
         messages.error(request,message)
 
-    url = reverse(workout_edit_view,
+    r = getrower(request.user)
+        
+    url = reverse(r.defaultlandingpage,
                   kwargs = {
                       'id':int(id),
                   })
@@ -7684,7 +7709,9 @@ def workout_getunderarmourworkout_view(request,underarmourid):
     if message:
         messages.error(request,message)
 
-    url = reverse(workout_edit_view,
+    r = getrower(request.user)
+        
+    url = reverse(r.defaultlandingpage,
                   kwargs = {
                       'id':int(id),
                   })
@@ -7709,7 +7736,9 @@ def workout_getsporttracksworkout_view(request,sporttracksid):
     if message:
         messages.error(request,message)
 
-    url = reverse(workout_edit_view,
+    r = getrower(request.user)
+        
+    url = reverse(r.defaultlandingpage,
                   kwargs = {
                       'id':int(id),
                   })
@@ -7853,7 +7882,9 @@ def workout_getc2workout_view(request,c2id):
             if message:
                 messages.error(request,message)
 
-            url = reverse(workout_edit_view,
+            r = getrower(request.user)
+        
+            url = reverse(r.defaultlandingpage,
                           kwargs = {
                               'id':int(id),
                           })