diff --git a/rowers/templates/workflow.html b/rowers/templates/workflow.html
index ebd65dd1..01a0d55c 100644
--- a/rowers/templates/workflow.html
+++ b/rowers/templates/workflow.html
@@ -33,7 +33,7 @@
     {% block left_panel %}
     <div class="grid_2 alpha">
   <p>
-    <a class="button gray small" href="/rowers/me/workflowconfig">Configure this page</a>
+    <a class="button gray small" href="/rowers/me/workflowconfig2">Configure this page</a>
   </p>
 </div>
      {% for templateName in leftTemplates %}
diff --git a/rowers/templates/workflowconfig2.html b/rowers/templates/workflowconfig2.html
index e9465081..86b1e7f5 100644
--- a/rowers/templates/workflowconfig2.html
+++ b/rowers/templates/workflowconfig2.html
@@ -18,17 +18,16 @@
   {% endif %}
   <div class-"grid_12 alpha">
     <h1>Workflow Page Configuration</h1>
+    <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">
       <h2>Left Panel</h2>
       <form enctype="multipart/form-data" action="" method="post">
         {{ leftpanel_formset.management_form }}
-        {% for leftpanel_form in leftpanel_formset %}
-        <div class="leftpanel-formset grid_5 alpha">
           <table>
-            {{ leftpanel_form.as_table }}
+            {{ leftpanel_formset.as_table }}
           </table>
-        </div>
-        {% endfor %}
         {% csrf_token %}
         <input class="grid_2 alpha button green" type="submit" value="Save">
     </form>
@@ -38,13 +37,9 @@
       <h2>Middle Panel</h2>
       <form enctype="multipart/form-data" action="" method="post">
         {{ middlepanel_formset.management_form }}
-        {% for middlepanel_form in middlepanel_formset %}
-        <div class="middlepanel-formset grid_5 alpha">
           <table>
-            {{ middlepanel_form.as_table }}
+            {{ middlepanel_formset.as_table }}
           </table>
-        </div>
-        {% endfor %}
         {% csrf_token %}
         <input class="grid_2 alpha button green" type="submit" value="Save">
       </form>
@@ -52,19 +47,6 @@
 
   </div>
 </div>
-<!-- Include formset plugin - including jQuery dependency -->
-<script src="//ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
-<script src="/static/js/jquery.formset.js"></script>
-<script>
-    $('.leftpanel-formset').formset({
-        addText: '<div class="button grid_2 alpha green small">add element</div>',
-        deleteText: '<div class="button grid_2 alpha red small">remove</div>'
-    });
-    $('.middlepanel-formset').formset({
-        addText: '<div class="button grid_2 alpha green small">add element</div>',
-        deleteText: '<div class="button grid_2 alpha red small">remove</div>'
-    });
-</script>
 
 
 
diff --git a/rowers/views.py b/rowers/views.py
index 826d2a3c..0faed633 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -5930,6 +5930,23 @@ def workout_workflow_config2_view(request):
                     r.save()
                 except IntegrityError:
                     messages.error(request,'Something went wrong')
+        if wasleft:
+            leftpanel_formset = LeftPanelFormSet(request.POST,
+                                                     prefix='leftpanel')
+            newleftpanel = []
+            if leftpanel_formset.is_valid():
+                for form in leftpanel_formset:
+                    value = form.cleaned_data.get('panel')
+                    if value != 'None':
+                        newleftpanel.append(value)
+
+
+                newleftpanel = [i for i in newleftpanel if i != None]
+                r.workflowleftpanel = newleftpanel
+                try:
+                    r.save()
+                except IntegrityError:
+                    messages.error(request,'Something went wrong')
                 
     leftpanelform_data = [{'panel':panel}
                           for panel in r.workflowleftpanel]