diff --git a/browser/main/SideNav/index.js b/browser/main/SideNav/index.js
index 909c6777..e7976011 100644
--- a/browser/main/SideNav/index.js
+++ b/browser/main/SideNav/index.js
@@ -38,6 +38,18 @@ class SideNav extends React.Component {
     router.push('/trashed')
   }
 
+  handleSwitchFolderButtonClick (e) {
+    console.log('SwitchfolderButton Clicked')
+    let { router } = this.context
+    router.push('/home')
+  }
+
+  handleSwitchTagButtonClick (e) {
+    console.log('SwitchTagButton clicked')
+    let { router } = this.context
+    router.push('/tag')
+  }
+
   render () {
     let { data, location, config, dispatch } = this.props
 
@@ -64,6 +76,10 @@ class SideNav extends React.Component {
         tabIndex='1'
         style={style}
       >
+        <div styleName='SwitchModeButtons'>
+          <button onClick={(e) => this.handleSwitchFolderButtonClick(e)}>Folder</button>
+          <button onClick={(e) => this.handleSwitchTagButtonClick(e)}>Tag</button>
+        </div>
         <div styleName='top'>
           <button styleName='top-menu'
             onClick={(e) => this.handleMenuButtonClick(e)}
diff --git a/browser/main/TopBar/.#index.js b/browser/main/TopBar/.#index.js
new file mode 120000
index 00000000..a2c46e56
--- /dev/null
+++ b/browser/main/TopBar/.#index.js
@@ -0,0 +1 @@
+suzuki@suzuki-no-MacBook-Air-2.local.31032
\ No newline at end of file
diff --git a/browser/main/index.js b/browser/main/index.js
index 00c32d36..72cd03ef 100644
--- a/browser/main/index.js
+++ b/browser/main/index.js
@@ -65,6 +65,7 @@ ReactDOM.render((
         <Route path='starred' />
         <Route path='searched' />
         <Route path='trashed' />
+        <Route path='tag' />
         <Route path='storages'>
           <IndexRedirect to='/home' />
           <Route path=':storageKey'>