diff --git a/browser/main/Containers/MainContainer.jsx b/browser/main/Containers/MainContainer.jsx
index bf5802b8..45743e7a 100644
--- a/browser/main/Containers/MainContainer.jsx
+++ b/browser/main/Containers/MainContainer.jsx
@@ -73,7 +73,6 @@ module.exports = React.createClass({
             fetchPlanet(planet.userName, planet.name)
           })
         })
-
       })
       .catch(function (err) {
         if (err.status === 401) {
diff --git a/browser/main/Containers/UserContainer.jsx b/browser/main/Containers/UserContainer.jsx
index 1c2c43fd..8d19af92 100644
--- a/browser/main/Containers/UserContainer.jsx
+++ b/browser/main/Containers/UserContainer.jsx
@@ -296,7 +296,12 @@ module.exports = React.createClass({
     var teams = user.Teams == null ? [] : user.Teams.map(function (team) {
       return (
         <li key={'user-' + team.id}>
-          <Link to='userHome' params={{userName: team.name}}>{team.profileName} ({team.name})</Link>
+          <Link to='userHome' params={{userName: team.name}}>
+            <div className='teamInfo'>
+              <div className='teamProfileName'>{team.profileName}</div>
+              <div className='teamName'>@{team.name}</div>
+            </div>
+          </Link>
         </li>
       )
     })
diff --git a/browser/styles/main/containers/UserContainer.styl b/browser/styles/main/containers/UserContainer.styl
index 890e9af6..bb192611 100644
--- a/browser/styles/main/containers/UserContainer.styl
+++ b/browser/styles/main/containers/UserContainer.styl
@@ -251,8 +251,20 @@
         font-size 1.2em
         margin-bottom 15px
       .teams
-        margin-left 10px
         li
+          padding 0 10px
+          margin-bottom 15px
+          clearfix()
+          .teamInfo
+            float left
+            .teamProfileName
+              margin-bottom 5px
+            .teamName
+              margin-left 5px
+              font-size 0.8em
+              color inactiveTextColor
+          a:hover .teamProfileName, a:hover .teamName
+            text-decoration underline
           margin-bottom 10px
           font-size 1.1em
           .createTeamButton, .addMemberButton
@@ -278,11 +290,8 @@
               color inactiveTextColor
           .createTeamButton, .addMemberButton
             btnStripDefault()
-      .members .role
-        margin-left 7px
-        margin-top 2px
-        color inactiveTextColor
-        font-size 0.85em
+          a:hover .memberProfileName, a:hover .memberName
+            text-decoration underline
     .planetList
       absolute right bottom
       top 125px
@@ -300,6 +309,11 @@
         .planets
           margin-left 15px
           li
+            a
+              font-size 1.1em
+              text-decoration none
+              &:hover
+                text-decoration underline
             margin-bottom 10px
             .createPlanetButton
               btnStripDefault()