diff --git a/rowers/templates/coachrequestemail.html b/rowers/templates/coachrequestemail.html
index 19965e7a..58e641b6 100644
--- a/rowers/templates/coachrequestemail.html
+++ b/rowers/templates/coachrequestemail.html
@@ -13,13 +13,14 @@
   on behalf of {{ name }}.
 </p>
 <p>
-  By accepting the invite, you are agreeing with the sharing 
+  By accepting the invite, you are agreeing with the sharing
   of personal data according to our privacy policy.
 </p>
 <p>
   To accept the login to the
   site and you will find the invitation here on the Teams page:
-  <a href="{{ siteurl }}/rowers/me/teams">{{ siteurl }}/rowers/me/teams</a>
+  <a href="{{ siteurl }}/rowers/me/teams">{{ siteurl }}/rowers/me/teams</a>,
+  including the email address of {{ name }}, if you need a contact.
 </p>
 <p>
   You can also click the direct link:
diff --git a/rowers/templates/teams.html b/rowers/templates/teams.html
index 22e6ef47..be96301f 100644
--- a/rowers/templates/teams.html
+++ b/rowers/templates/teams.html
@@ -21,7 +21,7 @@
           <a href="/rowers/team/{{ team.id }}/">{{ team.name }}</a>
         </td>
         <td>
-          <a class="button small red" href="/rowers/team/{{ team.id }}/leaveconfirm/">Leave</a>
+          <a  href="/rowers/team/{{ team.id }}/leaveconfirm/">Leave</a>
         </td>
       </tr>
       {% endfor %}
@@ -29,7 +29,7 @@
     </table>
   </li>
   {% endif %}
-    
+
   {% if otherteams %}
   <li  class="grid_2">
     <h2>Open Groups</h2>
@@ -73,7 +73,7 @@
             <a href="/rowers/team/{{ team.id }}/">{{ team.name }}</a>
           </td>
           <td>
-            <a class="button small red" href="/rowers/team/{{ team.id }}/deleteconfirm/">Delete</a>
+            <a  href="/rowers/team/{{ team.id }}/deleteconfirm/">Delete</a>
           </td>
         </tr>
         {% endfor %}
@@ -98,7 +98,7 @@
 	    {{ coach.user.first_name }} {{ coach.user.last_name }}
 	  </td>
 	  <td>
-	    <a class="button small red"
+	    <a
 	       href="/rowers/coaches/{{ coach.id }}/dropcoachconfirm/">Remove
 	    </a>
 	  </td>
@@ -124,7 +124,7 @@
 	    {{ coachee.user.first_name }} {{ coachee.user.last_name }}
 	  </td>
 	  <td>
-	    <a class="button small red"
+	    <a
 	       href="/rowers/coaches/{{ coachee.id }}/dropconfirm/">Remove
 	    </a>
 	  </td>
@@ -138,11 +138,11 @@
   <li class="grid_2">
     <h2>Group Invitations and Requests</h2>
     <p>This section lists open invites to join a group. By accepting
-      a group invite, you are agreeing with the sharing 
+      a group invite, you are agreeing with the sharing
       of personal data between group members and coaches according to
       our <a href="/rowers/legal/">privacy policy</a>.
     </p>
-    
+
     <p>As a group manager, by accepting a group invite, you are agreeing
       with our <a href="/rowers/legal/">privacy policy</a> regarding groups and
       personal data owned by group members.</p>
@@ -163,10 +163,10 @@
             <td><a href="/rowers/team/{{ i.team.id }}/">{{ i.team.name }}</a></td>
             <td>{{ i.team.manager.first_name }} {{ i.team.manager.last_name }}</td>
             <td>{{ user.first_name }} {{ user.last_name }}</td>
-            <td><a class="button small green" href="/rowers/me/invitation/{{ i.code }}/">Accept</a>
+            <td><a  href="/rowers/me/invitation/{{ i.code }}/">Accept</a>
             </td>
             <td>
-              <a class="button small red" href="/rowers/me/invitation/{{ i.id }}/reject/">Reject</a>
+              <a  href="/rowers/me/invitation/{{ i.id }}/reject/">Reject</a>
             </td>
           </tr>
           {% endfor %}
@@ -184,9 +184,9 @@
             <td><a href="/rowers/team/{{ i.team.id }}/">{{ i.team.name }}</a></td>
             <td>{{ i.team.manager.first_name }} {{ i.team.manager.last_name }}</td>
             <td>{{ i.user.first_name }} {{ i.user.last_name }}</td>
-            <td><a class="button small green" href="/rowers/me/request/{{ i.code }}/">Accept</a>
+            <td><a  href="/rowers/me/request/{{ i.code }}/">Accept</a>
             <td>
-              <a class="button small red" href="/rowers/me/request/{{ i.id }}/reject/">Reject</a>
+              <a  href="/rowers/me/request/{{ i.id }}/reject/">Reject</a>
             </td>
           </tr>
           {% endfor %}
@@ -201,7 +201,7 @@
             {% endif %}
             <td>&nbsp;
             <td>
-              <a class="button small red" href="/rowers/me/invitation/{{ i.id }}/revoke/">Revoke</a>
+              <a  href="/rowers/me/invitation/{{ i.id }}/revoke/">Revoke</a>
             </td>
           </tr>
           {% endfor %}
@@ -218,7 +218,7 @@
         <table>
           {{ form.as_table }}
         </table>
-        <input class="button green" type="submit" value="Submit">
+        <input class="button" type="submit" value="Submit">
       </form>
     {% endif %}
   {% if mycoachrequests or mycoachoffers or coachoffers or coachrequests %}
@@ -226,16 +226,17 @@
     <h2>Coaching Offers and Requests</h2>
     <p>This section lists open offers and requests related to coaching.
       By accepting a coaching offer, the coach can run
-      analysis, add workouts and edit settings on behalf of the athlete. 
+      analysis, add workouts and edit settings on behalf of the athlete.
       You agree to the sharing
       of personal data between athletes and coaches according to
       our <a href="/rowers/legal/">privacy policy</a>.
-    </p>    
+    </p>
       <table width="90%" class="listtable">
         <thead>
           <tr>
             <th>Coach</th>
             <th>User</th>
+						<th>E-mail</th>
             <th>Action</th>
             <th>&nbsp;</th>
           </tr>
@@ -245,12 +246,13 @@
           <tr>
             <td>{{ i.coach.user.first_name }} {{ i.coach.user.last_name }}</td>
             <td>{{ i.user.first_name }} {{ i.user.last_name }}</td>
+						<td>{{ i.user.email }}</td>
             <td><a
-		  class="button small green"
+
 		  href="/rowers/me/coachrequest/{{ i.code }}/accept">Accept</a>
             </td>
             <td>
-              <a class="button small red" href="/rowers/me/coachrequest/{{ i.id }}/reject/">Reject</a>
+              <a  href="/rowers/me/coachrequest/{{ i.id }}/reject/">Reject</a>
             </td>
           </tr>
           {% endfor %}
@@ -261,7 +263,7 @@
             <td>&nbsp;
             </td>
             <td>
-              <a class="button small red" href="/rowers/me/coachoffer/{{ i.id }}/revoke/">Revoke</a>
+              <a  href="/rowers/me/coachoffer/{{ i.id }}/revoke/">Revoke</a>
             </td>
           </tr>
           {% endfor %}
@@ -272,7 +274,7 @@
 	    <td>&nbsp;</td>
             <td>
               <a
-		class="button small red"
+
 		href="/rowers/me/coachrequest/{{ i.id }}/revoke/">Revoke</a>
             </td>
           </tr>
@@ -282,12 +284,12 @@
             <td>{{ i.coach.user.first_name }} {{ i.coach.user.last_name }}</td>
             <td>{{ i.user.first_name }} {{ i.user.last_name }}</td>
 	    <td><a
-		  class="button small green"
+
 		  href="/rowers/me/coachoffer/{{ i.code }}/accept/">Accept</a>
 	    </td>
             <td>
               <a
-		class="button small red"
+
 		href="/rowers/me/coachoffer/{{ i.id }}/revoke/">Reject</a>
             </td>
           </tr>
@@ -312,14 +314,14 @@
             <td>{{ a.user.first_name }} {{ a.user.last_name }}</td>
             <td>
 	      <a
-		class="button small green"
+
 		href="/rowers/me/coachoffer/{{ a.user.id }}/">Offer Coaching</a>
             </td>
           </tr>
           {% endfor %}
         </tbody>
       </table>
-  </li>  
+  </li>
   {% endif %}
   {% if potentialcoaches %}
   <li class="grid_2">
@@ -337,7 +339,7 @@
             <td>{{ c.first_name }} {{ c.last_name }}</td>
             <td>
 	      <a
-		class="button small green"
+
 		href="/rowers/me/coachrequest/{{ c.id }}/">Request Coaching</a>
             </td>
           </tr>
diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
deleted file mode 100644
index d0b9235f..00000000
Binary files a/rowers/tests/testdata/testdata.tcx.gz and /dev/null differ