diff --git a/browser/main/Components/HomeNavigator.jsx b/browser/main/Components/HomeNavigator.jsx
index 462853ed..c39e31f4 100644
--- a/browser/main/Components/HomeNavigator.jsx
+++ b/browser/main/Components/HomeNavigator.jsx
@@ -143,7 +143,6 @@ module.exports = React.createClass({
       return (
         <li key={'user-' + team.id}>
           <Link to='userHome' params={{userName: team.name}} className='userName'>{team.profileName} ({team.name})</Link>
-          <div className='userSetting'><i className='fa fa-gear'/></div>
         </li>
       )
     })
@@ -157,7 +156,6 @@ module.exports = React.createClass({
           <ul className='profileGroupList'>
             <li>
               <Link to='userHome' params={{userName: this.state.currentUser.name}} className='userName'>Profile ({this.state.currentUser.name})</Link>
-              <div className='userSetting'><i className='fa fa-gear'/></div>
             </li>
           </ul>
         </div>
diff --git a/browser/main/Components/TeamSettingsModal.jsx b/browser/main/Components/TeamSettingsModal.jsx
index 572b507f..8b11a5f1 100644
--- a/browser/main/Components/TeamSettingsModal.jsx
+++ b/browser/main/Components/TeamSettingsModal.jsx
@@ -264,7 +264,7 @@ module.exports = React.createClass({
           </div>
         ) : (
           <div>
-            Maximum numbr of members is 5 on Beta version. Please contact us if you want futher use.
+            Maximum number of members is 5 on Beta version. Please contact us if you want futher use.
           </div>
         )}
       </div>
diff --git a/browser/styles/main/containers/PlanetContainer.styl b/browser/styles/main/containers/PlanetContainer.styl
index 276fd180..119d2875 100644
--- a/browser/styles/main/containers/PlanetContainer.styl
+++ b/browser/styles/main/containers/PlanetContainer.styl
@@ -190,6 +190,7 @@ articleListWidth= 275px
           text-align center
           .profileImage
             margin-bottom 5px
+            circle()
           .fa
             line-height 25px
         .itemRight
diff --git a/browser/styles/main/containers/UserContainer.styl b/browser/styles/main/containers/UserContainer.styl
index bb192611..14dcb7ea 100644
--- a/browser/styles/main/containers/UserContainer.styl
+++ b/browser/styles/main/containers/UserContainer.styl
@@ -63,19 +63,12 @@
             &:hover
               background-color hoverBackgroundColor
             .userName
-              float left
               width 155px
               padding 10px 15px
               text-align left
               display block
               text-decoration none
               cursor pointer
-            .userSetting
-              float right
-              display block
-              padding 10px 0
-              width 45px
-              cursor pointer
             .createNewTeam
               btnStripDefault()
               width 100%
@@ -189,7 +182,7 @@
     .memberPopup
       absolute left
       top 235px
-      z-index popupZIndex
+      z-index 1
       padding 0 15px 10px
       width 200px
       .label
@@ -205,13 +198,15 @@
           .memberImage
             float left
             margin-right 7px
+            circle()
           .memberInfo
             float left
             .memberProfileName
               margin-bottom 5px
+              font-size 1.05em
             .memberName
               margin-left 5px
-              font-size 0.8em
+              font-size 0.9em
               color inactiveTextColor
           a:hover .memberProfileName, a:hover .memberName
             text-decoration underline
@@ -259,9 +254,10 @@
             float left
             .teamProfileName
               margin-bottom 5px
+              font-size 1.05em
             .teamName
               margin-left 5px
-              font-size 0.8em
+              font-size 0.9em
               color inactiveTextColor
           a:hover .teamProfileName, a:hover .teamName
             text-decoration underline
@@ -277,16 +273,18 @@
           .memberImage
             float left
             margin-right 7px
+            circle()
           .memberInfo
             float left
             .memberProfileName
               margin-bottom 5px
+              font-size 1.05em
               .memberRole
-                font-size 0.8em
+                font-size 0.9em
                 color inactiveTextColor
             .memberName
               margin-left 5px
-              font-size 0.8em
+              font-size 0.9em
               color inactiveTextColor
           .createTeamButton, .addMemberButton
             btnStripDefault()