diff --git a/webapp/components/admin_console/admin_navbar_dropdown.jsx b/webapp/components/admin_console/admin_navbar_dropdown.jsx
index 37b8f21353..a923efc70e 100644
--- a/webapp/components/admin_console/admin_navbar_dropdown.jsx
+++ b/webapp/components/admin_console/admin_navbar_dropdown.jsx
@@ -53,13 +53,6 @@ export default class AdminNavbarDropdown extends React.Component {
         var teams = [];
 
         if (this.state.teamMembers && this.state.teamMembers.length > 0) {
-            teams.push(
-                <li
-                    key='teamDiv'
-                    className='divider'
-                ></li>
-            );
-
             for (var index in this.state.teamMembers) {
                 if (this.state.teamMembers.hasOwnProperty(index)) {
                     var teamMember = this.state.teamMembers[index];
@@ -69,12 +62,23 @@ export default class AdminNavbarDropdown extends React.Component {
                             <Link
                                 to={'/' + team.name + '/channels/town-square'}
                             >
+                                <FormattedMessage
+                                    id='navbar_dropdown.switchTo'
+                                    defaultMessage='Switch to '
+                                />
                                 {team.display_name}
                             </Link>
                         </li>
                     );
                 }
             }
+
+            teams.push(
+                <li
+                    key='teamDiv'
+                    className='divider'
+                ></li>
+            );
         }
 
         return (
@@ -99,20 +103,18 @@ export default class AdminNavbarDropdown extends React.Component {
                         className='dropdown-menu'
                         role='menu'
                     >
+                        {teams}
                         <li>
                             <Link
                                 to={'/select_team'}
                             >
+                                <i className='fa fa-exchange'/>
                                 <FormattedMessage
                                     id='admin.nav.switch'
-                                    defaultMessage='Switch to {display_name}'
-                                    values={{
-                                        display_name: global.window.mm_config.SiteName
-                                    }}
+                                    defaultMessage='Switch Teams'
                                 />
                             </Link>
                         </li>
-                        {teams}
                         <li
                             key='teamDiv'
                             className='divider'
diff --git a/webapp/components/login/login.jsx b/webapp/components/login/login.jsx
index 8dbcf33ac8..fa86adaed1 100644
--- a/webapp/components/login/login.jsx
+++ b/webapp/components/login/login.jsx
@@ -291,7 +291,10 @@ export default class Login extends React.Component {
 
         if (global.window.mm_config.EnableOpenServer === 'true') {
             loginControls.push(
-                <div key='signup'>
+                <div
+                    className='form-group'
+                    key='signup'
+                >
                     <span>
                         <FormattedMessage
                             id='login.noAccount'
diff --git a/webapp/components/navbar_dropdown.jsx b/webapp/components/navbar_dropdown.jsx
index a2592787c7..2c67bbdf35 100644
--- a/webapp/components/navbar_dropdown.jsx
+++ b/webapp/components/navbar_dropdown.jsx
@@ -218,6 +218,10 @@ export default class NavbarDropdown extends React.Component {
                                 <Link
                                     to={'/' + team.name + '/channels/town-square'}
                                 >
+                                    <FormattedMessage
+                                        id='navbar_dropdown.switchTo'
+                                        defaultMessage='Switch to '
+                                    />
                                     {team.display_name}
                                 </Link>
                             </li>
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index fcbfc7cbbd..17554f9a68 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -348,7 +348,7 @@
   "admin.nav.help": "Help",
   "admin.nav.logout": "Logout",
   "admin.nav.report": "Report a Problem",
-  "admin.nav.switch": "Switch to {display_name}",
+  "admin.nav.switch": "Switch Teams",
   "admin.privacy.false": "false",
   "admin.privacy.save": "Save",
   "admin.privacy.saving": "Saving Config...",
@@ -1039,6 +1039,7 @@
   "navbar_dropdown.accountSettings": "Account Settings",
   "navbar_dropdown.console": "System Console",
   "navbar_dropdown.create": "Create a New Team",
+  "navbar_dropdown.switchTo": "Switch to ",
   "navbar_dropdown.help": "Help",
   "navbar_dropdown.integrations": "Integrations",
   "navbar_dropdown.inviteMember": "Invite New Member",
diff --git a/webapp/sass/components/_dropdown.scss b/webapp/sass/components/_dropdown.scss
index 1168c9b27e..5ed0bca61d 100644
--- a/webapp/sass/components/_dropdown.scss
+++ b/webapp/sass/components/_dropdown.scss
@@ -6,6 +6,11 @@
         z-index: 2500;
     }
 
+    .fa {
+        @include opacity(.6);
+        margin-right: 5px;
+    }
+
     .divider {
         @include opacity(.15);
     }
diff --git a/webapp/sass/layout/_post.scss b/webapp/sass/layout/_post.scss
index 6cffb39663..07a78adfeb 100644
--- a/webapp/sass/layout/_post.scss
+++ b/webapp/sass/layout/_post.scss
@@ -506,6 +506,7 @@ body.ios {
             height: 26px;
             line-height: 25px;
             padding: 0 7px;
+            width: auto;
 
             .post-image__thumbnail {
                 display: none;
diff --git a/webapp/sass/responsive/_mobile.scss b/webapp/sass/responsive/_mobile.scss
index c7d094c672..cde58b45a8 100644
--- a/webapp/sass/responsive/_mobile.scss
+++ b/webapp/sass/responsive/_mobile.scss
@@ -147,10 +147,6 @@
 
         &.same--root {
             &.same--user {
-                .post__time {
-                    display: none;
-                }
-
                 .post__header {
                     height: auto;
                     margin-top: 5px;
@@ -286,7 +282,7 @@
     .signup-team__container {
         font-size: .9em;
         margin-bottom: 30px;
-        padding: 30px 0;
+        padding: 60px 10px 0;
 
         .signup-team__name {
             font-size: 2em;
@@ -1021,9 +1017,8 @@
 
 @media screen and (max-height: 640px) {
     .signup-team__container {
-        padding: 30px 0;
-        margin-bottom: 30px;
         font-size: .9em;
+        margin-bottom: 30px;
 
         .signup-team__name {
             font-size: 2em;
diff --git a/webapp/sass/routes/_admin-console.scss b/webapp/sass/routes/_admin-console.scss
index a4c8621c88..0164f485e6 100644
--- a/webapp/sass/routes/_admin-console.scss
+++ b/webapp/sass/routes/_admin-console.scss
@@ -7,8 +7,10 @@
     overflow: auto;
     padding: 0 20px;
 
-    > div {
-        height: 100%;
+    .dropdown-menu {
+        .divider {
+            @include opacity(1);
+        }
     }
 
     .inner-wrap {
@@ -23,6 +25,11 @@
         padding-bottom: .5em;
     }
 
+    h4 {
+        font-weight: 600;
+        margin-bottom: 2em;
+    }
+
     .form-control {
         background-color: $white;
         border: 1px solid $light-gray;
@@ -240,6 +247,10 @@
     width: 220px;
     z-index: 5;
 
+    .dropdown-menu {
+        min-width: 200px;
+    }
+
     .team__header {
         background: transparent;
     }
@@ -271,6 +282,12 @@
         }
     }
 
+    .sidebar-section {
+        > .sidebar-section-title {
+            position: relative;
+        }
+    }
+
     .sidebar-section-title {
         padding: 5px 35px 5px 15px;
     }