diff --git a/rowers/forms.py b/rowers/forms.py
index da363b90..7e18b393 100644
--- a/rowers/forms.py
+++ b/rowers/forms.py
@@ -76,7 +76,7 @@ class TrainingZonesForm(forms.Form):
 
     zones = forms.ChoiceField(initial='hr',label='Training Zones',choices=zoneschoices)
     dates = forms.ChoiceField(initial='week',label='Date Aggregation', choices=datechoices)
-    yaxis = forms.ChoiceField(initial='time',label='Y axis',choices=yaxischoices)
+    yaxis = forms.ChoiceField(initial='percentage',label='Y axis',choices=yaxischoices)
     startdate = forms.DateField(
         initial=timezone.now()-datetime.timedelta(days=42),
         widget=AdminDateWidget(), #format='%Y-%m-%d'),
diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py
index 6f5a9d6d..4342aff6 100644
--- a/rowers/interactiveplots.py
+++ b/rowers/interactiveplots.py
@@ -6585,6 +6585,7 @@ def interactive_otw_advanced_pace_chart(id=0,promember=0):
 
 def get_zones_report(rower,startdate,enddate,trainingzones='hr',date_agg='week',
                      yaxis='time'):
+
     duration = enddate-startdate
 
     totaldays = duration.total_seconds()/(24*3600)
@@ -6595,6 +6596,8 @@ def get_zones_report(rower,startdate,enddate,trainingzones='hr',date_agg='week',
     hours = []
     zones = []
 
+    enddate = enddate + datetime.timedelta(days=1)
+
 
     workouts = Workout.objects.filter(
         user=rower,
diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py
index f643bba3..31ea088a 100644
--- a/rowers/views/analysisviews.py
+++ b/rowers/views/analysisviews.py
@@ -1064,7 +1064,7 @@ def trainingzones_view(request,userid=0):
     startdate = enddate-datetime.timedelta(days=42)
     zones = 'hr'
     date_agg = 'week'
-    yaxis = 'time'
+    yaxis = 'percentage'
 
 
     form = TrainingZonesForm({
@@ -1137,7 +1137,7 @@ def trainingzones_view_data(request,userid=0):
     enddate = timezone.now()
     zones = 'hr'
     date_agg = 'week'
-    yaxis = 'time'
+    yaxis = 'percentage'
 
     zones = request.GET.get('zones',zones)