diff --git a/public/views/disclaimer.html b/public/views/disclaimer.html
index 639b73ad8..8b510ac99 100644
--- a/public/views/disclaimer.html
+++ b/public/views/disclaimer.html
@@ -30,21 +30,18 @@
   </div>
   <div class="row">
 
-    <div class="text-center size-12 text-warning" ng-show="error">
-      {{(error)|translate}}. <span translate>Retrying...</span>
-    </div>
     <div class="onGoingProcess" ng-show="creatingProfile">
-    <div class="onGoingProcess-content" ng-style="{'background-color':'#222'}">
-      <div class="spinner">
-        <div class="rect1"></div>
-        <div class="rect2"></div>
-        <div class="rect3"></div>
-        <div class="rect4"></div>
-        <div class="rect5"></div>
+      <div class="onGoingProcess-content" ng-style="{'background-color':'#222'}">
+        <div class="spinner">
+          <div class="rect1"></div>
+          <div class="rect2"></div>
+          <div class="rect3"></div>
+          <div class="rect4"></div>
+          <div class="rect5"></div>
+        </div>
+        <span translate>Creating Wallet...</span>
       </div>
-      <span translate>Creating Profile...</span>
     </div>
-  </div>
     <div class="start-button columns">
       <button ng-disabled="creatingProfile" ng-click="index.acceptDisclaimer()" class="button black expand round size-12 text-spacing" translate>
         I AGREE. GET STARTED
diff --git a/public/views/walletHome.html b/public/views/walletHome.html
index fe0bfa1f3..1bfe709cf 100644
--- a/public/views/walletHome.html
+++ b/public/views/walletHome.html
@@ -75,7 +75,7 @@
       <div class="oh pr">
         <div class="amount" ng-style="{'background-color':index.backgroundColor}">
           <div ng-if="!index.anyOnGoingProcess && !index.notAuthorized">
-            <div ng-show="index.updateError" ng-click='index.openWallet()'>
+            <div class="m15t" ng-show="index.updateError" ng-click='index.updateAll({triggerTxUpdate: true})'>
               <span class="size-12 db m10b">{{index.updateError|translate}}</span>
               <button class="outline white tiny round" translate>Tap to retry</button>
             </div>
@@ -173,19 +173,11 @@
 
       <!-- Activity -->
 
-      <div class="row" 
-        ng-show="!index.loadingWallet && !index.txHistory[0] && !index.updatingTxHistory[index.walletId]">
-        <div class="large-12 columns">
-          <div class="oh text-gray size-12 text-center m20t">
-            <span ng-if="!index.txHistoryError" translate>
-              No transactions yet
-            </span>
-            <span ng-show="index.txHistoryError && !index.notAuthorized" ng-click='index.debounceUpdateHistory()'>
-              <p translate>Could not fetch transaction history</p>
-              <button class="outline round light-gray tiny" translate>Tap to retry</button>
-            </span>
-          </div>
-        </div>
+      <div 
+          class="m20t text-gray size-12 text-center" 
+          ng-show="!index.loadingWallet && !index.txHistory[0] && !index.updatingTxHistory[index.walletId] &&
+          !index.txHistoryError && !index.updateError" translate>
+        No transactions yet
       </div>
       <div ng-show="index.updatingTxHistory[index.walletId] 
                 && ( (index.txProgress > 6 && !index.txHistory[0]) || (index.txProgress > 50 ) )">
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 6fae1ade5..4a70af0d9 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -1363,6 +1363,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
       self.noFocusedWallet = true;
       self.isComplete = null;
       self.walletName = null;
+      self.setUxLanguage();
       profileService.isDisclaimerAccepted(function(v) {
         if (v) {
           go.path('import');