diff --git a/Gruntfile.js b/Gruntfile.js
index f8d2cdac74..31adcd98ee 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -62,7 +62,7 @@ module.exports = function (grunt) {
                 'bower_components/ngclipboard/dist/ngclipboard.js',
                 'bower_components/growl/javascripts/jquery.growl.js',
                 'bower_components/jquery-validation/dist/jquery.validate.js',
-                'bower_components/jpkleemans-angular-validate/src/angular-validate.js',
+                'bower_components/waves-angular-validate/src/angular-validate.js',
 
                 'src/js/vendor/jquery.modal.js',
 
@@ -118,6 +118,7 @@ module.exports = function (grunt) {
                         'src/js/shared/password.strength.directive.js',
                         'src/js/shared/address.directive.js',
                         'src/js/shared/decimal.directive.js',
+                        'src/js/shared/focus.directive.js',
                         'src/js/shared/transaction.loading.service.js',
                         'src/js/shared/transaction.filter.js',
 
diff --git a/bower.json b/bower.json
index efb32801b8..a0b994d408 100644
--- a/bower.json
+++ b/bower.json
@@ -23,7 +23,8 @@
     "growl": "^1.3.2",
     "angular-messages": "^1.5.8",
     "angular-validation-match": "^1.9.0",
-    "jpkleemans-angular-validate": "^1.1.1"
+    "angular-material": "^1.1.1",
+    "waves-angular-validate": "git@github.com:beregovoy68/angular-validate.git#^1.1.2"
   },
   "analytics": false
 }
diff --git a/src/css/style.css b/src/css/style.css
index 213226958c..e4fd7dd6c7 100644
--- a/src/css/style.css
+++ b/src/css/style.css
@@ -1188,6 +1188,14 @@ span.tabs-radio img.selected {
     color: #999999;
 }
 
+.popup-autocomplete {
+    z-index: 160;
+}
+
+.md-virtual-repeat-container.md-autocomplete-suggestions-container {
+    z-index: 160;
+}
+
 /* ======================================================================= */
 
 
diff --git a/src/js/app.js b/src/js/app.js
index 9404f9fa38..38622ac1fc 100644
--- a/src/js/app.js
+++ b/src/js/app.js
@@ -4,22 +4,92 @@
  * @see controllers
  * @see services
  */
-var app = angular.module('app',
-    [
-        'restangular',
-        'waves.core',
-        'waves.core.services',
-
-        'ngclipboard',
-        'ngMessages',
-        'ngValidate',
-        'ngAnimate',
-        'app.ui',
-        'app.shared',
-        'app.login',
-        'app.navigation',
-        'app.wallet',
-        'app.history',
-        'app.community'
-    ]
-);
+
+// mock methods to implement late binding
+var __mockShowError = function(message) {};
+var __mockValidateAddress = function(address) {};
+
+var app = angular.module('app', [
+    'restangular',
+    'waves.core',
+    'waves.core.services',
+
+    'ngclipboard',
+    'ngMessages',
+    'ngAnimate',
+    'ngMaterial',
+    'ngValidate',
+    'app.ui',
+    'app.shared',
+    'app.login',
+    'app.navigation',
+    'app.wallet',
+    'app.history',
+    'app.community'
+]).config(AngularApplicationConfig).run(AngularApplicationRun);
+
+function AngularApplicationConfig($validatorProvider) {
+    $validatorProvider.setDefaults({
+        errorClass: 'wInput-error',
+        onkeyup: false,
+        showErrors : function(errorMap, errorList) {
+            errorList.forEach(function(error) {
+                // can't use notificationService here cos services are not available in config phase
+                __mockShowError(error.message);
+            });
+
+            var i, elements;
+            for (i = 0, elements = this.validElements(); elements[i]; i++) {
+                angular.element(elements[i]).removeClass(this.settings.errorClass);
+            }
+
+            for (i = 0, elements = this.invalidElements(); elements[i]; i++) {
+                angular.element(elements[i]).addClass(this.settings.errorClass);
+            }
+        }
+    });
+    $validatorProvider.addMethod('address', function(value, element) {
+        return this.optional(element) || __mockValidateAddress(value);
+    }, 'Account number must be a sequence of 35 alphanumeric characters with no spaces, ' +
+        'optionally starting with \'1W\'');
+    $validatorProvider.addMethod('decimal', function(value, element, params) {
+        var maxdigits = angular.isNumber(params) ? params : Currency.WAV.precision;
+
+        var regex = new RegExp('^(?:-?\\d+)?(?:\\.\\d{1,' + maxdigits + '})?$');
+        return this.optional(element) || regex.test(value);
+    }, 'Amount is expected with a dot (.) as a decimal separator with no more than {0} fraction digits');
+    $validatorProvider.addMethod('password', function(value, element) {
+        if (this.optional(element))
+            return true;
+
+        var containsDigits = /[0-9]/.test(value);
+        var containsUppercase = /[A-Z]/.test(value);
+        var containsLowercase = /[a-z]/.test(value);
+
+        return containsDigits && containsUppercase && containsLowercase;
+    }, 'The password is too weak. A good password must contain at least one digit, ' +
+        'one uppercase and one lowercase letter');
+}
+
+AngularApplicationConfig.$inject = ['$validatorProvider'];
+
+function AngularApplicationRun(rest, coreConstants, notificationService, addressService) {
+    // restangular configuration
+    rest.setDefaultHttpFields({
+        timeout: 10000 // milliseconds
+    });
+    //var url = coreConstants.NODE_ADDRESS;
+    var url = 'http://52.28.66.217:6869';
+    rest.setBaseUrl(url);
+
+    // override mock methods cos in config phase services are not available yet
+    __mockShowError = function (message) {
+        notificationService.error(message);
+    };
+    __mockValidateAddress = function (address) {
+        return addressService.validateDisplayAddress(address);
+    };
+}
+
+AngularApplicationRun.$inject = ['Restangular', 'constants.core', 'notificationService', 'addressService'];
+
diff --git a/src/js/shared/address.directive.js b/src/js/shared/address.directive.js
index 50f68f5fdf..f849c495cf 100644
--- a/src/js/shared/address.directive.js
+++ b/src/js/shared/address.directive.js
@@ -14,7 +14,7 @@
                             return true;
 
                         return addressService.validateDisplayAddress(viewValue);
-                    }
+                    };
                 }
             };
         }]);
diff --git a/src/js/shared/decimal.directive.js b/src/js/shared/decimal.directive.js
index 9f4da56c25..f879b7b9ee 100644
--- a/src/js/shared/decimal.directive.js
+++ b/src/js/shared/decimal.directive.js
@@ -23,10 +23,10 @@
                             return true;
 
                         var maxdigits = isFinite(parseInt(digits)) ? digits : 8;
-                        var regex = new RegExp("^(?:-?\\d+)?(?:\\.\\d{1," + maxdigits + "})?$");
+                        var regex = new RegExp('^(?:-?\\d+)?(?:\\.\\d{1,' + maxdigits + '})?$');
 
                         return regex.test(viewValue);
-                    }
+                    };
                 }
             };
         });
diff --git a/src/js/shared/focus.directive.js b/src/js/shared/focus.directive.js
new file mode 100644
index 0000000000..065be82378
--- /dev/null
+++ b/src/js/shared/focus.directive.js
@@ -0,0 +1,18 @@
+(function () {
+    'use strict';
+
+    angular
+        .module('app.shared')
+        .directive('focusMe', ['$timeout', function WavesFocusDirective($timeout) {
+            return {
+                restrict: 'A',
+                link: function (scope, element, attributes) {
+                    scope.$watch(attributes.focusMe, function (newValue) {
+                        $timeout(function () {
+                            return newValue && element[0].focus();
+                        });
+                    }, true);
+                }
+            };
+        }]);
+})();
diff --git a/src/js/shared/password.strength.directive.js b/src/js/shared/password.strength.directive.js
index 15a346c562..4d32eefd83 100644
--- a/src/js/shared/password.strength.directive.js
+++ b/src/js/shared/password.strength.directive.js
@@ -18,7 +18,7 @@
                         var containsLowercase = /[a-z]/.test(viewValue);
 
                         return containsDigits && containsUppercase && containsLowercase;
-                    }
+                    };
                 }
             };
         });
diff --git a/src/js/shared/shared.dialog.directive.js b/src/js/shared/shared.dialog.directive.js
index 77e827e164..12d5d76b9e 100644
--- a/src/js/shared/shared.dialog.directive.js
+++ b/src/js/shared/shared.dialog.directive.js
@@ -8,6 +8,7 @@
             closeable: true,
             showButtons: true,
             okButtonCaption: 'OK',
+            okButtonEnabled: true,
             cancelButtonCaption: 'CANCEL'
         };
 
@@ -58,6 +59,7 @@
                     dialogOk: '&onDialogOk',
                     dialogCancel: '&onDialogCancel',
                     okButtonCaption: '@',
+                    okButtonEnabled: '=?',
                     cancelButtonCaption: '@',
                     isError: '=?'
                 },
@@ -66,7 +68,8 @@
                     '<div class="wavesPop-content" ng-transclude></div>' +
                     '<div class="wPop-content-buttons" ng-show="showButtons">' +
                         '<button class="wButton fade tooltip-1" ng-class="[{wButtonDanger: isError}]" ' +
-                            'title="{{::tooltip}}" ng-click="onOk()">{{::okButtonCaption}}</button>' +
+                            'title="{{::tooltip}}" ng-click="onOk()" ng-disabled="!okButtonEnabled">' +
+                            '{{::okButtonCaption}}</button>' +
                         '<span class="divider-2" ng-if="cancelButtonVisible"></span>' +
                         '<button ng-if="cancelButtonVisible" class="wButton fade" ' +
                             'ng-class="[{wButtonDanger: isError}]" ng-click="onCancel()">{{::cancelButtonCaption}}' +
diff --git a/src/js/shared/shared.module.js b/src/js/shared/shared.module.js
index 7ac653d26a..3ab5137d64 100644
--- a/src/js/shared/shared.module.js
+++ b/src/js/shared/shared.module.js
@@ -2,45 +2,5 @@
     'use strict';
 
     angular
-        .module('app.shared', [])
-        .config(['$validatorProvider', 'notificationService', function ($validatorProvider, notificationService) {
-            $validatorProvider.setDefaults({
-                errorClass: 'wInput-error',
-                onkeyup: false,
-                showErrors : function(errorMap, errorList) {
-                    errorList.forEach(function(error) {
-                        notificationService.error(error.message);
-                    });
-
-                    var i, elements;
-                    for (i = 0, elements = this.validElements(); elements[i]; i++) {
-                        angular.element(elements[i]).removeClass(this.settings.errorClass);
-                    }
-
-                    for (i = 0, elements = this.invalidElements(); elements[i]; i++) {
-                        angular.element(elements[i]).addClass(this.settings.errorClass);
-                    }
-                }
-            });
-
-            $validatorProvider.addMethod('address', function(value, element){
-                return this.optional(element) || Waves.Addressing.validateDisplayAddress(value);
-            }, "Account number must be a sequence of 35 alphanumeric characters with no spaces, optionally starting with '1W'");
-            $validatorProvider.addMethod('decimal', function(value, element, params) {
-                var maxdigits = angular.isNumeric(params) ? params : Currency.WAV.precision;
-
-                var regex = new RegExp("^(?:-?\\d+)?(?:\\.\\d{1," + maxdigits + "})?$");
-                return this.optional(element) || regex.test(value);
-            }, "Amount is expected with a dot (.) as a decimal separator with no more than {0} fraction digits");
-            $validatorProvider.addMethod('password', function(value, element){
-                if (this.optional(element))
-                    return true;
-
-                var containsDigits = /[0-9]/.test(value);
-                var containsUppercase = /[A-Z]/.test(value);
-                var containsLowercase = /[a-z]/.test(value);
-
-                return containsDigits && containsUppercase && containsLowercase;
-            }, "The password is too weak. A good password must contain at least one digit, one uppercase and one lowercase letter");
-        }]);
+        .module('app.shared', []);
 })();
diff --git a/src/js/wallet/wallet.controller.js b/src/js/wallet/wallet.controller.js
index 7f09ed0294..742f842fd7 100644
--- a/src/js/wallet/wallet.controller.js
+++ b/src/js/wallet/wallet.controller.js
@@ -1,12 +1,14 @@
 (function () {
     'use strict';
 
-    function WalletController($scope, $timeout, $interval, applicationContext, dialogService, addressService,
-                              utilityService, apiService, notificationService, formattingService,
+    function WalletController($scope, $timeout, $interval, constants, applicationContext, dialogService,
+                              addressService, utilityService, apiService, notificationService, formattingService,
                               transferService, transactionLoadingService) {
         var wallet = this;
         var transaction, refreshPromise;
         var refreshDelay = 10 * 1000;
+        var minimumPayment = new Money(constants.MINIMUM_PAYMENT_AMOUNT, Currency.WAV);
+        var minimumFee = new Money(constants.MINIMUM_TRANSACTION_FEE, Currency.WAV);
 
         function unimplementedFeature() {
             $scope.home.featureUnderDevelopment();
@@ -46,15 +48,75 @@
                 value: '0',
                 currency: ''
             },
-            recipient: ''
+            recipient: '',
+            paymentPending: false
+        };
+        wallet.transfer = {
+            fees: [
+                {
+                    amount: 0.001,
+                    displayText: '0.001 WAVE (Economic)'
+                },
+                {
+                    amount: 0.0015,
+                    displayText: '0.0015 WAVE (Standard)'
+                },
+                {
+                    amount: 0.002,
+                    displayText: '0.002 WAVE (Premium)'
+                }
+            ],
+            getFeeAmount: function() {
+                return angular.isDefined(wallet.transfer.selectedFee) ?
+                    wallet.transfer.selectedFee.amount :
+                    wallet.transfer.searchText;
+            },
+            selectedFee: undefined,
+            searchText: undefined,
+            querySearch: function (searchText) {
+                if (!searchText)
+                    return wallet.transfer.fees;
+
+                return _.filter(wallet.transfer.fees, function (item) {
+                    return item.amount.toString().indexOf(searchText) !== -1;
+                });
+            }
         };
-        wallet.transfer = {};
         wallet.paymentValidationOptions = {
             rules: {
-
+                wavesrecipient: {
+                    required: true,
+                    address: true
+                },
+                wavessendamount: {
+                    required: true,
+                    decimal: Currency.WAV.precision,
+                    min: minimumPayment.amount
+                },
+                wavessendfee: {
+                    required: true,
+                    decimal: Currency.WAV.precision,
+                    min: minimumFee.amount
+                }
             },
             messages: {
-
+                wavesrecipient: {
+                    required: 'Recipient account number is required'
+                },
+                wavessendamount: {
+                    required: 'Amount to send is required',
+                    decimal: 'The amount to send must be a number with no more than ' +
+                        minimumPayment.currency.precision + ' digits after the decimal point (.)',
+                    min: 'Payment amount is too small. It should be greater or equal to ' +
+                        minimumPayment.formatAmount(false)
+                },
+                wavessendfee: {
+                    required: 'Transaction fee is required',
+                    decimal: 'Transaction fee must be with no more than ' +
+                        minimumFee.currency.precision + ' digits after the decimal point (.)',
+                    min: 'Transaction fee is too small. It should be greater or equal to ' +
+                        minimumFee.formatAmount(true)
+                }
             }
         };
         wallet.send = send;
@@ -102,15 +164,18 @@
         function submitPayment() {
             // here we have a direct markup dependency
             var paymentForm = getPaymentForm();
-            paymentForm.$setSubmitted();
-            if (paymentForm.$invalid)
-                // prevent payment dialog from closing
+            wallet.transfer.fee.isValid = angular.isDefined(paymentForm.invalid.wavessendfee) ?
+                paymentForm.invalid.wavessendfee : true;
+            if (!paymentForm.validate())
+                // prevent payment dialog from closing if it's not valid
                 return false;
 
+            wallet.transfer.fee.amount = wallet.transfer.getFeeAmount();
+
             var currentCurrency = wallet.current.balance.currency;
             var payment = {
                 amount: new Money(wallet.transfer.amount, currentCurrency),
-                fee: new Money(wallet.transfer.fee, currentCurrency),
+                fee: new Money(wallet.transfer.fee.amount, currentCurrency),
                 recipient: addressService.fromDisplayAddress(wallet.transfer.recipient),
                 time: utilityService.getTime()
             };
@@ -148,21 +213,27 @@
             if (angular.isUndefined(transaction))
                 return;
 
-            //todo: disable confirm button
+            //disable confirm button
+            wallet.confirm.paymentPending = true;
+
             apiService.broadcastPayment(transaction).then(function () {
-                var amount = new Money(transaction.amount, wallet.current.balance.currency);
+                var amount = Money.fromCoins(transaction.amount, wallet.current.balance.currency);
                 var address = addressService.fromRawAddress(transaction.recipient).getDisplayAddress();
                 var displayMessage = 'Sent ' + amount.formatAmount(true) + amount.currency.symbol +
                     '<br>Recipient ' + address.substr(0,15) + '...<br>Date: ' +
-                    formattingService.formatTimestamp(transaction.time);
+                    formattingService.formatTimestamp(transaction.timestamp);
                 notificationService.notice(displayMessage);
-                //todo: enable confirm button
-
+                //enable confirm button
+                wallet.confirm.paymentPending = false;
                 transaction = undefined;
             }, function (response) {
-                notificationService.error('Error:' + response.error + ' - ' + response.message);
-                //todo: enable confirm button
-
+                if (angular.isDefined(response.data))
+                    notificationService.error('Error:' + response.data.error + ' - ' + response.data.message);
+                else
+                    notificationService.error('Request failed. Status: ' + response.status + ' - ' +
+                        response.statusText);
+                //enable confirm button
+                wallet.confirm.paymentPending = false;
                 transaction = undefined;
             });
         }
@@ -198,12 +269,15 @@
         function resetPaymentForm() {
             wallet.transfer.recipient = '';
             wallet.transfer.amount = '0';
-            wallet.transfer.fee = '0.001';
+            wallet.transfer.fee = {
+                amount: '0.001',
+                isValid: true
+            };
         }
     }
 
-    WalletController.$inject = ['$scope', '$timeout', '$interval', 'applicationContext', 'dialogService',
-        'addressService', 'utilityService', 'apiService', 'notificationService',
+    WalletController.$inject = ['$scope', '$timeout', '$interval', 'constants.ui', 'applicationContext',
+        'dialogService', 'addressService', 'utilityService', 'apiService', 'notificationService',
         'formattingService', 'transferService', 'transactionLoadingService'];
 
     angular
diff --git a/src/main.html b/src/main.html
index 112c8ea009..426f153d64 100644
--- a/src/main.html
+++ b/src/main.html
@@ -21,12 +21,12 @@
     <meta charset="utf-8">
     <title>Waves Lite Client</title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet" href="css/jquery-ui.css">
-    <link rel="stylesheet" href="css/style.css">
+    <link rel="stylesheet" href="../bower_components/angular/angular-csp.css">
+    <link rel="stylesheet" href="../bower_components/angular-material/angular-material.css">
     <link rel="stylesheet" href="css/jquery.modal.css">
     <link rel="stylesheet" href="css/jquery.growl.css">
     <link rel="stylesheet" href="css/tooltipster.min.css">
-    <link rel="stylesheet" href="../bower_components/angular/angular-csp.css">
+    <link rel="stylesheet" href="css/style.css">
 	<link href="img/favicon.ico" type="image/x-icon" rel="shortcut icon"/>
 </head>
 
@@ -102,7 +102,7 @@ <h2>REMOVE ACCOUNT <span id="removeAccountSpan"></span> - NOTICE</h2>
                                 <label for="walletSeed">WALLET SEED</label>
                                     <br/>
 
-                                    <textarea id="walletSeed" rows="3" name="walletSeed" class="wInput" ng-class="{ 'wInput-error' : (accountSeedForm.$submitted || accountSeedForm.walletSeed.$touched) && accountSeedForm.walletSeed.$invalid }" ng-model="vm.seed" ng-change="vm.refreshAddress()" ng-model-options="{ debounce: 750 }" ng-trim="false" required minlength="25"></textarea>
+                                    <textarea id="walletSeed" rows="3" name="walletSeed" class="wInput" focus-me="accounts.mode === 'create-seed'" ng-class="{ 'wInput-error' : (accountSeedForm.$submitted || accountSeedForm.walletSeed.$touched) && accountSeedForm.walletSeed.$invalid }" ng-model="vm.seed" ng-change="vm.refreshAddress()" ng-model-options="{ debounce: 750 }" ng-trim="false" required minlength="25"></textarea>
                                     <span class="clipSpan tooltip-1" title="Copy the seed to the clipboard." data-clipboard-target="#walletSeed" data-clipboard-message-success="Wallet seed has been successfully copied to clipboard" ></span>
                                     <br/>
                                     <div ng-messages="accountSeedForm.walletSeed.$error" ng-if="accountSeedForm.$submitted || accountSeedForm.walletSeed.$touched">
@@ -123,7 +123,7 @@ <h2>REMOVE ACCOUNT <span id="removeAccountSpan"></span> - NOTICE</h2>
 
                                 <button class="wButton fade" type="submit">REGISTER ACCOUNT</button>
                                 <span class="divider-2"></span>
-                                <button class="wButton fade" ng-click="vm.back()" type="button">BACK</button>
+                                <button class="wButton fade" ng-click="accountSeedForm.$setPristine() || vm.back()">BACK</button>
 
                                 <div id="seed-whitespace-popup" waves-dialog on-dialog-ok="vm.registerAccount()" closeable="false" ok-button-caption="PROCEED">
                                     <h2>SEED NOTICE</h2>
@@ -181,7 +181,7 @@ <h2>NEW ACCOUNT - NOTICE</h2>
                                                 need to have assigned a name.</i>"></span>
                                         <br/>
                                         </label>
-                                        <input type="text" id="walletName" class="wInput" ng-model="vm.name"/>
+                                        <input type="text" id="walletName" class="wInput" ng-model="vm.name" focus-me="accounts.mode === 'register'"/>
                                     </div>
                                     <br/>
                                     <div class="form-field">
@@ -232,7 +232,7 @@ <h2>NEW ACCOUNT - NOTICE</h2>
                                 <label for="accountPassword">PASSWORD</label>
                                 <br/>
 
-                                <input type="password" id="accountPassword" class="wInput" ng-model="vm.password"/>
+                                <input type="password" id="accountPassword" class="wInput" ng-model="vm.password" focus-me="accounts.mode === 'login'"/>
                                 <br/><br/>
 
                                 <button class="wButton fade" ng-click="vm.signIn()">SIGN IN</button>
@@ -338,7 +338,7 @@ <h2>ACCOUNT INFO BACKUP</h2>
                 <!-- WALLET TAB -->
                 <div id="mBB-wallet" class="mBB-content" ng-switch-when="wallet" ng-controller="walletController as wallet">
                     <div id="wB-butSend-WAV" waves-dialog ok-button-caption="SUBMIT" cancel-button-visible="false" on-dialog-ok="wallet.submitPayment()">
-                        <form id="send-waves-form" name="sendWavesForm" class="paymentForm" novalidate>
+                        <form id="send-waves-form" name="sendWavesForm" class="paymentForm" novalidate ng-validate="wallet.paymentValidationOptions">
                             <h2>SEND PAYMENT</h2>
                             <div class="balanceAmt">
                                 <p>Balance: </p><span class="balancewaves">{{wallet.current.balance.formatAmount(true)}}</span>
@@ -355,11 +355,7 @@ <h2>SEND PAYMENT</h2>
                                     <td>Recipient's Address</td>
                                     <td>
                                         <div class="form-field">
-                                            <input class="wInput form-control" name="wavesrecipient" type="text" placeholder="Recipient" ng-model="wallet.transfer.recipient" required address />
-                                            <div ng-messages="sendWavesForm.wavesrecipient.$error" ng-if="sendWavesForm.$submitted || sendWavesForm.wavesrecipient.$touched">
-                                                <p ng-message="required">Recipient account number is required</p>
-                                                <p ng-message="address">Recipient address is malformed</p>
-                                            </div>
+                                            <input class="wInput form-control" name="wavesrecipient" type="text" placeholder="Recipient" ng-model="wallet.transfer.recipient" />
                                         </div>
                                     </td>
                                 </tr>
@@ -367,22 +363,21 @@ <h2>SEND PAYMENT</h2>
                                     <td>Amount</td>
                                     <td>
                                         <div class="form-field">
-                                            <input class="wInput form-control" name="wavessendamount" type="text" placeholder="Amount" ng-model="wallet.transfer.amount" required decimal="{{wallet.current.balance.currency.precision}}" />
-                                            <div ng-messages="sendWavesForm.wavessendamount.$error" ng-if="sendWavesForm.$submitted || sendWavesForm.wavessendamount.$touched">
-                                                <p ng-message="required">Amount to send is required</p>
-                                                <p ng-message="decimal">The amount to send must be a number<br/>with no more than {{wallet.current.balance.currency.precision}} digits after the decimal point (.)</p>
-                                            </div>
+                                            <input class="wInput form-control" name="wavessendamount" type="text" placeholder="Amount" ng-model="wallet.transfer.amount" />
                                         </div>
                                     </td>
                                 </tr>
                                 <tr>
                                     <td>Fee</td>
                                     <td>
-                                        <select id="wavessendfee" name="wavessendfee" class="form-control" ng-model="wallet.transfer.fee">
-                                            <option value="0.001" selected>0.001 WAVE (Economic)</option>
-                                            <option value="0.0015">0.0015 WAVE (Standard)</option>
-                                            <option value="0.002">0.002 WAVE (Premium)</option>
-                                        </select>
+                                        <md-autocomplete md-input-name="wavessendfee" md-selected-item="wallet.transfer.selectedFee" md-search-text="wallet.transfer.searchText"
+                                                         md-items="item in wallet.transfer.querySearch(wallet.transfer.searchText)"
+                                                         md-item-text="item.amount.toString()" md-min-length="0" md-require-match="" md-no-cache="true"
+                                                         md-menu-class="popup-autocomplete" ng-class="{'wInput-error': !wallet.transfer.fee.isValid}">
+                                            <md-item-template>
+                                                <span md-highlight-text="wallet.transfer.searchText">{{item.displayText}}</span>
+                                            </md-item-template>
+                                        </md-autocomplete>
                                     </td>
                                 </tr>
                                 </tbody>
@@ -390,7 +385,7 @@ <h2>SEND PAYMENT</h2>
                         </form>
                     </div>
 
-                    <div id="send-payment-confirmation" waves-dialog ok-button-caption="CONFIRM" on-dialog-ok="wallet.broadcastSendTransaction()">
+                    <div id="send-payment-confirmation" waves-dialog ok-button-caption="CONFIRM" ok-button-enabled="!wallet.confirm.pendingPayment" on-dialog-ok="wallet.broadcastSendTransaction()">
                         <p>You are sending <span class="confirmation-value">{{wallet.confirm.amount.value}}</span>
                             <span class="confirmation-value">{{wallet.confirm.amount.currency}}</span> with
                             <span class="confirmation-value">{{wallet.confirm.fee.value}}</span>
@@ -418,7 +413,7 @@ <h2>SEND PAYMENT</h2>
                             </tr>
                             </thead>
                             <tbody id="walletTransactionhistory">
-                                <tr ng-repeat="tx in wallet.transactions | orderBy:'timestamp':true | limitTo:10 | transaction" ng-class="{'wavesTable-txUnc': tx.unconfirmed, 'wavesTable-txIn': !tx.formatted.isOutgoing, 'wavesTable-txOut': tx.formatted.isOutgoing}">
+                                <tr ng-repeat="tx in wallet.transactions | orderBy:'timestamp':true | limitTo:10 | transaction track by tx.timestamp" ng-class="{'wavesTable-txUnc': tx.unconfirmed, 'wavesTable-txIn': !tx.formatted.isOutgoing, 'wavesTable-txOut': tx.formatted.isOutgoing}">
                                     <td>{{tx.formatted.datetime}}</td>
                                     <td>{{tx.formatted.type}}</td>
                                     <td>{{tx.formatted.sender}}</td>
@@ -494,7 +489,7 @@ <h1>DECENTRALIZED VOTING</h1>
                             </tr>
                             </thead>
                             <tbody>
-                                <tr ng-repeat="tx in history.unconfirmed | orderBy:'timestamp':true | limitTo:10 | transaction" class="wavesTable-txUnc" ng-class="{'wavesTable-txIn': !tx.formatted.isOutgoing, 'wavesTable-txOut': tx.formatted.isOutgoing}">
+                                <tr ng-repeat="tx in history.unconfirmed | orderBy:'timestamp':true | limitTo:10 | transaction track by tx.timestamp" class="wavesTable-txUnc" ng-class="{'wavesTable-txIn': !tx.formatted.isOutgoing, 'wavesTable-txOut': tx.formatted.isOutgoing}">
                                     <td>{{tx.formatted.datetime}}</td>
                                     <td>{{tx.formatted.type}}</td>
                                     <td>{{tx.formatted.sender}}</td>
@@ -504,7 +499,7 @@ <h1>DECENTRALIZED VOTING</h1>
                                 </tr>
                             </tbody>
                             <tbody>
-                                <tr ng-repeat="tx in history.confirmed | orderBy:'timestamp':true | limitTo:10 | transaction" ng-class="{'wavesTable-txIn': !tx.formatted.isOutgoing, 'wavesTable-txOut': tx.formatted.isOutgoing}">
+                                <tr ng-repeat="tx in history.confirmed | orderBy:'timestamp':true | limitTo:10 | transaction track by tx.timestamp" ng-class="{'wavesTable-txIn': !tx.formatted.isOutgoing, 'wavesTable-txOut': tx.formatted.isOutgoing}">
                                     <td>{{tx.formatted.datetime}}</td>
                                     <td>{{tx.formatted.type}}</td>
                                     <td>{{tx.formatted.sender}}</td>
@@ -623,6 +618,8 @@ <h2>LATEST BLOCKS INFORMATION</h2>
     <script src="../bower_components/angular-sanitize/angular-sanitize.js"></script>
     <script src="../bower_components/angular-messages/angular-messages.js"></script>
     <script src="../bower_components/angular-animate/angular-animate.js"></script>
+    <script src="../bower_components/angular-aria/angular-aria.js"></script>
+    <script src="../bower_components/angular-material/angular-material.js"></script>
     <script src="../bower_components/restangular/dist/restangular.js"></script>
     <script src="../bower_components/angular-validation-match/dist/angular-validation-match.js"></script>
 
@@ -635,7 +632,7 @@ <h2>LATEST BLOCKS INFORMATION</h2>
     <script src="../bower_components/ngclipboard/dist/ngclipboard.js"></script>
     <script src="../bower_components/growl/javascripts/jquery.growl.js"></script>
     <script src="../bower_components/jquery-validation/dist/jquery.validate.js"></script>
-    <script src="../bower_components/jpkleemans-angular-validate/src/angular-validate.js"></script>
+    <script src="../bower_components/waves-angular-validate/src/angular-validate.js"></script>
 
     <!-- crypto libraries -->
     <script src="../bower_components/Base58/Base58.js"></script>
@@ -657,6 +654,7 @@ <h2>LATEST BLOCKS INFORMATION</h2>
     <script src="js/shared/shared.module.js"></script>
     <script src="js/shared/dialog.service.js"></script>
     <script src="js/shared/shared.dialog.directive.js"></script>
+    <script src="js/shared/focus.directive.js"></script>
     <script src="js/shared/password.strength.directive.js"></script>
     <script src="js/shared/address.directive.js"></script>
     <script src="js/shared/decimal.directive.js"></script>