             </NavItem>
         </Nav>
 
-    render_right_menu_button: ->
+    render_menu_button: ->
         <Nav style={margin:'0', padding:'15px', paddingRight:'25px', fontSize:'20px', float:'right'}
-            onClick={()=>@setState(show_right_menu: true)}
+            onClick={@toggle_menu}
         >
             <NavItem>
                 <Icon name="bars"/>
             </NavItem>
         </Nav>
 
-    close_right_menu: ->
-        @setState(show_right_menu:false)
-
-    render_right_menu: ->
-        # HACK: This is the dumbest hack ever.
-        # We should use a better sidemenu in the future.
-        if not @state.show_right_menu
-            return <div> </div>
-
-        <div style={width:'40vw', height:'100vw', backgroundColor:'white'}>
+    toggle_menu: ->
+        @setState ({show_menu}) ->
+            show_menu : not show_menu
+
+    close_menu: ->
+        @setState(show_menu:false)
+
+    render_menu: ->
+        <div style={width:'100vw', backgroundColor:'white'}>
             <Nav stacked>
                 <NavTab
+                    on_click       = {@close_menu}
                     name           = 'account'
                     label          = {@account_name()}
                     icon           = 'cog'
                     actions        = {@actions('page')}
                     active_top_tab = {@props.active_top_tab}
-                    on_click       = {@close_right_menu}
                     style          = {width:'100%'}
                 />
                 <NavTab
-                    on_click       = {@close_right_menu}
+                    on_click       = {@close_menu}
                     name           = 'about'
                     label          = 'About'
                     icon           = 'question-circle'

        redux : rtypes.object

    getInitialState: ->
        show_right_menu : false

    componentWillUnmount: ->
        @actions('page').clear_all_handlers()

                    icon           = 'medkit'
                    actions        = {@actions('page')}
                    active_top_tab = {@props.active_top_tab}
                    on_click       = {=>@close_menu();redux.getActions('support').show(true)}
                    style          = {width:'100%'}
                />
                {<NotificationBell
                    on_click = {@close_menu}
                    count    = {@props.get_notify_count()}
                    active   = {@props.show_file_use}
                /> if @props.is_logged_in()}
                <ConnectionIndicator
                    on_click = {@close_menu}
                    actions  = {@actions('page')}
                />
            </Nav>
