diff --git a/new-lamassu-admin/public/fullexample.commissions.png b/new-lamassu-admin/public/assets/wizard/fullexample.commissions.png
similarity index 100%
rename from new-lamassu-admin/public/fullexample.commissions.png
rename to new-lamassu-admin/public/assets/wizard/fullexample.commissions.png
diff --git a/new-lamassu-admin/public/assets/wizard/fullexample.locale.png b/new-lamassu-admin/public/assets/wizard/fullexample.locale.png
new file mode 100644
index 00000000..629c2bd2
Binary files /dev/null and b/new-lamassu-admin/public/assets/wizard/fullexample.locale.png differ
diff --git a/new-lamassu-admin/public/fullexample.twilio.png b/new-lamassu-admin/public/assets/wizard/fullexample.twilio.png
similarity index 100%
rename from new-lamassu-admin/public/fullexample.twilio.png
rename to new-lamassu-admin/public/assets/wizard/fullexample.twilio.png
diff --git a/new-lamassu-admin/public/assets/wizard/fullexample.wallet.png b/new-lamassu-admin/public/assets/wizard/fullexample.wallet.png
new file mode 100644
index 00000000..328e7917
Binary files /dev/null and b/new-lamassu-admin/public/assets/wizard/fullexample.wallet.png differ
diff --git a/new-lamassu-admin/public/fullexample.locale.png b/new-lamassu-admin/public/fullexample.locale.png
deleted file mode 100644
index 6e76177e..00000000
Binary files a/new-lamassu-admin/public/fullexample.locale.png and /dev/null differ
diff --git a/new-lamassu-admin/public/icons/status/pumpkin.svg b/new-lamassu-admin/public/icons/status/pumpkin.svg
deleted file mode 100644
index fc11e181..00000000
--- a/new-lamassu-admin/public/icons/status/pumpkin.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12" height="12" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <rect width="12" height="12" rx="3" ry="3" fill="#ff7311"/>
-</svg>
\ No newline at end of file
diff --git a/new-lamassu-admin/public/icons/status/tomato.svg b/new-lamassu-admin/public/icons/status/tomato.svg
deleted file mode 100644
index 7e5eb10a..00000000
--- a/new-lamassu-admin/public/icons/status/tomato.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12" height="12" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <rect width="12" height="12" rx="3" ry="3" fill="#ff584a"/>
-</svg>
\ No newline at end of file
diff --git a/new-lamassu-admin/src/App.js b/new-lamassu-admin/src/App.js
index 936e6bf1..9db11f1b 100644
--- a/new-lamassu-admin/src/App.js
+++ b/new-lamassu-admin/src/App.js
@@ -66,9 +66,7 @@ const GET_DATA = gql`
 
 const Main = () => {
   const classes = useStyles()
-  const { data, loading } = useQuery(GET_DATA, {
-    notifyOnNetworkStatusChange: true
-  })
+  const { data, loading } = useQuery(GET_DATA)
 
   if (loading) {
     return <></>
@@ -79,7 +77,7 @@ const Main = () => {
   return (
     <div className={classes.root}>
       <Router>
-        {wizardStep && <Wizard wizardStep={wizardStep} />}
+        {wizardStep > 0 && <Wizard wizardStep={wizardStep} />}
         <Header tree={tree} />
         <main className={classes.wrapper}>
           <Routes />
diff --git a/new-lamassu-admin/src/components/editableTable/Table.js b/new-lamassu-admin/src/components/editableTable/Table.js
index 0987aeb3..5a5abc03 100644
--- a/new-lamassu-admin/src/components/editableTable/Table.js
+++ b/new-lamassu-admin/src/components/editableTable/Table.js
@@ -91,6 +91,7 @@ const ETable = ({
 
   const onReset = () => {
     setAdding(false)
+    setEditingId(null)
     setEditing && setEditing(false)
   }
 
diff --git a/new-lamassu-admin/src/pages/Wizard/helper.js b/new-lamassu-admin/src/pages/Wizard/helper.js
index b20467b1..ab26a35c 100644
--- a/new-lamassu-admin/src/pages/Wizard/helper.js
+++ b/new-lamassu-admin/src/pages/Wizard/helper.js
@@ -59,7 +59,7 @@ const STEPS = [
   {
     id: 'wallet',
     Component: Wallet,
-    exImage: '/fullexample.wallet.png',
+    exImage: '/assets/wizard/fullexample.wallet.png',
     subtitle: 'Wallet settings',
     text: `Your wallet settings are the first step for this wizard. We'll start
           by setting one of cryptocurrency to get you up and running, but you
@@ -68,7 +68,7 @@ const STEPS = [
   {
     id: 'locale',
     Component: Locale,
-    exImage: '/fullexample.locale.png',
+    exImage: '/assets/wizard/fullexample.locale.png',
     subtitle: 'Locales',
     text: `From the Locales page, you can define some important default settings
           of your machines. These values will be the default values of all
@@ -80,7 +80,7 @@ const STEPS = [
   {
     id: 'twilio',
     Component: Twilio,
-    exImage: '/fullexample.twilio.png',
+    exImage: '/assets/wizard/fullexample.twilio.png',
     subtitle: 'Twilio (SMS service)',
     text: (
       <>
@@ -95,7 +95,7 @@ const STEPS = [
   {
     id: 'commissions',
     Component: Commissions,
-    exImage: '/fullexample.commissions.png',
+    exImage: '/assets/wizard/fullexample.commissions.png',
     subtitle: 'Commissions',
     text: `From the Commissions page, you can define all the commissions of your
           machines. The values set here will be default values of all machines
@@ -107,7 +107,7 @@ const STEPS = [
   // {
   //   id: 'notifications',
   //   Component: Notifications,
-  //   exImage: '/fullexample.notifications.png',
+  //   exImage: '/assets/wizard/fullexample.notifications.png',
   //   subtitle: 'Notifications',
   //   text: `Your notification settings will allow customize what notifications you
   //         get and where. You can later override all default balance alerts setup
@@ -116,7 +116,7 @@ const STEPS = [
   // {
   //   id: 'operatorInfo',
   //   Component: WizardOperatorInfo,
-  //   exImage: '/fullexample.operatorinfo.png',
+  //   exImage: '/assets/wizard/fullexample.operatorinfo.png',
   //   subtitle: 'Operator info',
   //   text: `Your contact information is important for your customer to be able
   //         to contact you in case there’s a problem with one of your machines.