diff --git a/rowers/forms.py b/rowers/forms.py
index 3c3cef2d..c0ee89fd 100644
--- a/rowers/forms.py
+++ b/rowers/forms.py
@@ -578,6 +578,12 @@ class RegistrationForm(UserCreationForm):
         model = User
         fields = ("username", "first_name", "last_name", "email", "password1", "password2")
 
+        widgets = {
+            'username': forms.TextInput(attrs={'autocomplete':'new-password'}),
+            'password1': forms.PasswordInput(attrs={'autocomplete':'new-password'}),
+            'password2': forms.PasswordInput(attrs={'autocomplete':'new-password'}),
+            }
+
 class RegistrationFormTermsOfService(RegistrationForm):
     """
     Subclass of ``RegistrationForm`` which adds a required checkbox
diff --git a/rowers/templates/freecoach_registration_form.html b/rowers/templates/freecoach_registration_form.html
index b747e2b0..d28ca581 100644
--- a/rowers/templates/freecoach_registration_form.html
+++ b/rowers/templates/freecoach_registration_form.html
@@ -10,7 +10,11 @@
   <li class="grid_4">
     <h1>New Coach Registration (free Coach Plan)</h1>
   </li>
-  <li class="grid_2">
+  <li class="grid_4">
+    <p>
+      This form is for registration as a coach.
+      Click <a href="/rowers/register">here to register as a rower</a>.
+    </p>
     <div id="registrationform">
       
       {% if form.errors %}
@@ -19,14 +23,18 @@
       </p>
       {% endif %}
       
-      <form enctype="multipart/form-data" action="" method="post">
+      <form enctype="multipart/form-data" action="" method="post" autocomplete="off">
         {% csrf_token %}
         <table width=100%>
           {{ form.as_table }}
         </table>
-        <a href="/rowers/legal/">Terms of Service</a>
-        <input type="hidden" name="next" value="{{ next }}"/>
-        <input type="submit" value="Submit">
+	<p>
+          <a href="/rowers/legal/">Terms of Service</a>
+	</p>
+	<p>
+          <input type="hidden" name="next" value="{{ next }}"/>
+          <input type="submit" value="Submit">
+	</p>
       </form>
     </div>
   </li>
@@ -43,32 +51,6 @@
     <p>Also, we are restricting access to the site to 16 years and older
       because of EU data protection regulations.</p>
   </li>
-  <li class="rounder grid_2">
-    <a href="/rowers/coachregister">
-      <h1>Register as a coach (free)</h1>
-      <p>Click here and fill out the form to start with a free Coach plan. This allows you
-        to manage up to 10 athletes (who have to be on the Pro plan). You cannot upload your own
-        workouts.
-      </p>
-      <p>
-        From this free plan, you can upgrade to any of the paid plans, including coach plans for larger
-        athlete groups or rower plans for managing your own training plan and workouts.
-      </p>
-    </a>
-  </li>
-  <li class="rounder grid_2">
-    <a href="/rowers/register">
-      <h1>Register as an athlete (free)</h1>
-      <p>Click here and fill out the form to start with a free Athlete plan. This allows you
-        to store and analyze your own workouts.
-      </p>
-      <p>
-        From this free plan, you can upgrade to any of the paid plans, including
-        coach plans for managing larger athlete groups or rower plans for expanded
-        analytics.
-      </p>
-    </a>
-  </li>
 </ul>
   
 
diff --git a/rowers/templates/landingpage.html b/rowers/templates/landingpage.html
index d077263a..60f01d68 100644
--- a/rowers/templates/landingpage.html
+++ b/rowers/templates/landingpage.html
@@ -179,7 +179,7 @@
       </div>
       {% else %}
       <div class="signin">
-        <span style="padding:10px"><a href="/rowers/list-workouts/">Enter&nbsp;</a></span>
+        <span style="padding:10px"><a href="/rowers/list-workouts/">Launch App&nbsp;</a></span>
       </div>
       {% endif %}
       <div class="logo">
diff --git a/rowers/templates/registration_form.html b/rowers/templates/registration_form.html
index ef098e65..9619d239 100644
--- a/rowers/templates/registration_form.html
+++ b/rowers/templates/registration_form.html
@@ -8,9 +8,13 @@
 {% block main %}
 <ul class="main-content">
   <li class="grid_4">
-    <h1>New User Registration</h1>
+    <h1>New Rower Registration</h1>
   </li>
-  <li class="grid_2">
+  <li class="grid_4">
+    <p>
+      This form is for registration as a rower.
+      Click <a href="/rowers/coachregister">here to register as a coach</a>.
+    </p>
     <div id="registrationform">
       
       {% if form.errors %}
@@ -19,14 +23,18 @@
       </p>
       {% endif %}
       
-      <form enctype="multipart/form-data" action="" method="post">
+      <form enctype="multipart/form-data" action="" method="post" autocomplete="false">
         {% csrf_token %}
         <table width=100%>
           {{ form.as_table }}
         </table>
-        <a href="/rowers/legal/">Terms of Service</a>
-        <input type="hidden" name="next" value="{{ next }}"/>
-        <input type="submit" value="Submit">
+	<p>
+          <a href="/rowers/legal/">Terms of Service</a>
+	</p>
+	<p>
+          <input type="hidden" name="next" value="{{ next }}"/>
+          <input type="submit" value="Submit">
+	</p>
       </form>
     </div>
   </li>
@@ -43,32 +51,6 @@
     <p>Also, we are restricting access to the site to 16 years and older
       because of EU data protection regulations.</p>
   </li>
-  <li class="rounder grid_2">
-    <a href="/rowers/coachregister">
-      <h1>Register as a coach (free)</h1>
-      <p>Click here and fill out the form to start with a free Coach plan. This allows you
-        to manage up to 10 athletes (who have to be on the Pro plan). You cannot upload your own
-        workouts.
-      </p>
-      <p>
-        From this free plan, you can upgrade to any of the paid plans, including coach plans for larger
-        athlete groups or rower plans for managing your own training plan and workouts.
-      </p>
-    </a>
-  </li>
-  <li class="rounder grid_2">
-    <a href="/rowers/register">
-      <h1>Register as an athlete (free)</h1>
-      <p>Click here and fill out the form to start with a free Athlete plan. This allows you
-        to store and analyze your own workouts.
-      </p>
-      <p>
-        From this free plan, you can upgrade to any of the paid plans, including
-        coach plans for managing larger athlete groups or rower plans for expanded
-        analytics.
-      </p>
-    </a>
-  </li>
 </ul>
   
 
diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz
index 5a357952..953fbc06 100644
Binary files a/rowers/tests/testdata/testdata.csv.gz and b/rowers/tests/testdata/testdata.csv.gz differ
diff --git a/rowsandall_app/urls.py b/rowsandall_app/urls.py
index 6948704e..ed10f7d5 100644
--- a/rowsandall_app/urls.py
+++ b/rowsandall_app/urls.py
@@ -53,7 +53,7 @@ urlpatterns += [
                                                content_type='text/plain')),
     re_path(r'^admin/', admin.site.urls),
     re_path(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework2')),
-    re_path(r'^$',rootview),
+    re_path(r'^$',landingview),
     re_path(r'^landing/$',landingview),
     re_path(r'^getblogs/$',rowersviews.get_blog_posts),
     re_path(r'^login/',