diff --git a/public/views/create.html b/public/views/create.html
index 31713598b..14f1c6abd 100644
--- a/public/views/create.html
+++ b/public/views/create.html
@@ -103,7 +103,7 @@
         </div>
 
 
-        <button type="submit" class="button round black expand m0" ng-disabled="setupForm.$invalid">
+        <button type="submit" class="button round black expand m0" ng-disabled="setupForm.$invalid || create.loading">
           <span translate>Create</span>
           {{requiredCopayers}}-<span translate>of</span>-{{totalCopayers}} <span translate>wallet</span>
         </button>
diff --git a/public/views/import.html b/public/views/import.html
index 5bcaa27ef..6c6213392 100644
--- a/public/views/import.html
+++ b/public/views/import.html
@@ -19,7 +19,7 @@
   </div>
 
 
-    <div class="row" ng-show="!import.loading">
+    <div class="row">
       <div class="large-12 columns">
           <form name="importForm" ng-submit="import.import(importForm)" novalidate>
             <div class="box-notification" ng-show="import.error">
@@ -50,19 +50,17 @@
               name="password" ng-model="import.password">
             </div>
             <button translate type="submit" class="button round expand black"
-              ng-disabled="importForm.$invalid || !import.password">
+              ng-disabled="importForm.$invalid || !import.password || import.loading">
               Import backup
             </button>
           </form>
 
-    <div class="text-center text-gray p20v" ng-click="$root.go('importLegacy')">
-      <p class="text-gray m5b size-14" translate> Have a Backup from Copay v0.9?</p>
-      <button class=" outline dark-gray tiny round"> <span translate>Import here</span>
-        <i class="icon-arrow-right3 size-14"></i>
-      </button>
-
-
-   </div>
+          <div class="text-center text-gray p20v" ng-click="$root.go('importLegacy')">
+            <p class="text-gray m5b size-14" translate> Have a Backup from Copay v0.9?</p>
+            <button class=" outline dark-gray tiny round"> <span translate>Import here</span>
+              <i class="icon-arrow-right3 size-14"></i>
+            </button>
+          </div>
 
       </div>
     </div>
diff --git a/public/views/importLegacy.html b/public/views/importLegacy.html
index cc0476816..ceac39936 100644
--- a/public/views/importLegacy.html
+++ b/public/views/importLegacy.html
@@ -4,26 +4,24 @@
   ng-init="titleSection='Import legacy wallet'; goBackToState = 'import'; noColor = true">
 </div>
 
-
-
 <div class="content p20v" ng-controller="importLegacyController as importLegacy">
   <div class="row m20t">
-      <div class="large-12 columns">
-        <div ng-show="importLegacy.importing">
-          <h1 class="m20b animated infinite flash" translate>Importing...</h1>
-          <ul>
-            <li ng-repeat="m in importLegacy.messages">
-            <span ng-style="{'opacity':m.opacity}">{{m.message|translate}}</span>
-          </ul>
-        </div>
+    <div class="large-12 columns">
+      <div ng-show="importLegacy.importing">
+        <h1 class="m20b animated infinite flash" translate>Importing...</h1>
+        <ul>
+          <li ng-repeat="m in importLegacy.messages">
+          <span ng-style="{'opacity':m.opacity}">{{m.message|translate}}</span>
+        </ul>
+      </div>
 
-        <div class="box-notification" ng-show="importLegacy.error">
-          <span class="text-warning size-14">
-            {{importLegacy.error|translate}}
-          </span>
-        </div>
+      <div class="box-notification" ng-show="importLegacy.error">
+        <span class="text-warning size-14">
+          {{importLegacy.error|translate}}
+        </span>
+      </div>
 
-        <div ng-show="!importLegacy.importing">
+      <div ng-show="!importLegacy.importing">
         <form name="importForm" ng-submit="importLegacy.import(importForm)" novalidate>
 
           <label for="fromCloud" class="line-b oh m20b">
@@ -51,28 +49,18 @@
 
           <button translate type="submit"
             class="button black round expand m0"
-            ng-disabled="deviceForm.$invalid">
+            ng-disabled="importForm.$invalid">
             Import
           </button>
         </form>
 
-        <form name="importLegacyForm" ng-submit="importLegacy.import(importLegacyForm)" novalidate>
-          <div class="box-notification" ng-show="error">
-            <span class="text-warning size-14">
-              {{error|translate}}
-            </span>
-          </div>
-        </form>
-
-    <div class="text-center p20v">
-      <a class="m20t tiny button outline round light-gray " ng-click="$root.openExternalLink('https://github.com/bitpay/copay/releases/tag/v0.10.0')" translate>
-         Learn more about Wallet Migration
-      </a>
-    </div>
-
+        <div class="text-center p20v">
+          <a class="m20t tiny button outline round light-gray " ng-click="$root.openExternalLink('https://github.com/bitpay/copay/releases/tag/v0.10.0')" translate>
+            Learn more about Wallet Migration
+          </a>
+        </div>
 
       </div>
-
-
     </div>
+  </div>
 </div>
diff --git a/public/views/join.html b/public/views/join.html
index 9fd8e2b62..9e38fc796 100644
--- a/public/views/join.html
+++ b/public/views/join.html
@@ -83,7 +83,8 @@
               </label>
             </div>
           </div>
-          <button translate type="submit" class="button expand black m0 round" ng-disabled="joinForm.$invalid">Join</button>
+          <button translate type="submit" class="button expand black m0 round" 
+            ng-disabled="joinForm.$invalid || join.loading">Join</button>
       </form>
     </div>
   </div>