diff --git a/src/components/molecules/AccountStatus.module.scss b/src/components/molecules/AccountStatus.module.scss
index 377ae34..4c02a71 100644
--- a/src/components/molecules/AccountStatus.module.scss
+++ b/src/components/molecules/AccountStatus.module.scss
@@ -3,6 +3,7 @@
 .status {
     display: inline-block;
     position: relative;
+    cursor: pointer;
 }
 
 // default: red square
diff --git a/src/components/molecules/AccountStatus.tsx b/src/components/molecules/AccountStatus.tsx
index 23e2939..a24e7dc 100644
--- a/src/components/molecules/AccountStatus.tsx
+++ b/src/components/molecules/AccountStatus.tsx
@@ -1,6 +1,6 @@
 import React, { PureComponent } from 'react'
 import cx from 'classnames'
-// import Button from '../atoms/Button'
+import Button from '../atoms/Button'
 import { User } from '../../context/User'
 import Popover from 'react-popover'
 import styles from './AccountStatus.module.scss'
@@ -15,7 +15,7 @@ const AccountPopover = () => (
                             {states.account}
                         </span>
                     ) : (
-                        'No account selected'
+                        <em>No account selected</em>
                     )
                 }
             </User.Consumer>
@@ -23,15 +23,15 @@ const AccountPopover = () => (
         <div className={styles.popoverInfoline}>
             Network: &nbsp;<strong>{''}</strong>
         </div>
-        {/* <div className={styles.popoverInfoline}>
+        <div className={styles.popoverInfoline}>
             <User.Consumer>
                 {states => (
-                    <Button link onClick={states.requestFromFaucet}>
+                    <Button link onClick={() => states.requestFromFaucet()}>
                         Make it rain
                     </Button>
                 )}
             </User.Consumer>
-        </div> */}
+        </div>
     </div>
 )
 
@@ -41,9 +41,6 @@ interface AccountStatusProps {
 
 interface AccountStatusState {
     popoverIsOpen: boolean
-    preferPlace?: string
-    place?: string
-    enterExitTransitionDurationMs?: number
 }
 
 export default class AccountStatus extends PureComponent<
@@ -63,9 +60,8 @@ export default class AccountStatus extends PureComponent<
     public AccountIndicator = () => (
         <div
             className={cx(styles.status, this.props.className)}
+            onClick={() => this.togglePopover(true)}
             onMouseOver={() => this.togglePopover(true)}
-            onMouseOut={() => this.togglePopover(false)}
-            onTouchStart={() => this.togglePopover(true)}
         >
             <User.Consumer>
                 {states =>
@@ -84,8 +80,6 @@ export default class AccountStatus extends PureComponent<
     public render() {
         const popoverProps = {
             isOpen: this.state.popoverIsOpen,
-            // preferPlace: this.state.preferPlace,
-            // place: this.state.place,
             enterExitTransitionDurationMs: 300,
             tipSize: 0.01,
             onOuterAction: () => this.togglePopover(false),