4 files changed, 34 insertions, 23 deletions

diff --git a/old-ui/app/account-detail.js b/old-ui/app/account-detail.js
index af189cc79..692d50491 100644
--- a/old-ui/app/account-detail.js
+++ b/old-ui/app/account-detail.js
@@ -78,9 +78,10 @@ AccountDetailScreen.prototype.render = function () {
               address: selected,
             }),
           ]),
-          h('div.flex-column', {
+          h('flex-column', {
             style: {
               lineHeight: '10px',
+              marginLeft: '15px',
               width: '100%',
             },
           }, [
@@ -101,7 +102,7 @@ AccountDetailScreen.prototype.render = function () {
                 {
                   style: {
                     display: 'flex',
-                    justifyContent: 'space-between',
+                    justifyContent: 'flex-start',
                     alignItems: 'center',
                   },
                 },
@@ -131,6 +132,8 @@ AccountDetailScreen.prototype.render = function () {
                     AccountDropdowns,
                     {
                       style: {
+                        marginRight: '8px',
+                        marginLeft: 'auto',
                         cursor: 'pointer',
                       },
                       selected,
@@ -144,6 +147,7 @@ AccountDetailScreen.prototype.render = function () {
             ]),
             h('.flex-row', {
               style: {
+                width: '15em',
                 justifyContent: 'space-between',
                 alignItems: 'baseline',
               },
@@ -157,12 +161,11 @@ AccountDetailScreen.prototype.render = function () {
                   textOverflow: 'ellipsis',
                   paddingTop: '3px',
                   width: '5em',
+                  height: '15px',
                   fontSize: '13px',
                   fontFamily: 'Montserrat Light',
                   textRendering: 'geometricPrecision',
-                  marginTop: '15px',
                   marginBottom: '15px',
-                  marginLeft: '15px',
                   color: '#AEAEAE',
                 },
               }, checksumAddress),
@@ -189,21 +192,20 @@ AccountDetailScreen.prototype.render = function () {
             },
           }),
 
-          h('div', {}, [
+          h('.flex-grow'),
 
-            h('button', {
-              onClick: () => props.dispatch(actions.buyEthView(selected)),
-              style: { marginRight: '10px' },
-            }, 'BUY'),
+          h('button', {
+            onClick: () => props.dispatch(actions.buyEthView(selected)),
+            style: { marginRight: '10px' },
+          }, 'BUY'),
 
-            h('button', {
-              onClick: () => props.dispatch(actions.showSendPage()),
-              style: {
-                marginBottom: '20px',
-              },
-            }, 'SEND'),
-
-          ]),
+          h('button', {
+            onClick: () => props.dispatch(actions.showSendPage()),
+            style: {
+              marginBottom: '20px',
+              marginRight: '8px',
+            },
+          }, 'SEND'),
 
         ]),
       ]),
diff --git a/old-ui/app/app.js b/old-ui/app/app.js
index 4869bf72e..6eb1e487f 100644
--- a/old-ui/app/app.js
+++ b/old-ui/app/app.js
@@ -397,7 +397,7 @@ App.prototype.renderDropdown = function () {
     h(DropdownMenuItem, {
       closeMenu: () => this.setState({ isMainMenuOpen: !isOpen }),
       onClick: () => { this.props.dispatch(actions.lockMetamask()) },
-    }, 'Lock'),
+    }, 'Log Out'),
 
     h(DropdownMenuItem, {
       closeMenu: () => this.setState({ isMainMenuOpen: !isOpen }),
@@ -470,11 +470,6 @@ App.prototype.renderPrimary = function () {
     })
   }
 
-  if (props.seedWords) {
-    log.debug('rendering seed words')
-    return h(HDCreateVaultComplete, {key: 'HDCreateVaultComplete'})
-  }
-
   // show initialize screen
   if (!props.isInitialized || props.forgottenPassword) {
     // show current view
@@ -509,6 +504,12 @@ App.prototype.renderPrimary = function () {
     }
   }
 
+  // show seed words screen
+  if (props.seedWords) {
+    log.debug('rendering seed words')
+    return h(HDCreateVaultComplete, {key: 'HDCreateVaultComplete'})
+  }
+
   // show current view
   switch (props.currentView.name) {
 
diff --git a/old-ui/app/conf-tx.js b/old-ui/app/conf-tx.js
index 15c937b1c..5e2ae9e78 100644
--- a/old-ui/app/conf-tx.js
+++ b/old-ui/app/conf-tx.js
@@ -4,6 +4,7 @@ const h = require('react-hyperscript')
 const connect = require('react-redux').connect
 const actions = require('../../ui/app/actions')
 const NetworkIndicator = require('./components/network')
+const LoadingIndicator = require('./components/loading')
 const txHelper = require('../lib/tx-helper')
 const isPopupOrNotification = require('../../app/scripts/lib/is-popup-or-notification')
 
@@ -60,6 +61,11 @@ ConfirmTxScreen.prototype.render = function () {
 
     h('.flex-column.flex-grow', [
 
+      h(LoadingIndicator, {
+        isLoading: txData.loadingDefaults,
+        loadingMessage: 'Estimating transaction cost…',
+      }),
+
       // subtitle and nav
       h('.section-title.flex-row.flex-center', [
         !isNotification ? h('i.fa.fa-arrow-left.fa-lg.cursor-pointer', {
diff --git a/old-ui/app/css/index.css b/old-ui/app/css/index.css
index f6df3492e..3bb64647a 100644
--- a/old-ui/app/css/index.css
+++ b/old-ui/app/css/index.css
@@ -441,7 +441,9 @@ input.large-input {
 .account-detail-section {
   display: flex;
   flex-wrap: wrap;
+  overflow-x: hidden;
   overflow-y: auto;
+  max-height: 465px;
   flex-direction: inherit;
 }