diff --git a/rowers/dataprep.py b/rowers/dataprep.py
index 897805b3..69bfe263 100644
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -2174,13 +2174,17 @@ def dataprep(rowdatadf, id=0, bands=True, barchart=True, otwpower=True,
     drivespeed = drivespeed.fillna(value=0)
 
     try:
-        driveenergy = rowdatadf['driveenergy']
+        print('driveenergy',rowdatadf['driveenergy'].mean())
     except KeyError:
+        print('KeyError')
         if forceunit == 'lbs':
             driveenergy = drivelength * averageforce * lbstoN
         else:
             drivenergy = drivelength * averageforce
 
+    if driveenergy.mean() == 0 and driveenergy.std() == 0:
+        driveenergy = 0*driveenergy+100
+
     distance = rowdatadf.loc[:, 'cum_dist']
     velo = 500. / p
 
diff --git a/rowers/forms.py b/rowers/forms.py
index 760b536c..4e1d910c 100644
--- a/rowers/forms.py
+++ b/rowers/forms.py
@@ -820,45 +820,6 @@ class PlannedSessionMultipleCloneForm(forms.Form):
         label='Planned Sessions'
         )
 
-analysischoices = (
-    ('boxplot','Box Chart'),
-    ('trendflex','Trend Flex'),
-    )
-    
-class AnalysisChoiceForm(forms.Form):
-    function = forms.ChoiceField(choices=analysischoices,initial='boxplot',
-                                 label='Analysis')
-    yparam = forms.ChoiceField(choices=parchoices,initial='spm',
-                               label='Metric')
-    spmmin = forms.FloatField(initial=15,
-                              required=False,label = 'Min SPM')
-    spmmax = forms.FloatField(initial=55,
-                              required=False,label = 'Max SPM')
-    workmin = forms.FloatField(initial=0,
-                              required=False,label = 'Min Work per Stroke')
-    workmax = forms.FloatField(initial=1500,
-                              required=False,label = 'Max Work per Stroke')
-
-    includereststrokes = forms.BooleanField(initial=False,
-                                            required=False,
-                                            label='Include Rest Strokes')
-    
-    
-class BoxPlotChoiceForm(forms.Form):
-    yparam = forms.ChoiceField(choices=parchoices,initial='spm',
-                               label='Metric')
-    spmmin = forms.FloatField(initial=15,
-                              required=False,label = 'Min SPM')
-    spmmax = forms.FloatField(initial=55,
-                              required=False,label = 'Max SPM')
-    workmin = forms.FloatField(initial=0,
-                              required=False,label = 'Min Work per Stroke')
-    workmax = forms.FloatField(initial=1500,
-                              required=False,label = 'Max Work per Stroke')
-
-    includereststrokes = forms.BooleanField(initial=False,
-                                            required=False,
-                                            label='Include Rest Strokes')
 
 grouplabels = axlabels.copy()
 grouplabels['date'] = 'Date'
@@ -876,6 +837,62 @@ from rowers.utils import palettes
 
 palettechoices = tuple((p,p) for p in palettes.keys())
 
+analysischoices = (
+    ('boxplot','Box Chart'),
+    ('trendflex','Trend Flex'),
+    )
+    
+class AnalysisChoiceForm(forms.Form):
+    function = forms.ChoiceField(choices=analysischoices,initial='boxplot',
+                                 label='Analysis')
+    plotfield = forms.ChoiceField(choices=parchoices,initial='spm',
+                               label='Metric')
+    xparam = forms.ChoiceField(choices=parchoicesmultiflex,
+                               initial='hr',
+                               label='X axis')
+    yparam = forms.ChoiceField(choices=parchoicesmultiflex,
+                               initial='pace',
+                               label='Y axis')
+    groupby = forms.ChoiceField(choices=groupchoices,initial='spm',
+                                label='Group By')
+    binsize = forms.FloatField(initial=1,required=False,label = 'Bin Size')
+
+    ploterrorbars = forms.BooleanField(initial=False,
+                                       required=False,
+                                       label='Plot Error Bars')
+
+    palette = forms.ChoiceField(choices=palettechoices,
+                                label = 'Color Scheme',
+                                initial='monochrome_blue')
+    
+    spmmin = forms.FloatField(initial=15,
+                              required=False,label = 'Min SPM')
+    spmmax = forms.FloatField(initial=55,
+                              required=False,label = 'Max SPM')
+    workmin = forms.FloatField(initial=0,
+                              required=False,label = 'Min Work per Stroke')
+    workmax = forms.FloatField(initial=1500,
+                              required=False,label = 'Max Work per Stroke')
+
+    includereststrokes = forms.BooleanField(initial=False,
+                                            required=False,
+                                            label='Include Rest Strokes')
+    
+class BoxPlotChoiceForm(forms.Form):
+    yparam = forms.ChoiceField(choices=parchoices,initial='spm',
+                               label='Metric')
+    spmmin = forms.FloatField(initial=15,
+                              required=False,label = 'Min SPM')
+    spmmax = forms.FloatField(initial=55,
+                              required=False,label = 'Max SPM')
+    workmin = forms.FloatField(initial=0,
+                              required=False,label = 'Min Work per Stroke')
+    workmax = forms.FloatField(initial=1500,
+                              required=False,label = 'Max Work per Stroke')
+
+    includereststrokes = forms.BooleanField(initial=False,
+                                            required=False,
+                                            label='Include Rest Strokes')
 
 class MultiFlexChoiceForm(forms.Form):
     xparam = forms.ChoiceField(choices=parchoicesmultiflex,
diff --git a/rowers/templates/user_analysis_select.html b/rowers/templates/user_analysis_select.html
index 8c35838d..c5ee4387 100644
--- a/rowers/templates/user_analysis_select.html
+++ b/rowers/templates/user_analysis_select.html
@@ -63,6 +63,78 @@
   });
 </script>
 
+<script>
+  // script for chart options form
+  $(function() {
+  
+      // Get the form fields and hidden div
+      var functionfield = $("#id_function");
+      var plotfield = $("#id_plotfield").parent().parent();
+      var x_param = $("#id_xparam").parent().parent();
+      var y_param = $("#id_yparam").parent().parent();
+      var groupby = $("#id_groupby").parent().parent();
+      var binsize = $("#id_binsize").parent().parent();
+      var errorbars = $("#id_ploterrorbars").parent().parent();
+      var palette = $("#id_palette").parent().parent();
+      
+      
+      // Hide the fields.
+      // Use JS to do this in case the user doesn't have JS 
+      // enabled.
+      plotfield.hide();
+      x_param.hide();
+      y_param.hide();
+      groupby.hide();
+      errorbars.hide();
+      palette.hide();
+      binsize.hide();
+
+      if (functionfield.val() == 'boxplot') {
+	  plotfield.show();
+      };
+
+      if (functionfield.val() == 'trendflex') {
+	  x_param.show();
+	  y_param.show();
+	  groupby.show();
+	  palette.show();
+	  binsize.show();
+	  errorbars.show();
+      };
+
+  
+      // Setup an event listener for when the state of the 
+      // checkbox changes.
+      functionfield.change(function() {
+	  // Check to see if the checkbox is checked.
+	  // If it is, show the fields and populate the input.
+	  // If not, hide the fields.
+	  var Value = functionfield.val();
+	  if (Value=='boxplot') {
+	      // Show the hidden fields.
+	      plotfield.show();
+	      x_param.hide();
+	      y_param.hide();
+	      groupby.hide();
+	      palette.hide();
+	      binsize.hide();
+	      errorbars.hide();
+	  } 
+	  else if (Value=='trendflex') {
+	      x_param.show();
+	      y_param.show();
+	      groupby.show();
+	      palette.show();
+	      binsize.show();
+	      errorbars.show();
+	      plotfield.hide();
+	  }
+      });
+      
+      
+  });
+</script>
+
 <script src="https://cdn.pydata.org/bokeh/release/bokeh-1.0.4.min.js"></script>
 <script async="true" type="text/javascript">
   Bokeh.set_log_level("info");
diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py
index b1f4272e..48a426c4 100644
--- a/rowers/views/analysisviews.py
+++ b/rowers/views/analysisviews.py
@@ -91,6 +91,7 @@ def analysis_new(request,userid=0,function='boxplot'):
         if chartform.is_valid():
             for key, value in chartform.cleaned_data.items():
                 options[key] = value
+                
             
         form = WorkoutMultipleCompareForm(request.POST)
         if form.is_valid():
@@ -216,28 +217,18 @@ def analysis_new(request,userid=0,function='boxplot'):
         
 
 def boxplotdata(workouts,options):
-    try:
-        includereststrokes = options['includereststrokes']
-        spmmin = options['spmmin']
-        spmmax = options['spmmax']
-        workmin = options['workmin']
-        workmax = options['workmax']
-        ids = options['ids']
-        userid = options['userid']
-        plotfield = options['plotfield']
-        function = options['function']
-    except KeyError:
-        includereststrokes = False
-        spmmin = 15
-        spmmax = 55
-        workmin = 0
-        workmax = 55
-        ids = []
-        userid = 0
-        plotfield = 'spm'
-        function = 'boxplot'
 
-    
+
+    includereststrokes = options['includereststrokes']
+    spmmin = options['spmmin']
+    spmmax = options['spmmax']
+    workmin = options['workmin']
+    workmax = options['workmax']
+    ids = options['ids']
+    userid = options['userid']
+    plotfield = options['plotfield']
+    function = options['function']
+
     workstrokesonly = not includereststrokes
     labeldict = {
         int(w.id): w.__str__() for w in workouts