diff --git a/browser/components/TagSelect.js b/browser/components/TagSelect.js
index dbbc456f..2e631bef 100644
--- a/browser/components/TagSelect.js
+++ b/browser/components/TagSelect.js
@@ -1,7 +1,6 @@
 import React, { PropTypes } from 'react'
 import ReactDOM from 'react-dom'
 import _ from 'lodash'
-import linkState from '../lib/linkState'
 
 function isNotEmptyString (str) {
   return _.isString(str) && str.length > 0
@@ -164,5 +163,3 @@ TagSelect.propTypes = {
   onChange: PropTypes.func,
   suggestTags: PropTypes.array
 }
-
-TagSelect.prototype.linkState = linkState
diff --git a/browser/lib/linkState.js b/browser/lib/linkState.js
deleted file mode 100644
index 2b874615..00000000
--- a/browser/lib/linkState.js
+++ /dev/null
@@ -1,36 +0,0 @@
-function getIn (object, path) {
-  let stack = path.split('.')
-  while (stack.length > 1) {
-    object = object[stack.shift()]
-  }
-  return object[stack.shift()]
-}
-
-function updateIn (object, path, value) {
-  let current = object
-  let stack = path.split('.')
-  while (stack.length > 1) {
-    current = current[stack.shift()]
-  }
-  current[stack.shift()] = value
-  return object
-}
-
-function setPartialState (component, path, value) {
-  component.setState(
-    updateIn(component.state, path, value))
-}
-
-export default function linkState (path) {
-  return {
-    value: getIn(this.state, path),
-    requestChange: setPartialState.bind(null, this, path)
-  }
-}
-
-export function linkState2 (el, path) {
-  return {
-    value: getIn(el.state, path),
-    requestChange: setPartialState.bind(null, el, path)
-  }
-}
diff --git a/browser/main/ArticleDetail/index.js b/browser/main/ArticleDetail/index.js
index cafc2875..1db13315 100644
--- a/browser/main/ArticleDetail/index.js
+++ b/browser/main/ArticleDetail/index.js
@@ -2,11 +2,10 @@ import React, { PropTypes } from 'react'
 import ReactDOM from 'react-dom'
 import moment from 'moment'
 import _ from 'lodash'
-import linkState from 'browser/lib/linkState'
 import TagSelect from 'browser/components/TagSelect'
 import ModeSelect from 'browser/components/ModeSelect'
 import ShareButton from './ShareButton'
-import { openModal, isModalOpen } from 'browser/lib/modal'
+import { openModal, isModalOpen } from 'browser/main/lib/modal'
 import DeleteArticleModal from '../modals/DeleteArticleModal'
 import ArticleEditor from './ArticleEditor'
 const electron = require('electron')
@@ -338,4 +337,3 @@ ArticleDetail.propTypes = {
   dispatch: PropTypes.func,
   repositories: PropTypes.array
 }
-ArticleDetail.prototype.linkState = linkState
diff --git a/browser/main/ArticleTopBar.js b/browser/main/ArticleTopBar.js
index 9e7c4cc2..bb33becb 100644
--- a/browser/main/ArticleTopBar.js
+++ b/browser/main/ArticleTopBar.js
@@ -1,107 +1,20 @@
 import React, { PropTypes } from 'react'
 import ReactDOM from 'react-dom'
 import ExternalLink from 'browser/components/ExternalLink'
-import { isModalOpen } from 'browser/lib/modal'
 import activityRecord from 'browser/lib/activityRecord'
 
-const electron = require('electron')
-const ipc = electron.ipcRenderer
-
-const OSX = global.process.platform === 'darwin'
-
-const BRAND_COLOR = '#18AF90'
-
-const searchTutorialElement = (
-  <svg width='750' height='300' className='tutorial'>
-    <text x='125' y='63' fill={BRAND_COLOR} fontSize='24'>Search some posts!!</text>
-    <text x='125' y='90' fill={BRAND_COLOR} fontSize='18'>{'- Search by tag : #{string}'}</text>
-    <text x='125' y='115' fill={BRAND_COLOR} fontSize='18'>
-    {'- Search by folder : /{folder_name}\n'}</text>
-    <text x='140' y='135' fill={BRAND_COLOR} fontSize='14'>
-    {'exact match : //{folder_name}'}</text>
-
-    <svg x='90' width='500' height='300'>
-      <path fill='white' d='M27.2,6.9c-1.7,3.5-6,4.8-8,8.2c-1.8,3.1-2.1,6.8-1.8,10.2c0.7,7,4.2,16.7,10.3,20.7c0.5,0.4,1.4,0.2,1.8-0.2
-        c0.1-0.1,0.2-0.2,0.3-0.3c0.6-0.6,0.6-1.5,0-2.1c-0.2-0.2-0.3-0.4-0.5-0.5c-1.3-1.4-3.2,0.7-1.9,2.1c0.2,0.2-0.3,0.4,0.7,0.5
-        c0-0.7,0-1.4,0-2.1c0,0.1-0.4,0.2-0.5,0.3c0.6-0.1,1.1-0.2,1.7-0.2c-5.7-3.7-9.2-14.5-9-20.9c0.1-4,1.6-6.7,4.8-9.1
-        c2-1.5,3.6-2.6,4.7-4.9C30.6,6.7,28,5.2,27.2,6.9L27.2,6.9z'/>
-      <path fill='white' d='M9.5,24.4c2.4-2.7,4.9-5.4,7.3-8c2.5-2.8,5.7-7.6,9.9-7.8c-0.5-0.5-1-1-1.5-1.5c0.1,6.8,1.9,13.1,5.3,18.9
-        c1,1.7,3.6,0.2,2.6-1.5c-3.2-5.4-4.8-11.1-4.9-17.4c0-0.8-0.7-1.5-1.5-1.5c-3.6,0.2-5.9,2.1-8.3,4.7c-3.7,3.9-7.3,8-11,12
-        C6.1,23.7,8.2,25.9,9.5,24.4L9.5,24.4z'/>
-    </svg>
-  </svg>
-)
-
-const newPostTutorialElement = (
-  <svg width='900' height='900' className='tutorial'>
-    <text x='470' y='50' fill={BRAND_COLOR} fontSize='24'>Create a new post!!</text>
-    <text x='490' y='75' fill={BRAND_COLOR} fontSize='16' children={`press \`${OSX ? '⌘' : '^'} + n\``}/>
-    <svg x='415' y='20' width='400' height='400'>
-      <path fill='white' d='M11.6,14.7c1,5.5,2.9,10.7,5.7,15.5c1,1.7,3.5,0.2,2.6-1.5c-2.6-4.7-4.4-9.6-5.4-14.8
-        C14.1,12,11.3,12.8,11.6,14.7L11.6,14.7z'/>
-      <path fill='white' d='M16.8,17.1c4,0.2,7.6-1.1,10.7-3.6c1.5-1.2-0.6-3.3-2.1-2.1c-2.4,2-5.4,2.9-8.6,2.7C14.9,14,14.9,17,16.8,17.1
-        L16.8,17.1z'/>
-      <path fill='white' d='M13.8,17.6c11.9,3.5,24.1,4.9,36.4,3.9c1.9-0.1,1.9-3.1,0-3c-12.1,0.9-24-0.3-35.6-3.8
-        C12.7,14.1,11.9,17,13.8,17.6L13.8,17.6z'/>
-    </svg>
-  </svg>
-)
+const OSX = process.platform === 'darwin'
 
 export default class ArticleTopBar extends React.Component {
   constructor (props) {
     super(props)
 
-    this.saveAllHandler = e => {
-      if (isModalOpen()) return true
-      this.handleSaveAllButtonClick(e)
-    }
-    this.focusSearchHandler = e => {
-      if (isModalOpen()) return true
-      this.focusInput(e)
-    }
-    this.newPostHandler = e => {
-      if (isModalOpen()) return true
-      this.handleNewPostButtonClick(e)
-    }
-
     this.state = {
       isTooltipHidden: true,
       isLinksDropdownOpen: false
     }
   }
 
-  componentDidMount () {
-    this.searchInput = ReactDOM.findDOMNode(this.refs.searchInput)
-    this.linksButton = ReactDOM.findDOMNode(this.refs.links)
-    this.showLinksDropdown = e => {
-      e.preventDefault()
-      e.stopPropagation()
-      if (!this.state.isLinksDropdownOpen) {
-        this.setState({isLinksDropdownOpen: true})
-      }
-    }
-    // this.linksButton.addEventListener('click', this.showLinksDropdown)
-    this.hideLinksDropdown = e => {
-      if (this.state.isLinksDropdownOpen) {
-        this.setState({isLinksDropdownOpen: false})
-      }
-    }
-    document.addEventListener('click', this.hideLinksDropdown)
-
-    // ipc.on('top-save-all', this.saveAllHandler)
-    ipc.on('top-focus-search', this.focusSearchHandler)
-    ipc.on('top-new-post', this.newPostHandler)
-  }
-
-  componentWillUnmount () {
-    document.removeEventListener('click', this.hideLinksDropdown)
-    this.linksButton.removeEventListener('click', this.showLinksDropdown())
-
-    // ipc.removeListener('top-save-all', this.saveAllHandler)
-    ipc.removeListener('top-focus-search', this.focusSearchHandler)
-    ipc.removeListener('top-new-post', this.newPostHandler)
-  }
-
   handleTooltipRequest (e) {
     if (this.searchInput.value.length === 0 && (document.activeElement === this.searchInput)) {
       this.setState({isTooltipHidden: false})
@@ -126,10 +39,6 @@ export default class ArticleTopBar extends React.Component {
   }
 
   handleSearchChange (e) {
-    let { dispatch } = this.props
-
-    // dispatch(setSearchFilter(e.target.value))
-    this.handleTooltipRequest()
   }
 
   handleSearchClearButton (e) {
@@ -206,22 +115,6 @@ export default class ArticleTopBar extends React.Component {
               : null
           }
         </div>
-
-        {false ? (
-          <div className='tutorial'>
-            <div onClick={(e) => this.handleTutorialButtonClick(e)} className='clickJammer'/>
-            <svg width='500' height='250' className='finder'>
-              <text x='100' y='25' fontSize='32' fill={BRAND_COLOR}>Also, you can open Finder!!</text>
-              <text x='150' y='55' fontSize='18' fill={BRAND_COLOR} children={'with pressing ' + (OSX ? '`⌘ + Alt + s`' : '`Win + Alt + s`')}/>
-            </svg>
-            <svg width='450' className='global'>
-              <text x='100' y='45' fontSize='24' fill={BRAND_COLOR}>Hope you to enjoy our app :D</text>
-              <text x='50' y='75' fontSize='18' fill={BRAND_COLOR}>Press any key or click to escape tutorial mode</text>
-            </svg>
-            <div className='back'></div>
-          </div>
-        ) : null}
-
       </div>
     )
   }
diff --git a/browser/main/SideNav/RepositorySection.js b/browser/main/SideNav/RepositorySection.js
index e3ba2600..617ce8a5 100644
--- a/browser/main/SideNav/RepositorySection.js
+++ b/browser/main/SideNav/RepositorySection.js
@@ -57,7 +57,7 @@ class RepositorySection extends React.Component {
 
   handleContextButtonClick (e) {
     e.stopPropagation()
-    var menu = new Menu()
+    let menu = new Menu()
     menu.append(new MenuItem({
       label: 'New Folder',
       click: () => this.handleNewFolderButtonClick()
diff --git a/browser/main/SideNav/index.js b/browser/main/SideNav/index.js
index 6cd56c8a..4c062e05 100644
--- a/browser/main/SideNav/index.js
+++ b/browser/main/SideNav/index.js
@@ -1,7 +1,7 @@
 import React, { PropTypes } from 'react'
 import CSSModules from 'browser/lib/CSSModules'
 import styles from './SideNav.styl'
-import { openModal } from 'browser/lib/modal'
+import { openModal } from 'browser/main/lib/modal'
 import Preferences from '../modals/Preferences'
 import RepositorySection from './RepositorySection'
 import NewRepositoryModal from '../modals/NewRepositoryModal'
diff --git a/browser/lib/modal.js b/browser/main/lib/modal.js
similarity index 84%
rename from browser/lib/modal.js
rename to browser/main/lib/modal.js
index 15273f69..e1026fe5 100644
--- a/browser/lib/modal.js
+++ b/browser/main/lib/modal.js
@@ -1,7 +1,7 @@
 import React from 'react'
+import { Provider } from 'react-redux'
 import ReactDOM from 'react-dom'
-
-const remote = require('electron').remote
+import store from '../store'
 
 class ModalBase extends React.Component {
   constructor (props) {
@@ -15,8 +15,6 @@ class ModalBase extends React.Component {
 
   close () {
     if (modalBase != null) modalBase.setState({component: null, componentProps: null, isHidden: true})
-
-    remote.getCurrentWebContents().send('list-focus')
   }
 
   render () {
@@ -24,7 +22,9 @@ class ModalBase extends React.Component {
       <div className={'ModalBase' + (this.state.isHidden ? ' hide' : '')}>
         <div onClick={(e) => this.close(e)} className='modalBack'/>
         {this.state.component == null ? null : (
-          <this.state.component {...this.state.componentProps} close={this.close}/>
+          <Provider store={store}>
+            <this.state.component {...this.state.componentProps} close={this.close}/>
+          </Provider>
         )}
       </div>
     )
diff --git a/browser/main/modals/Preferences/AppSettingTab.js b/browser/main/modals/Preferences/AppSettingTab.js
index d1656fb0..51ddef2e 100644
--- a/browser/main/modals/Preferences/AppSettingTab.js
+++ b/browser/main/modals/Preferences/AppSettingTab.js
@@ -1,5 +1,4 @@
 import React, { PropTypes } from 'react'
-import linkState from 'browser/lib/linkState'
 import fetchConfig from 'browser/lib/fetchConfig'
 import hljsTheme from 'browser/lib/hljsThemes'
 
@@ -235,7 +234,6 @@ export default class AppSettingTab extends React.Component {
   }
 }
 
-AppSettingTab.prototype.linkState = linkState
 AppSettingTab.propTypes = {
   user: PropTypes.shape({
     name: PropTypes.string
diff --git a/browser/main/modals/Preferences/ContactTab.js b/browser/main/modals/Preferences/ContactTab.js
index aad8c331..47e6bf31 100644
--- a/browser/main/modals/Preferences/ContactTab.js
+++ b/browser/main/modals/Preferences/ContactTab.js
@@ -1,6 +1,5 @@
 import React from 'react'
 import ReactDOM from 'react-dom'
-import linkState from 'browser/lib/linkState'
 import ExternalLink from 'browser/components/ExternalLink'
 
 export default class ContactTab extends React.Component {
@@ -20,5 +19,3 @@ export default class ContactTab extends React.Component {
     )
   }
 }
-
-ContactTab.prototype.linkState = linkState
diff --git a/browser/main/modals/Preferences/index.js b/browser/main/modals/Preferences/index.js
index a399afd2..77222077 100644
--- a/browser/main/modals/Preferences/index.js
+++ b/browser/main/modals/Preferences/index.js
@@ -1,10 +1,8 @@
 import React, { PropTypes } from 'react'
-import { connect, Provider } from 'react-redux'
-import linkState from 'browser/lib/linkState'
-import store from 'browser/main/store'
+import { connect } from 'react-redux'
 import AppSettingTab from './AppSettingTab'
 import ContactTab from './ContactTab'
-import { closeModal } from 'browser/lib/modal'
+import { closeModal } from 'browser/main/lib/modal'
 
 const APP = 'APP'
 const CONTACT = 'CONTACT'
@@ -83,15 +81,4 @@ Preferences.propTypes = {
   dispatch: PropTypes.func
 }
 
-Preferences.prototype.linkState = linkState
-
-let RootComponent = connect((x) => x)(Preferences)
-export default class PreferencesModal extends React.Component {
-  render () {
-    return (
-      <Provider store={store}>
-        <RootComponent/>
-      </Provider>
-    )
-  }
-}
+export default connect((x) => x)(Preferences)