1 files changed, 26 insertions, 20 deletions
diff --git a/ui/app/app.js b/ui/app/app.js
index a4ce40881..cec3a9657 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -73,9 +73,18 @@ App.prototype.render = function() {
       h(LoadingIndicator),
 
       // top row
-      h('.app-header.flex-column.flex-center', {
+      h('.app-header.flex-row.flex-space-between', {
+        style: {
+          alignItems: 'center',
+        }
       }, [
+        h('img', {
+          height: 24,
+          width: 24,
+          src: '/images/icon-128.png',
+        }),
         h('h1', 'MetaMask'),
+        h('i.fa.fa-bars'),
       ]),
 
       // panel content
@@ -115,19 +124,19 @@ App.prototype.render = function() {
           },
         }),
 
-        // toggle
-        onOffToggle({
-          toggleMetamaskActive: this.toggleMetamaskActive.bind(this),
-          isUnlocked: state.isUnlocked,
-        }),
-
-        // help
-        h('i.fa.fa-question.fa-lg.cursor-pointer', {
-          style: {
-            opacity: state.isUnlocked ? '1.0' : '0.0',
-          },
-          onClick() { state.dispatch(actions.showInfoPage()) }
-        }),
+        // // toggle
+        // onOffToggle({
+        //   toggleMetamaskActive: this.toggleMetamaskActive.bind(this),
+        //   isUnlocked: state.isUnlocked,
+        // }),
+
+        // // help
+        // h('i.fa.fa-question.fa-lg.cursor-pointer', {
+        //   style: {
+        //     opacity: state.isUnlocked ? '1.0' : '0.0',
+        //   },
+        //   onClick() { state.dispatch(actions.showInfoPage()) }
+        // }),
       ]),
     ])
   )
@@ -148,12 +157,9 @@ App.prototype.toggleMetamaskActive = function(){
 App.prototype.renderPrimary = function(state){
   var state = this.props
 
-  // If seed words haven't been dismissed yet, show them still.
-  /*
   if (state.seedWords) {
     return h(CreateVaultCompleteScreen, {key: 'createVaultComplete'})
   }
-  */
 
   // show initialize screen
   if (!state.isInitialized) {
@@ -167,6 +173,9 @@ App.prototype.renderPrimary = function(state){
       case 'restoreVault':
         return h(RestoreVaultScreen, {key: 'restoreVault'})
 
+      case 'createVaultComplete':
+        return h(CreateVaultCompleteScreen, {key: 'createVaultComplete'})
+
       default:
         return h(InitializeMenuScreen, {key: 'menuScreenInit'})
 
@@ -181,9 +190,6 @@ App.prototype.renderPrimary = function(state){
   // show current view
   switch (state.currentView.name) {
 
-    case 'createVaultComplete':
-      return h(CreateVaultCompleteScreen, {key: 'created-vault'})
-
     case 'accounts':
       return h(AccountsScreen, {key: 'accounts'})