diff --git a/app/components/Onboarding/Autopilot.scss b/app/components/Onboarding/Autopilot.scss
index b9ff9ac2..df5000b2 100644
--- a/app/components/Onboarding/Autopilot.scss
+++ b/app/components/Onboarding/Autopilot.scss
@@ -9,28 +9,28 @@
     &.enable {
       &.active {
         div {
-          color: $green;
-          border-color: $green;
+          color: $gold;
+          border-color: $gold;
         }
       }
 
       div:hover {
-        color: $green;
-        border-color: $green;
+        color: $gold;
+        border-color: $gold;
       }
     }
 
     &.disable {
       &.active {
         div {
-          color: $red;
-          border-color: $red;
+          color: $gold;
+          border-color: $gold;
         }
       }
 
       div:hover {
-        color: $red;
-        border-color: $red;
+        color: $gold;
+        border-color: $gold;
       }
     }
 
diff --git a/app/components/Onboarding/Onboarding.js b/app/components/Onboarding/Onboarding.js
index b6f8bef3..631a721b 100644
--- a/app/components/Onboarding/Onboarding.js
+++ b/app/components/Onboarding/Onboarding.js
@@ -23,7 +23,8 @@ const Onboarding = ({
     startingLnd,
     createWalletPassword,
     seed,
-    aezeedPassword
+    aezeedPassword,
+    fetchingSeed
   },
   changeStep,
   startLnd,
@@ -137,6 +138,9 @@ const Onboarding = ({
   }
 
   if (startingLnd) { return <LoadingBolt /> }
+  if (fetchingSeed) { 
+    console.log('got em!')
+    return <LoadingBolt /> }
 
   return (
     <div className={styles.container}>
diff --git a/app/components/Onboarding/Signup.scss b/app/components/Onboarding/Signup.scss
index 18d543b8..27e96f79 100644
--- a/app/components/Onboarding/Signup.scss
+++ b/app/components/Onboarding/Signup.scss
@@ -9,33 +9,33 @@
     &.enable {
       &.active {
         div {
-          color: $green;
-          border-color: $green;
+          color: $gold;
+          border-color: $gold;
         }
       }
 
       div:hover {
-        color: $green;
-        border-color: $green;
+        color: $gold;
+        border-color: $gold;
       }
     }
 
     &.disable {
       &.active {
         div {
-          color: $red;
-          border-color: $red;
+          color: $gold;
+          border-color: $gold;
         }
       }
 
       div:hover {
-        color: $red;
-        border-color: $red;
+        color: $gold;
+        border-color: $gold;
       }
     }
 
     div {
-      width: 200px;
+      width: 185px;
       display: inline-block;
       padding: 20px;
       border: 1px solid $white;
diff --git a/app/reducers/onboarding.js b/app/reducers/onboarding.js
index e35fd16d..73f64f16 100644
--- a/app/reducers/onboarding.js
+++ b/app/reducers/onboarding.js
@@ -7,6 +7,7 @@ import { ipcRenderer } from 'electron'
 export const UPDATE_ALIAS = 'UPDATE_ALIAS'
 export const UPDATE_PASSWORD = 'UPDATE_PASSWORD'
 export const UPDATE_CREATE_WALLET_PASSWORD = 'UPDATE_CREATE_WALLET_PASSWORD'
+export const UPDATE_CREATE_WALLET_PASSWORD_CONFIRMATION = 'UPDATE_CREATE_WALLET_PASSWORD_CONFIRMATION'
 export const UPDATE_AEZEED_PASSWORD = 'UPDATE_AEZEED_PASSWORD'
 export const UPDATE_SEED_INPUT = 'UPDATE_SEED_INPUT'
 
@@ -56,6 +57,13 @@ export function updateCreateWalletPassword(createWalletPassword) {
   }
 }
 
+export function updateCreateWalletPasswordConfirmation(updateCreateWalletPasswordConfirmation) {
+  return {
+    type: UPDATE_CREATE_WALLET_PASSWORD_CONFIRMATION,
+    updateCreateWalletPasswordConfirmation
+  }
+}
+
 export function updateAezeedPassword(aezeedPassword) {
   return {
     type: UPDATE_AEZEED_PASSWORD,
@@ -130,9 +138,9 @@ export const successfullyCreatedWallet = (event) => (dispatch) => dispatch({ typ
 
 // Listener for when LND creates and sends us a generated seed
 export const receiveSeed = (event, { cipher_seed_mnemonic }) => (dispatch) => {
-  dispatch({ type: SET_SEED, seed: cipher_seed_mnemonic })
-  // there was no seed and we just generated a new one, send user to the login component
   dispatch({ type: CHANGE_STEP, step: 4 })
+  // there was no seed and we just generated a new one, send user to the login component
+  dispatch({ type: SET_SEED, seed: cipher_seed_mnemonic })
 }
 
 // Listener for when LND throws an error on seed creation
@@ -164,6 +172,7 @@ const ACTION_HANDLERS = {
   [UPDATE_ALIAS]: (state, { alias }) => ({ ...state, alias }),
   [UPDATE_PASSWORD]: (state, { password }) => ({ ...state, password }),
   [UPDATE_CREATE_WALLET_PASSWORD]: (state, { createWalletPassword }) => ({ ...state, createWalletPassword }),
+  [UPDATE_CREATE_WALLET_PASSWORD_CONFIRMATION]: (state, { createWalletConfirmation }) => ({ ...state, createWalletConfirmation }),
   [UPDATE_AEZEED_PASSWORD]: (state, { aezeedPassword }) => ({ ...state, aezeedPassword }),
   [UPDATE_SEED_INPUT]: (state, { inputSeedObj }) => {
     return {
@@ -229,6 +238,7 @@ const initialState = {
   
   // wallet password. password used to encrypt the wallet and is required to unlock the daemon after set
   createWalletPassword: '',
+  createWalletConfirmation: '',
   creatingNewWallet: false,
 
   // seed password. this is optional and used to encrypt the seed