diff --git a/apps/users/templates/users/edit.html b/apps/users/templates/users/edit.html
index 8d8e5d6e308..e310d0cea36 100644
--- a/apps/users/templates/users/edit.html
+++ b/apps/users/templates/users/edit.html
@@ -10,7 +10,7 @@
 {% block content %}
 <div class="primary" role="main">
   {% include "messages.html" %}
-  <h1>{{ _('Account Settings') }}</h1>
+  <h2>{{ _('Account Settings') }}</h2>
   <form method="post" action="" class="user-input"
         enctype="multipart/form-data">
     {{ csrf() }}
@@ -163,7 +163,7 @@ <h1>{{ _('Account Settings') }}</h1>
           <li>
             <label for="id_display_collections_fav" class="check">
               {{ form.display_collections_fav|safe }}
-              {{ _('Display my favorite collections') }}
+              {{ _('Display collections I&quot;m following') }}
             </label>
             {{ form.display_collections_fav.errors|safe }}
           </li>
diff --git a/media/css/zamboni/tabs.css b/media/css/zamboni/tabs.css
index 1076a2c00a3..e15e9ffb115 100644
--- a/media/css/zamboni/tabs.css
+++ b/media/css/zamboni/tabs.css
@@ -77,30 +77,3 @@
     -moz-border-radius: 0 0 3px 3px;
     border-radius: 0 0 3px 3px;
 }
-
-/** Overrides for tabs within tabs *********/
-.tab-wrapper .tab-wrapper {
-    background: transparent;
-    border: 0;
-}
-
-.tab-wrapper .tab-wrapper .tab-nav {
-    position: static;
-    margin-bottom: -1px;
-}
-
-.tab-wrapper .tab-wrapper .tab-nav a {
-    color: #235;
-    font-weight: normal;
-    font-size: 12px;
-    background: #b5d9e5;
-    padding: .25em 12px;
-    border: 1px solid #26395a;
-}
-
-.tab-wrapper .tab-wrapper .tab-nav .tab-selected a {
-    color: #26395a;
-    font-weight: bold;
-    border: 1px solid #26395a;
-    border-bottom: 1px solid white;
-}
diff --git a/media/css/zamboni/zamboni.css b/media/css/zamboni/zamboni.css
index b1016e5a737..bd623fdd0ef 100644
--- a/media/css/zamboni/zamboni.css
+++ b/media/css/zamboni/zamboni.css
@@ -1188,6 +1188,7 @@ form .error .note.error {
 
 #user-profile .trans {
     width: 100%;
+    -moz-box-sizing: border-box;
 }
 
 .html-rtl #user-edit #acct-notify {