diff --git a/src/js/controllers/amount.js b/src/js/controllers/amount.js
index 73ebfd150..8e458045e 100644
--- a/src/js/controllers/amount.js
+++ b/src/js/controllers/amount.js
@@ -29,6 +29,7 @@ function amountController(configService, $filter, gettextCatalog, $ionicHistory,
   vm.finish = finish;
   vm.goBack = goBack;
   vm.loadMore = loadMore;
+  vm.next = next;
   vm.openPopup = openPopup;
   vm.pushDigit = pushDigit;
   vm.removeDigit = removeDigit;
@@ -478,7 +479,7 @@ function amountController(configService, $filter, gettextCatalog, $ionicHistory,
 
   // Currency
 
-  var next = 10;
+  var nextCurrencies = 10;
   var completeAlternativeList = [];
 
   var popularCurrencyList = [
@@ -537,12 +538,17 @@ function amountController(configService, $filter, gettextCatalog, $ionicHistory,
 
   function loadMore() {
     $timeout(function() {
-      vm.altCurrencyList = completeAlternativeList.slice(0, next);
-      next += 10;
+      vm.altCurrencyList = completeAlternativeList.slice(0, nextCurrencies);
+      nextCurrencies += 10;
       vm.listComplete = vm.altCurrencyList.length >= completeAlternativeList.length;
       $scope.$broadcast('scroll.infiniteScrollComplete');
     }, 100);
-  };
+  }
+
+  function next() {
+    useSendMax = false;
+    vm.finish();
+  }
 
   function findCurrency(search) {
     if (!search) initCurrencies();
diff --git a/src/js/controllers/review.controller.js b/src/js/controllers/review.controller.js
index a3b015348..afe3cd97d 100644
--- a/src/js/controllers/review.controller.js
+++ b/src/js/controllers/review.controller.js
@@ -223,7 +223,7 @@ function reviewController(addressbookService, bitcoinCashJsService, bitcore, bit
     // Grab stateParams
     tx = {
       amount: parseInt(sendFlowData.amount),
-      sendMax: sendFlowData.sendMax === 'true' ? true : false,
+      sendMax: sendFlowData.sendMax,
       fromWalletId: sendFlowData.fromWalletId,
       toAddress: sendFlowData.toAddress,
       paypro: txPayproData,
diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js
index 51d500de7..9c4f2bee9 100644
--- a/src/js/controllers/tab-home.js
+++ b/src/js/controllers/tab-home.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('tabHomeController',
-  function($rootScope, sendFlowService, $timeout, $scope, $state, $stateParams, $ionicScrollDelegate, $window, gettextCatalog, lodash, popupService, ongoingProcess, bannerService, externalLinkService, latestReleaseService, profileService, walletService, configService, $log, platformInfo, storageService, txpModalService, appConfigService, startupService, addressbookService, bwcError, nextStepsService, buyAndSellService, homeIntegrationsService, bitpayCardService, pushNotificationsService, timeService, $ionicNavBarDelegate) {
+  function($rootScope, $timeout, $scope, $state, $stateParams, $ionicModal, $ionicScrollDelegate, $window, gettextCatalog, lodash, popupService, ongoingProcess, bannerService, communityService, externalLinkService, latestReleaseService, profileService, walletService, configService, $log, platformInfo, sendFlowService, storageService, txpModalService, appConfigService, startupService, addressbookService, bwcError, nextStepsService, buyAndSellService, homeIntegrationsService, bitpayCardService, pushNotificationsService, timeService, bitcoincomService, pricechartService, firebaseEventsService, servicesService, shapeshiftService, $ionicNavBarDelegate, signVerifyMessageService) {
     var wallet;
     var listeners = [];
     var notifications = [];
@@ -58,7 +58,7 @@ angular.module('copayApp.controllers').controller('tabHomeController',
         });
       }
     };
-    
+
     function onEnter(event, data) {
       $ionicNavBarDelegate.showBar(true);
       updateAllWallets();
diff --git a/src/js/services/servicesService.js b/src/js/services/servicesService.js
index f2344dd01..316009957 100644
--- a/src/js/services/servicesService.js
+++ b/src/js/services/servicesService.js
@@ -1,7 +1,12 @@
 'use strict'
 angular.module('copayApp.services').factory('servicesService', function(configService, $log, lodash) {
   var root = {};
-  var services = [];
+  var services = [{
+    name: 'shapeshift',
+    title: 'Shapeshift',
+    icon: 'icon-shapeshift',
+    sref: 'tabs.shapeshift',
+  }];
 
   root.register = function(serviceInfo) {
     $log.info('Adding Services entry:' + serviceInfo.name);
diff --git a/src/js/services/shapeshiftService.js b/src/js/services/shapeshiftService.js
index 7cf6b4e03..1ce9672ce 100644
--- a/src/js/services/shapeshiftService.js
+++ b/src/js/services/shapeshiftService.js
@@ -137,17 +137,5 @@ angular.module('copayApp.services').factory('shapeshiftService', function ($http
     });
   };
 
-  var servicesItem = {
-    name: 'shapeshift',
-    title: 'Shapeshift',
-    icon: 'icon-shapeshift',
-    sref: 'tabs.shapeshift',
-  };
-
-  var register = function() {
-    servicesService.register(servicesItem);
-  };
-
-  register();
   return root;
 });
diff --git a/www/views/amount.html b/www/views/amount.html
index bceda146f..8d263eae3 100644
--- a/www/views/amount.html
+++ b/www/views/amount.html
@@ -90,7 +90,7 @@
       <button 
         class="button button-full button-primary no-margin" 
         ng-disabled="!vm.allowSend" 
-        ng-click="vm.finish()"
+        ng-click="vm.next()"
         style="position: absolute; bottom: 0;"
         translate>
         Next