diff --git a/rowers/templates/base.html b/rowers/templates/base.html
index 1ae12339..1cc6815c 100644
--- a/rowers/templates/base.html
+++ b/rowers/templates/base.html
@@ -32,53 +32,65 @@
       <div class="grid_12">
         <div id="logo" class="grid_6 alpha">
 	  {% if user.rower.rowerplan == 'pro' or user.rower.rowerplan == 'coach' %}
-	  <p><a href="/"><img src="/static/img/logo5.png" 
+	  <p><a href="/"><img src="/static/img/logo7.png" 
 		              alt="Rowsandall logo" height="80"></a></p>
 	  {% else %}
-	  <p><a href="/"><img src="/static/img/logo5.png" 
+	  <p><a href="/"><img src="/static/img/logo7.png" 
 		              alt="Rowsandall logo" height="80"></a></p>
 	  {% endif %}
         </div>
         <div class="grid_6 omega">
-          <div class="grid_1 prefix_2 alpha">
-	    <p id="header">
-	      <a class="button gray small" href="/rowers/videos">Videos</a></p>
-	  </div>
-	  <div class="grid_2">
-            <p id="header">
-              <a class="button gray small" href="http://analytics.rowsandall.com/">Rowing Analytics BLOG</a></p>
+          <div class="grid_4 alpha">
+            <div class="grid_1 alpha">
+	      <p id="header">
+	        <a class="button gray small" href="/rowers/videos">Videos</a></p>
+	    </div>
+	    <div class="grid_2">
+              <p id="header">
+                <a class="button gray small" href="http://analytics.rowsandall.com/">Rowing Analytics BLOG</a></p>
+            </div>
+            <div class="grid_1 omega">
+	      <p id="header">
+	      <a class="button gray small" href="/rowers/email">Contact</a>
+              </p>
+	    </div>
+            <div class="grid_4 alpha">
+	      <p>Free Data and Analysis. For Rowers. By Rowers.</p>
+	    </div>
+          </div>
+
+          <div class="grid_1">
+	    <div class="grid_1 tooltip">
+	      {% if user.is_authenticated %}
+	      <p>
+	        <a class="button gray small" href="/rowers/me/edit">{{ user.first_name }}</a>
+	      </p>
+	      <span class="tooltiptext">Edit user account, e.g. heart rate zones, power zones, email, teams</span>
+              
+	      {% else %}
+	      <p><a class="button gray small" href="{% url 'login' %}">login</a> </p>
+	      {% endif %}
+	    </div>
+            <div class="grid_1">
+	      {% if user.is_authenticated %}
+	      <p><a class="button gray small" href="{% url 'logout' %}">logout</a></p>
+	      {% else %}
+	      <p>&nbsp</p>
+	      {% endif %}
+            </div>
           </div>
           <div class="grid_1 omega">
-	    <p id="header">
-	      <a class="button gray small" href="/rowers/email">Contact</a>
-            </p>
-	  </div>
+	    {% if user.rower.rowerplan == 'pro' or user.rower.rowerplan == 'coach' %}
+	    <h6 class="graytext">Pro Member</h6>
+	    {% else %}
+	    <div class="grid_1"><a class="button green small" href="/rowers/promembership">Upgrade to Pro</a></div>
+	    {% endif %}
+          </div>
         </div>
       </div>
       
-      <div class="grid_12">
-	<div class="grid_4 suffix_2 alpha">
-	  <p>Free Data and Analysis. For Rowers. By Rowers.</p>
-	</div>
-	<div class="grid_3 prefix_2">
-	  {% if user.rower.rowerplan == 'pro' or user.rower.rowerplan == 'coach' %}
-	  <h6 class="graytext">Pro Member</h6>
-	  {% else %}
-	  <div class="grid_2 prefix_1 alpha"><a class="button green small" href="/rowers/promembership">Upgrade to Pro</a></div>
-	  {% endif %}
-	</div>
-	<div class="grid_1 omega">
-	  {% if user.is_authenticated %}
-	  <p><a class="button gray small" href="{% url 'logout' %}">logout</a></p>
-          
-	  {% else %}
-	  <p>&nbsp</p>
-	  {% endif %}
-          
-	</div>
-      </div>
       
-      <div class="grid_12" omega>
+      <div class="grid_12">
 	<div class="grid_1 alpha tooltip">
 	  {% if user.is_authenticated %}
 	  <p><a class="button gray small" href="/rowers/workout/upload/">Upload</a></p>
@@ -107,7 +119,7 @@
 	  <p>&nbsp;</p>
 	  {% endif %}
 	</div>
-	<div class="grid_2 tooltip">
+	<div class="grid_1 tooltip">
 	  {% if user.is_authenticated %}
 	  <p>
 	    <a class="button gray small" href="/rowers/list-graphs/">Graphs</a>
@@ -156,17 +168,6 @@
 	  <p>&nbsp;</p>
 	  {% endif %}
         </div>
-	<div class="grid_1 prefix_2 omega tooltip">
-	  {% if user.is_authenticated %}
-	  <p>
-	    <a class="button gray small" href="/rowers/me/edit">{{ user.first_name }}</a>
-	  </p>
-	  <span class="tooltiptext">Edit user account, e.g. heart rate zones, power zones, email, teams</span>
-          
-	  {% else %}
-	  <p><a class="button gray small" href="{% url 'login' %}">login</a> </p>
-	  {% endif %}
-	</div>
       </div>
 
 	
diff --git a/rowers/templates/basefront.html b/rowers/templates/basefront.html
index b6fe98fa..8a73c255 100644
--- a/rowers/templates/basefront.html
+++ b/rowers/templates/basefront.html
@@ -50,10 +50,10 @@
       <div class="grid_12">
         <div id="logo" class="grid_6 alpha">
 	  {% if user.rower.rowerplan == 'pro' or user.rower.rowerplan == 'coach' %}
-	  <p><a href="/"><img src="/static/img/logo5.png" 
+	  <p><a href="/"><img src="/static/img/logo7.png" 
 		              alt="Rowsandall logo" height="80"></a></p>
 	  {% else %}
-	  <p><a href="/"><img src="/static/img/logo5.png" 
+	  <p><a href="/"><img src="/static/img/logo7.png" 
 		              alt="Rowsandall logo" height="80"></a></p>
 	  {% endif %}
         </div>
@@ -146,7 +146,19 @@
 	  {% endif %}
 	</div>
         <div class="grid_1 tooltip">
-          {% if user.is_authenticated and user.rower.team.all %}
+          {% if user.is_authenticated and teams %}
+          <div class="grid_1 alpha dropdown">
+              <button class="grid_1 alpha button gray small dropbtn">
+                Teams
+              </button>
+              <div class="dropdown-content">
+            {% for t in teams %}
+            <a class="button gray small" href="/rowers/list-workouts/team/{{ t.id }}/">{{ t.name }}</a>
+            {% endfor %}
+              </div>
+            </div>
+          <span class="tooltiptext">See recent workouts for your team</span>
+          {% elif user.is_authenticated and user.rower.team.all %}
           <div class="grid_1 alpha dropdown">
               <button class="grid_1 alpha button gray small dropbtn">
                 Teams
diff --git a/static/img/logo7.jpg b/static/img/logo7.jpg
new file mode 100644
index 00000000..cd640b55
Binary files /dev/null and b/static/img/logo7.jpg differ
diff --git a/static/img/logo7.png b/static/img/logo7.png
new file mode 100644
index 00000000..a9f1493e
Binary files /dev/null and b/static/img/logo7.png differ
diff --git a/static/img/logo701.jpg b/static/img/logo701.jpg
new file mode 100644
index 00000000..9e7742a9
Binary files /dev/null and b/static/img/logo701.jpg differ