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/PlanetArticleDetail.jsx b/browser/main/Components/PlanetArticleDetail.jsx
index 1594fef7..a01c64c7 100644
--- a/browser/main/Components/PlanetArticleDetail.jsx
+++ b/browser/main/Components/PlanetArticleDetail.jsx
@@ -1,13 +1,13 @@
 var React = require('react/addons')
 var moment = require('moment')
 
-var CodeViewer = require('../Components/CodeViewer')
-
-var CodeEditModal = require('../Components/CodeEditModal')
-var CodeDeleteModal = require('../Components/CodeDeleteModal')
-var NoteEditModal = require('../Components/NoteEditModal')
-var NoteDeleteModal = require('../Components/NoteDeleteModal')
-var MarkdownPreview = require('../Components/MarkdownPreview')
+var CodeViewer = require('./CodeViewer')
+var CodeEditModal = require('./CodeEditModal')
+var CodeDeleteModal = require('./CodeDeleteModal')
+var NoteEditModal = require('./NoteEditModal')
+var NoteDeleteModal = require('./NoteDeleteModal')
+var MarkdownPreview = require('./MarkdownPreview')
+var ProfileImage = require('./ProfileImage')
 
 var Modal = require('../Mixins/Modal')
 var ForceUpdate = require('../Mixins/ForceUpdate')
@@ -61,18 +61,24 @@ module.exports = React.createClass({
     if (article.type === 'code') {
       return (
         <div className='PlanetArticleDetail codeDetail'>
-          <div className='viewer-header'>
-            <i className='fa fa-code fa-fw'></i> {article.callSign} <small className='updatedAt'>{moment(article.updatedAt).fromNow()}</small>
-            <span className='control-group'>
+          <div className='detailHeader'>
+            <div className='itemLeft'>
+              <ProfileImage className='profileImage' size='25' email={article.User.email}/>
+              <i className='fa fa-file-text-o fa-fw'></i>
+            </div>
+
+            <div className='itemRight'>
+              <div className='itemInfo'>{moment(article.updatedAt).fromNow()} by <span className='userProfileName'>{article.User.profileName}</span></div>
+              <div className='description'>{article.description}</div>
+              <div className='tags'><i className='fa fa-tags'/>{tags}</div>
+            </div>
+
+            <span className='itemControl'>
               <button onClick={this.openEditModal} className='btn-default btn-square btn-sm'><i className='fa fa-edit fa-fw'></i></button>
               <button onClick={this.openDeleteModal} className='btn-default btn-square btn-sm'><i className='fa fa-trash fa-fw'></i></button>
             </span>
           </div>
-          <div className='viewer-body'>
-            <div className='viewer-detail'>
-              <div className='description'>{article.description}</div>
-              <div className='tags'><i className='fa fa-tags'/>{tags}</div>
-            </div>
+          <div className='detailBody'>
             <div className='content'>
               <CodeViewer code={article.content} mode={article.mode}/>
             </div>
@@ -82,15 +88,24 @@ module.exports = React.createClass({
     }
     return (
       <div className='PlanetArticleDetail noteDetail'>
-        <div className='viewer-header'>
-          <i className='fa fa-file-text-o fa-fw'></i> {article.title} <small className='updatedAt'>{moment(article.updatedAt).fromNow()}</small>
-          <span className='control-group'>
+        <div className='detailHeader'>
+          <div className='itemLeft'>
+            <ProfileImage className='profileImage' size='25' email={article.User.email}/>
+            <i className='fa fa-file-text-o fa-fw'></i>
+          </div>
+
+          <div className='itemRight'>
+            <div className='itemInfo'>{moment(article.updatedAt).fromNow()} by <span className='userProfileName'>{article.User.profileName}</span></div>
+            <div className='description'>{article.title}</div>
+            <div className='tags'><i className='fa fa-tags'/>{tags}</div>
+          </div>
+
+          <span className='itemControl'>
             <button onClick={this.openEditModal} className='btn-default btn-square btn-sm'><i className='fa fa-edit fa-fw'></i></button>
             <button onClick={this.openDeleteModal} className='btn-default btn-square btn-sm'><i className='fa fa-trash fa-fw'></i></button>
           </span>
         </div>
-        <div className='viewer-body'>
-          <div className='tags'><i className='fa fa-tags'/>{tags}</div>
+        <div className='detailBody'>
           <MarkdownPreview className='content' content={article.content}/>
         </div>
       </div>
diff --git a/browser/main/Components/PlanetArticleList.jsx b/browser/main/Components/PlanetArticleList.jsx
index 0111c3fc..ddde09fa 100644
--- a/browser/main/Components/PlanetArticleList.jsx
+++ b/browser/main/Components/PlanetArticleList.jsx
@@ -1,5 +1,6 @@
 var React = require('react/addons')
 var ReactRouter = require('react-router')
+var Link = ReactRouter.Link
 var moment = require('moment')
 
 var ForceUpdate = require('../Mixins/ForceUpdate')
@@ -13,6 +14,31 @@ module.exports = React.createClass({
     articles: React.PropTypes.array,
     showOnlyWithTag: React.PropTypes.func
   },
+  handleArticleClikck: function (article) {
+    if (article.type === 'code') {
+      return function () {
+        var params = this.getParams()
+
+        this.transitionTo('codes', {
+          userName: params.userName,
+          planetName: params.planetName,
+          localId: article.localId
+        })
+      }.bind(this)
+    }
+
+    if (article.type === 'note') {
+      return function () {
+        var params = this.getParams()
+
+        this.transitionTo('notes', {
+          userName: params.userName,
+          planetName: params.planetName,
+          localId: article.localId
+        })
+      }.bind(this)
+    }
+  },
   render: function () {
     var articles = this.props.articles.map(function (article) {
       var tags = article.Tags.length > 0 ? article.Tags.map(function (tag) {
@@ -28,24 +54,15 @@ module.exports = React.createClass({
       var handleClick
 
       if (article.type === 'code') {
-
-        handleClick = function () {
-          this.transitionTo('codes', {
-            userName: params.userName,
-            planetName: params.planetName,
-            localId: article.localId
-          })
-        }.bind(this)
-
         return (
-          <li onClick={handleClick} key={'code-' + article.id}>
+          <li onClick={this.handleArticleClikck(article)} key={'code-' + article.id}>
             <div className={'articleItem' + (isActive ? ' active' : '')}>
               <div className='itemLeft'>
                 <ProfileImage className='profileImage' size='25' email={article.User.email}/>
                 <i className='fa fa-code fa-fw'></i>
               </div>
               <div className='itemRight'>
-                <div className='updatedAt'>{moment(article.updatedAt).fromNow()}</div>
+                <div className='itemInfo'>{moment(article.updatedAt).fromNow()} by <span className='userProfileName'>{article.User.profileName}</span></div>
                 <div className='description'>{article.description.length > 50 ? article.description.substring(0, 50) + ' …' : article.description}</div>
                 <div className='tags'><i className='fa fa-tags'/>{tags}</div>
               </div>
@@ -55,16 +72,8 @@ module.exports = React.createClass({
         )
       }
 
-      handleClick = function () {
-        this.transitionTo('notes', {
-          userName: params.userName,
-          planetName: params.planetName,
-          localId: article.localId
-        })
-      }.bind(this)
-
       return (
-        <li onClick={handleClick} key={'note-' + article.id}>
+        <li onClick={this.handleArticleClikck(article)} key={'note-' + article.id}>
           <div className={'articleItem blueprintItem' + (isActive ? ' active' : '')}>
             <div className='itemLeft'>
               <ProfileImage className='profileImage' size='25' email={article.User.email}/>
@@ -72,7 +81,7 @@ module.exports = React.createClass({
             </div>
 
             <div className='itemRight'>
-              <div className='updatedAt'>{moment(article.updatedAt).fromNow()}</div>
+              <div className='itemInfo'>{moment(article.updatedAt).fromNow()} by <span className='userProfileName'>{article.User.profileName}</span></div>
               <div className='description'>{article.title}</div>
               <div className='tags'><i className='fa fa-tags'/>{tags}</div>
             </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..6b498aac 100644
--- a/browser/styles/main/containers/PlanetContainer.styl
+++ b/browser/styles/main/containers/PlanetContainer.styl
@@ -10,7 +10,7 @@ articleListWidth= 275px
       margin 0 2px
       text-decoration underline
       cursor pointer
-      font-size 0.9em
+      font-size 0.95em
       &.noTag
         color inactiveTextColor
         font-size 0.8em
@@ -178,33 +178,50 @@ articleListWidth= 275px
     overflow-y auto
     li
       .articleItem
-        user-select none
         border solid 2px transparent
-        padding 10px
+        position relative
+        height 94px
+        width 100%
         cursor pointer
         transition 0.1s
-        clearfix()
         .itemLeft
-          float left
-          width 25px
+          position absolute
+          top 4px
+          bottom 4px
+          width 38px
+          padding 3px 0 3px 3px
           text-align center
           .profileImage
             margin-bottom 5px
+            circle()
           .fa
             line-height 25px
         .itemRight
-          float left
-          width 225px
+          position absolute
+          top 4px
+          bottom 4px
+          right 2px
+          left 40px
           overflow-x hidden
-          padding-left 10px
-          .updatedAt
-            margin-bottom 10px
+          padding 3px 10px 3px 3px
+          .itemInfo
+            margin 5px 0 13px
             color lighten(textColor, 25%)
             font-size 0.7em
+            .userProfileName
+              color brandColor
+              font-size 1.2em
           .description
             line-height 120%
-            margin-bottom 15px
+            margin-bottom 10px
             font-size 1em
+            overflow-x hidden
+            white-space nowrap
+            text-overflow ellipsis
+          .tags
+            position absolute
+            bottom 5px
+            font-size 0.9em
         &:hover, &.hover
           background-color hoverBackgroundColor
           &:active, &.active
@@ -218,57 +235,71 @@ articleListWidth= 275px
   absolute right bottom
   top 55px
   left navigationWidth + articleListWidth
-  &>.viewer-header
-    height 44px
-    line-height 44px
-    padding 0 15px
-    box-sizing border-box
-    font-size 1.2em
-    small
-      font-size 0.8em
-      color lighten(textColor, 25%)
-    .control-group
-      float right
-      button
-        margin 10px 3px
-  .viewer-body
-    absolute bottom right
-    left 1px
-    top 44px
-  &.codeDetail>.viewer-body
-    .viewer-detail
-      border-bottom solid 1px borderColor
-      height 150px
-      box-sizing border-box
-      padding 10px
+  .detailHeader
+    border solid 2px transparent
+    position relative
+    height 105px
+    width 100%
+    transition 0.1s
+    .itemLeft
+      position absolute
+      top 7px
+      bottom 4px
+      width 38px
+      padding 3px 0 3px 3px
+      text-align center
+      .profileImage
+        margin-bottom 5px
+        circle()
+      .fa
+        line-height 25px
+    .itemRight
+      position absolute
+      top 7px
+      bottom 4px
+      right 2px
+      left 40px
+      overflow-x hidden
+      padding 3px 10px 3px 3px
+      .itemInfo
+        margin 5px 0 13px
+        color lighten(textColor, 25%)
+        font-size 0.7em
+        .userProfileName
+          color brandColor
+          font-size 1.2em
       .description
-        height 100px
-        line-height 1.4em
-        overflow-y auto
+        line-height 120%
+        margin-bottom 10px
+        font-size 1em
+        overflow-x auto
+        white-space nowrap
       .tags
         position absolute
-        left 15px
-        right 15px
-        top 120px
-    .content
-      .ace_editor
-        absolute left right
-        top 155px
         bottom 5px
-  &.noteDetail>.viewer-body
-    .tags
-      absolute top
-      left 15px
-      right 15px
-      height 24px
-      line-height 24px
+        font-size 0.9em
+    .itemControl
+      position absolute
+      z-index 1
+      top 2px
+      right 2px
+  .detailBody
+    absolute left right bottom
+    top 105px
     .content
-      absolute left right bottom
-      top 30px
       box-sizing border-box
       padding 5px
       border-top solid 1px borderColor
-      padding 10px
       overflow-x hidden
       overflow-y auto
+  &.noteDetail
+    .detailBody .content
       marked()
+  &.codeDetail
+    .detailBody .content
+      .ace_editor
+        position absolute
+        top 5px
+        bottom 5px
+        left 2px
+        right 2px
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()
diff --git a/browser/styles/main/index.styl b/browser/styles/main/index.styl
index 0a54beeb..a5cb7a2a 100644
--- a/browser/styles/main/index.styl
+++ b/browser/styles/main/index.styl
@@ -105,14 +105,16 @@ textarea.block-input
     z-index 2000
     bottom 5px
     right 53px
-    btnDefault()
+    btnPrimary()
     padding 10px 15px
     border-radius 5px
+    background-color backgroundColor
   .contactButton
     position fixed
     z-index 2000
     bottom 5px
     right 5px
-    btnDefault()
+    btnPrimary()
     padding 10px 15px
     border-radius 5px
+    background-color backgroundColor
diff --git a/browser/styles/mixins/marked.styl b/browser/styles/mixins/marked.styl
index 4e7beb05..891dc258 100644
--- a/browser/styles/mixins/marked.styl
+++ b/browser/styles/mixins/marked.styl
@@ -64,7 +64,7 @@ marked()
     padding 5px
     border solid 1px borderColor
     border-radius 5px
-    margin 0.5em 0
+    margin-bottom 0.5em
     overflow-x auto
     &>code
       padding 0
diff --git a/package.json b/package.json
index 37562ab7..5e1b80a3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "boost",
-  "version": "0.2.1",
+  "version": "0.2.1.1",
   "description": "Boost App",
   "main": "main.js",
   "scripts": {