diff --git a/browser/main/HomePage/ArticleDetail.js b/browser/main/HomePage/ArticleDetail.js
index b07145de..5820ecd3 100644
--- a/browser/main/HomePage/ArticleDetail.js
+++ b/browser/main/HomePage/ArticleDetail.js
@@ -29,7 +29,8 @@ export default class ArticleDetail extends React.Component {
     super(props)
 
     this.state = {
-      article: makeInstantArticle(props.activeArticle)
+      article: makeInstantArticle(props.activeArticle),
+      previewMode: false
     }
   }
 
@@ -139,10 +140,10 @@ export default class ArticleDetail extends React.Component {
               </div>
               <div className='right'>
                 <button onClick={e => this.handleEditButtonClick(e)} className='editBtn'>
-                  <i className='fa fa-fw fa-edit'/><span className='tooltip'>Edit 編集 (e)</span>
+                  <i className='fa fa-fw fa-edit'/><span className='tooltip'>Edit (e)</span>
                 </button>
                 <button onClick={e => this.handleDeleteButtonClick(e)} className='deleteBtn'>
-                  <i className='fa fa-fw fa-trash'/><span className='tooltip'>Delete 削除 (d)</span>
+                  <i className='fa fa-fw fa-trash'/><span className='tooltip'>Delete (d)</span>
                 </button>
               </div>
             </div>
@@ -252,7 +253,7 @@ export default class ArticleDetail extends React.Component {
           <div className='right'>
             {
               this.state.article.mode === 'markdown'
-                ? (<button className='preview' onClick={e => this.handleTogglePreviewButtonClick(e)}>Toggle Preview</button>)
+                ? (<button className='preview' onClick={e => this.handleTogglePreviewButtonClick(e)}>{!this.state.previewMode ? 'Preview' : 'Edit'}</button>)
                 : null
             }
             <button onClick={e => this.handleCancelButtonClick(e)}>Cancel</button>
diff --git a/browser/main/HomePage/ArticleNavigator.js b/browser/main/HomePage/ArticleNavigator.js
index d3970d03..5f353e4a 100644
--- a/browser/main/HomePage/ArticleNavigator.js
+++ b/browser/main/HomePage/ArticleNavigator.js
@@ -59,14 +59,14 @@ export default class ArticleNavigator extends React.Component {
           <div className='userName'>local</div>
           <button onClick={e => this.handlePreferencesButtonClick(e)} className='settingBtn'>
             <i className='fa fa-fw fa-chevron-down'/>
-            <span className='tooltip'>Preferences 環境設定</span>
+            <span className='tooltip'>Preferences</span>
           </button>
         </div>
 
         <div className='controlSection'>
           <button onClick={e => this.handleNewPostButtonClick(e)} className='newPostBtn'>
             New Post
-            <span className='tooltip'>新しいポスト (⌘ + Enter or a)</span>
+            <span className='tooltip'>Create a new Post (⌘ + Enter or a)</span>
           </button>
         </div>
 
@@ -75,7 +75,7 @@ export default class ArticleNavigator extends React.Component {
             <div className='title'>Folders</div>
             <button onClick={e => this.handleNewFolderButton(e)} className='addBtn'>
               <i className='fa fa-fw fa-plus'/>
-              <span className='tooltip'>New folder 新しいフォルダー</span>
+              <span className='tooltip'>Create a new folder</span>
             </button>
           </div>
           <div className='folderList'>
diff --git a/browser/main/HomePage/ArticleTopBar.js b/browser/main/HomePage/ArticleTopBar.js
index c8363b89..9128b9b9 100644
--- a/browser/main/HomePage/ArticleTopBar.js
+++ b/browser/main/HomePage/ArticleTopBar.js
@@ -92,16 +92,16 @@ export default class ArticleTopBar extends React.Component {
                 : null
             }
             <div className={'tooltip' + (this.state.isTooltipHidden ? ' hide' : '')}>
-              - Search by tag タグで検索 : #{'{string}'}<br/>
-              - Search by folder フォルダーで検索 : in:{'{folder_name}'}
+              - Search by tag : #{'{string}'}<br/>
+              - Search by folder : in:{'{folder_name}'}
             </div>
           </div>
         </div>
         <div className='right'>
-          <button onClick={e => this.handleTutorialButtonClick(e)}>?<span className='tooltip'>How to use 使い方</span></button>
+          <button onClick={e => this.handleTutorialButtonClick(e)}>?<span className='tooltip'>How to use</span></button>
           <ExternalLink className='logo' href='http://b00st.io'>
             <img src='../../resources/favicon-230x230.png' width='44' height='44'/>
-            <span className='tooltip'>Boost official page 公式サイト</span>
+            <span className='tooltip'>Boost official page</span>
           </ExternalLink>
         </div>
       </div>
diff --git a/browser/styles/main/HomeContainer/components/ArticleDetail.styl b/browser/styles/main/HomeContainer/components/ArticleDetail.styl
index 399529e5..c9536b16 100644
--- a/browser/styles/main/HomeContainer/components/ArticleDetail.styl
+++ b/browser/styles/main/HomeContainer/components/ArticleDetail.styl
@@ -205,10 +205,10 @@ iptFocusBorderColor = #369DCD
             tooltip()
           &.editBtn .tooltip
             margin-top 25px
-            margin-left -65px
+            margin-left -45px
           &.deleteBtn .tooltip
             margin-top 25px
-            margin-left -98px
+            margin-left -73px
           &:hover
             color inherit
             .tooltip
diff --git a/browser/styles/main/HomeContainer/components/ArticleTopBar.styl b/browser/styles/main/HomeContainer/components/ArticleTopBar.styl
index e15a06c7..56e21827 100644
--- a/browser/styles/main/HomeContainer/components/ArticleTopBar.styl
+++ b/browser/styles/main/HomeContainer/components/ArticleTopBar.styl
@@ -106,7 +106,7 @@ infoBtnActiveBgColor = #3A3A3A
       transition 0.1s
       .tooltip
         tooltip()
-        margin-left -70px
+        margin-left -50px
         margin-top 29px
       &:hover
         background-color infoBtnActiveBgColor
@@ -122,7 +122,7 @@ infoBtnActiveBgColor = #3A3A3A
       .tooltip
         tooltip()
         margin-top 44px
-        margin-left -180px
+        margin-left -120px
       &:hover
         opacity 1
         .tooltip
diff --git a/package.json b/package.json
index bb941c71..7868fc02 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "boost",
-  "version": "0.4.0-alpha.6",
+  "version": "0.4.0-alpha.7",
   "description": "Boost App",
   "main": "main.js",
   "scripts": {
@@ -11,7 +11,7 @@
     "codesign": "codesign --verbose --deep --force --sign \"MAISIN solutions Inc.\" Boost-darwin-x64/Boost.app"
   },
   "config": {
-    "version": "--version=0.33.0 --app-bundle-id=com.maisin.boost",
+    "version": "--version=0.34.0 --app-bundle-id=com.maisin.boost",
     "platform": "--platform=darwin --arch=x64 --prune --icon=resources/app.icns",
     "ignore": "--ignore=Boost-darwin-x64 --ignore=node_modules/devicon/icons --ignore=submodules/ace/(?!src-min)|submodules/ace/(?=src-min-noconflict)"
   },
diff --git a/webpack.config.production.js b/webpack.config.production.js
index a7ec5e97..737e0d13 100644
--- a/webpack.config.production.js
+++ b/webpack.config.production.js
@@ -3,7 +3,7 @@ module.exports = {
   devtool: 'source-map',
   entry: {
     main: './browser/main/index.js',
-    finder: './browser/main/index.js'
+    finder: './browser/finder/index.js'
   },
   output: {
     path: 'compiled',