diff --git a/rowers/templates/list_workouts.html b/rowers/templates/list_workouts.html
index fbf1bf19..a28d11e6 100644
--- a/rowers/templates/list_workouts.html
+++ b/rowers/templates/list_workouts.html
@@ -48,10 +48,10 @@
         <td> {{ workout.date |truncatechars:15}} </td>
         <td> {{ workout.starttime }} </td>
         <td> 
-          {% if user.rower.rowerplan == 'pro' %}
+          {% if workout.name != '' %}
           <a href="/rowers/workout/{{ workout.id }}/edit">{{ workout.name }}</a> </td>
         {% else %}
-        <a href="/rowers/workout/{{ workout.id }}/edit">{{ workout.name }}</a> </td>
+        <a href="/rowers/workout/{{ workout.id }}/edit">No Name</a> </td>
         {% endif %}
 <td> {{ workout.workouttype }} </td>
 <td> {{ workout.distance }}m</td>
diff --git a/rowers/views.py b/rowers/views.py
index 1608a367..e80ddfb1 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -695,7 +695,7 @@ def add_workout_from_stdata(user,importid,data):
     rr = rrower(hrmax=r.max,hrut2=r.ut2,
 		hrut1=r.ut1,hrat=r.at,
 		hrtr=r.tr,hran=r.an,ftp=r.ftp,
-                powerperc=powerperc,powerzones=powerzones)
+                powerperc=powerperc,powerzones=r.powerzones)
     row = rdata(csvfilename,rower=rr)
 
     averagehr = row.df[' HRCur (bpm)'].mean()
@@ -3856,10 +3856,11 @@ def workout_upload_view(request,message=""):
                                           r.pw_at,
                                           r.pw_tr,r.pw_an])/r.ftp
 
+                print powerperc
 		rr = rrower(hrmax=r.max,hrut2=r.ut2,
 			    hrut1=r.ut1,hrat=r.at,
 			    hrtr=r.tr,hran=r.an,ftp=r.ftp,
-                            powerperc=powerperc,powerzones=powerzones)
+                            powerperc=powerperc,powerzones=r.powerzones)
 		row = rdata(f2,rower=rr)
 		if row == 0:
 		    return HttpResponse("Error: CSV Data File Not Found")
@@ -4204,7 +4205,7 @@ def workout_summary_restore_view(request,id,message="",successmessage=""):
     rr = rrower(hrmax=r.max,hrut2=r.ut2,
 		hrut1=r.ut1,hrat=r.at,
 		hrtr=r.tr,hran=r.an,ftp=r.ftp,
-                powerperc=powerperc,powerzones=powerzones)
+                powerperc=powerperc,powerzones=r.powerzones)
     rowdata = rdata(f1,rower=rr)
     if rowdata == 0:
 	return HttpResponse("Error: CSV Data File Not Found")
@@ -4259,7 +4260,7 @@ def workout_summary_edit_view(request,id,message="",successmessage=""
     rr = rrower(hrmax=r.max,hrut2=r.ut2,
 		hrut1=r.ut1,hrat=r.at,
 		hrtr=r.tr,hran=r.an,ftp=r.ftp,
-                powerperc=powerperc,powerzones=powerzones)
+                powerperc=powerperc,powerzones=r.powerzones)
     rowdata = rdata(f1,rower=rr)
     if rowdata == 0:
 	return HttpResponse("Error: CSV Data File Not Found")
@@ -4844,7 +4845,7 @@ def strokedatajson(request,id):
         rr = rrower(hrmax=r.max,hrut2=r.ut2,
 		    hrut1=r.ut1,hrat=r.at,
 		    hrtr=r.tr,hran=r.an,ftp=r.ftp,
-                    powerperc=powerperc,powerzones=powerzones)
+                    powerperc=powerperc,powerzones=r.powerzones)
         rowdata = rdata(row.csvfilename,rower=rr).df
         
         datadf = dataprep.dataprep(rowdata,id=row.id,bands=True,barchart=True,otwpower=True,empower=True)