diff --git a/browser/main/Containers/LoginContainer.jsx b/browser/main/Containers/LoginContainer.jsx
index 271a86e4..5d09963b 100644
--- a/browser/main/Containers/LoginContainer.jsx
+++ b/browser/main/Containers/LoginContainer.jsx
@@ -63,7 +63,7 @@ module.exports = React.createClass({
             <input className='stripInput' valueLink={this.linkState('password')} onChange={this.handleChange} type='password' placeholder='Password'/>
           </div>
           <div className='form-group'>
-            <button className='btn-primary' type='submit'><i className='fa fa-sign-in'></i> Log In</button>
+            <button className='btn-primary' type='submit'>Log In</button>
           </div>
         </form>
       </div>
diff --git a/browser/main/Containers/RegisterContainer.jsx b/browser/main/Containers/RegisterContainer.jsx
index 0efaf76a..b1898cc1 100644
--- a/browser/main/Containers/RegisterContainer.jsx
+++ b/browser/main/Containers/RegisterContainer.jsx
@@ -73,11 +73,11 @@ module.exports = React.createClass({
             <input className='stripInput' valueLink={this.linkState('profileName')} type='text' placeholder='Profile name'/>
           </div>
           <div className='form-group'>
-            <button className='btn-primary' type='submit'><i className='fa fa-sign-in'></i> Sign Up</button>
+            <button className='btn-primary' type='submit'>Sign Up</button>
           </div>
         </form>
 
-        <p>Sign Upをクリックすることで、当サイトの利用規約及びCookieの使用を含むデータに関するポリシーに同意するものとします。</p>
+        <p className='alert'>会員登録することで、当サイトの利用規約及びCookieの使用を含むデータに関するポリシーに同意するものとします。</p>
       </div>
     )
   }
diff --git a/browser/main/Mixins/OnlyGuest.js b/browser/main/Mixins/OnlyGuest.js
index 4c48aff9..0b86e2e8 100644
--- a/browser/main/Mixins/OnlyGuest.js
+++ b/browser/main/Mixins/OnlyGuest.js
@@ -4,7 +4,9 @@ var OnlyGuest = {
   componentDidMount: function () {
     if (AuthStore.check()) {
       var user = AuthStore.getUser()
-      console.log(user)
+      if (user == null) {
+        return
+      }
       var planet = user.Planets.length > 0 ? user.Planets[0] : null
       if (planet == null) {
         this.transitionTo('user', {userName: user.name})
diff --git a/browser/styles/main/containers/LoginContainer.styl b/browser/styles/main/containers/LoginContainer.styl
index 181dd1c0..6cc81069 100644
--- a/browser/styles/main/containers/LoginContainer.styl
+++ b/browser/styles/main/containers/LoginContainer.styl
@@ -4,6 +4,8 @@
   box-sizing border-box
   color inactiveTextColor
   .logo
+    width 215px
+    height 215px
     display block
     margin 0 auto
   .authNavigator
@@ -20,13 +22,16 @@
     p
       margin-bottom 25px
     .facebookBtn, .githubBtn
-      padding 20px
       margin 0 45px
+      width 75px
+      height 75px
+      line-height 75px
+      font-size 35px
+      text-align center
       background-image none
-      font-size 25px
       color white
       border none
-      circle()
+      border-radius 37.5px
       cursor pointer
     .facebookBtn
       background-color facebookColor
@@ -34,6 +39,7 @@
         background-color lighten(facebookColor, 25%)
     .githubBtn
       background-color githubBtn
+      font-size 42px
       &:hover, &.hover
         background-color lighten(githubBtn, 25%)
   .divider
@@ -53,3 +59,9 @@
         display block
         width 200px
         margin 0 auto
+        &.hover, &:hover
+          background-color brandColor
+          color white
+  p.alert
+    text-align center
+    font-size 0.8em
diff --git a/browser/styles/main/index.styl b/browser/styles/main/index.styl
index 9114fcd7..d2009801 100644
--- a/browser/styles/main/index.styl
+++ b/browser/styles/main/index.styl
@@ -52,6 +52,7 @@ button
   font-size 1em
   height 33px
   box-sizing border-box
+  transition 0.1s
   &:focus, &.focus
     border-bottom 1px solid brandBorderColor
     outline none