diff --git a/wowstash/templates/meta/index.html b/wowstash/templates/meta/index.html
index d849882..daf5d65 100644
--- a/wowstash/templates/meta/index.html
+++ b/wowstash/templates/meta/index.html
@@ -14,7 +14,11 @@
             <div class="header-content mx-auto">
               <h1 class="mb-5">Manage your Wownero funds securely and anonymously.</h1>
               {% if current_user.is_authenticated %}
-              <a href="{{ url_for('wallet.setup') }}" class="btn btn-outline btn-xl">{% if current_user.wallet_created %}Wallet Dashboard{% else %}Setup Wallet{% endif %}</a>
+                {% if current_user.wallet_created %}
+                  <a href="{{ url_for('wallet.dashboard') }}" class="btn btn-outline btn-xl">Wallet Dashboard</a>
+                {% else %}
+                  <a href="{{ url_for('wallet.setup') }}" class="btn btn-outline btn-xl">Setup Wallet</a>
+                {% endif %}
               {% else %}
               <a href="{{ url_for('auth.register') }}" class="btn btn-outline btn-xl">Register</a>
               <a href="{{ url_for('auth.login') }}" class="btn btn-outline btn-xl">Login</a>
diff --git a/wowstash/templates/navbar.html b/wowstash/templates/navbar.html
index 79a632d..72eb101 100644
--- a/wowstash/templates/navbar.html
+++ b/wowstash/templates/navbar.html
@@ -19,7 +19,7 @@
           <li class="nav-item"><a class="nav-link" href="/#contact">Contact</a></li>
         {% endif %}
         {% if current_user.is_authenticated %}
-          <li class="nav-item"><a class="nav-link" href="{{ url_for('wallet.setup') }}">Wallet</a></li>
+          <li class="nav-item"><a class="nav-link" href="{{ url_for('wallet.dashboard') }}">Wallet</a></li>
           <li class="nav-item"><a class="nav-link" href="{{ url_for('auth.logout') }}">Logout</a></li>
         {% else %}
           <li class="nav-item"><a class="nav-link" href="{{ url_for('auth.login') }}">Login</a></li>
diff --git a/wowstash/templates/wallet/loading.html b/wowstash/templates/wallet/loading.html
index 0148065..3b9bdb5 100644
--- a/wowstash/templates/wallet/loading.html
+++ b/wowstash/templates/wallet/loading.html
@@ -50,18 +50,16 @@
     {% endif %}
 
     {% if current_user.wallet_connected == False and current_user.wallet_created == False %}
-    document.addEventListener("DOMContentLoaded", function(){
-      var xhr = new XMLHttpRequest();
-      xhr.open('GET', '{{ url_for("wallet.create") }}');
-      xhr.send();
-    });
+    // document.addEventListener("DOMContentLoaded", function(){
+    //   var xhr = new XMLHttpRequest();
+    //   xhr.open('GET', '{{ url_for("wallet.create") }}');
+    //   xhr.send();
+    // });
     {% endif %}
 
     window.setInterval(function(){
       {% if current_user.wallet_connected == False and current_user.wallet_created == True %}
       check_wallet_status('connected');
-      {% else %}
-      check_wallet_status('created');
       {% endif %}
     }, 6000);
     </script>
diff --git a/wowstash/templates/wallet/setup.html b/wowstash/templates/wallet/setup.html
index fbc2fa2..b3aa812 100644
--- a/wowstash/templates/wallet/setup.html
+++ b/wowstash/templates/wallet/setup.html
@@ -13,7 +13,9 @@
           <h2>Pick An Option</h2>
           <p>Alrighty there hoss, pick an option below...</p>
 
-          <a class="btn btn-lg btn-link btn-outline btn-xl" href="{{ url_for('wallet.dashboard') }}">Create new wallet</a>
+          <hr><br /><br />
+
+          <a class="btn btn-lg btn-link btn-outline btn-xl" href="{{ url_for('wallet.create') }}">Create new wallet</a>
 
           <hr><br /><br />