diff --git a/www/i18n/locale-en.json b/www/i18n/locale-en.json
index 353772f1cec6f3071a5cef072ebcd9a81d9d678c..ffe8b3d04783d378f24829464d8bf75d516de264 100644
--- a/www/i18n/locale-en.json
+++ b/www/i18n/locale-en.json
@@ -176,7 +176,6 @@
     "AMOUNT_HELP": "Amount",
     "COMMENT": "Comment",
     "COMMENT_HELP": "Comment (optional)",
-    "CHOOSE_UNIT": "Unit of amount",
     "BTN_SEND": "Send",
     "BTN_ADD_COMMENT": "Add comment ?",
     "MODAL": {
diff --git a/www/i18n/locale-fr-FR.json b/www/i18n/locale-fr-FR.json
index c6cb4ce08d51e640c0215b301b8f2514e4a17388..9aee1f0a9546ded38090c6f9d8ba9d3b915f3b35 100644
--- a/www/i18n/locale-fr-FR.json
+++ b/www/i18n/locale-fr-FR.json
@@ -112,8 +112,8 @@
     "REGISTERED_SINCE": "Inscription",
     "REGISTERED_SINCE_BLOCK": "Inscrit au block #",
     "NO_CERTIFICATIONS": "Aucune certification",
-    "CERTIFICATIONS_RECEIVED": "Certifications recues",
-    "CERTIFICATIONS_RECEIVED_BY": "Certifications recues par {{uid}}",
+    "CERTIFICATIONS_RECEIVED": "Certifications reçues",
+    "CERTIFICATIONS_RECEIVED_BY": "Certifications reçues par {{uid}}",
     "EXPIRE_IN": "Expiration",
     "SIGNED_ON_BLOCK": "Certifié au bloc",
     "BTN_SEND_MONEY": "Payer",
@@ -176,7 +176,6 @@
     "AMOUNT_HELP": "Montant",
     "COMMENT": "Commentaire",
     "COMMENT_HELP": "Commentaire",
-    "CHOOSE_UNIT": "Unité du montant",
     "BTN_SEND": "Envoyer",
     "BTN_ADD_COMMENT": "Saisir un commentaire ?",
     "MODAL": {
diff --git a/www/js/controllers/transfer-controllers.js b/www/js/controllers/transfer-controllers.js
index bc56de1a8ea4d29c697286ebb7f821c0770823c8..efed00a3f0f93c42a21674f3acc08fa1f2da0fb1 100644
--- a/www/js/controllers/transfer-controllers.js
+++ b/www/js/controllers/transfer-controllers.js
@@ -48,10 +48,12 @@ function TransferController($scope, $rootScope, $ionicModal, $state, BMA, Wallet
     if (!!$state.stateParams && !!$state.stateParams.pubkey) {
       $scope.formData.destPub = $state.stateParams.pubkey;
       if (!!$state.stateParams.uid) {
-        $scope.dest = $state.stateParams.uid;
+        $scope.destUid = $state.stateParams.uid;
+        $scope.destPub = '';
       }
       else {
-        $scope.dest = $scope.destPub;
+        $scope.destUid = '';
+        $scope.destPub = $scope.formData.destPub;
       }
     }
 
@@ -77,7 +79,6 @@ function TransferModalController($scope, $rootScope, $ionicModal, $state, BMA, W
     useRelative: Wallet.defaultSettings.useRelative,
     useComment: false
   };
-  $scope.dest = null;
   $scope.udAmount = null;
   $scope.commentPattern = BMA.regex.COMMENT;
 
@@ -126,14 +127,16 @@ function TransferModalController($scope, $rootScope, $ionicModal, $state, BMA, W
   };
 
   // Open transfer modal
-  $scope.transfer = function(destPub, dest, amount, callback) {
+  $scope.transfer = function(destPub, destUid, amount, callback) {
     if (!!$scope.transferModal) {
       $scope.formData.destPub = destPub;
-      if(dest) {
-        $scope.dest = dest;
+      if (destUid) {
+        $scope.destUid = destUid;
+        $scope.destPub = '';
       }
       else {
-        $scope.dest = destPub;
+        $scope.destUid = '';
+        $scope.destPub = destPub;
       }
       if (amount && typeof amount === "function") {
         callback = amount;
@@ -244,10 +247,12 @@ function TransferModalController($scope, $rootScope, $ionicModal, $state, BMA, W
 
   $scope.doSelectIdentity = function(pub, uid) {
     if (uid) {
-        $scope.dest = uid;
+        $scope.destUid = uid;
+        $scope.destPub = '';
     }
     else {
-        $scope.dest = pub;
+        $scope.destUid = '';
+        $scope.destPub = pub;
     }
     $scope.formData.destPub = pub;
     $scope.lookupModal.hide();
diff --git a/www/js/controllers/wot-controllers.js b/www/js/controllers/wot-controllers.js
index a50832e7bcd9e0fa1e20908223dd5667e37ba4b8..b1abc52273ae0ae2c25f0960777f00b7e30d9763 100644
--- a/www/js/controllers/wot-controllers.js
+++ b/www/js/controllers/wot-controllers.js
@@ -60,6 +60,7 @@ function WotLookupController($scope, BMA, $state, UIUtils, $timeout, Device, Wal
     else {
       return BMA.wot.lookup({ search: text })
         .then(function(res){
+          if ($scope.search.text !== text) return; // search text has changed
           var idtyKeys = [];
           var idties = res.results.reduce(function(idties, res) {
             return idties.concat(res.uids.reduce(function(uids, idty) {
@@ -410,7 +411,7 @@ function WotCertificationsViewController($scope, $state, BMA, Wallet, UIUtils, $
           UIUtils.toast.show('INFO.CERTIFICATION_DONE');
         })
         .catch(UIUtils.onError('ERROR.SEND_CERTIFICATION_FAILED'));
-      });      
+      });
     })
     .catch(UIUtils.onError('ERROR.LOGIN_FAILED'));
   };
diff --git a/www/templates/wallet/transfer_form.html b/www/templates/wallet/transfer_form.html
index 541acc2328af2ae86a1362dcf5fa105f3ca0fa9a..775d7f921e2e0d821b60ebac4b2c86a00f20836c 100644
--- a/www/templates/wallet/transfer_form.html
+++ b/www/templates/wallet/transfer_form.html
@@ -4,7 +4,7 @@
 
       <a class="item item-icon-right gray ink" ng-click="openWotLookup()">
           <span class="gray" translate>TRANSFER.TO</span>
-          <span class="badge badge-royal">{{dest | formatPubkey}}</span>&nbsp;
+          <span class="badge badge-royal">{{destUid}}{{destPub | formatPubkey}}</span>&nbsp;
           <i class="gray icon ion-ios-arrow-right"></i>
       </a>
       <div class="form-errors"
@@ -20,32 +20,37 @@
               ng-class="{'badge-assertive': (convertedBalance <= 0 || (formData.amount && convertedBalance < formData.amount)), 'badge-balanced': (convertedBalance > 0 && (!formData.amount || convertedBalance >= formData.amount)) }">
               <ion-spinner icon="android" ng-if="!walletData.pubkey"></ion-spinner>
               <span ng-if="walletData.pubkey && !walletData.isMember">
-              {{walletData.pubkey| formatPubkey}}&nbsp;(&nbsp;
+              {{walletData.pubkey| formatPubkey}}&nbsp;&nbsp;
               </span>
               <span ng-if="walletData.isMember">
-                {{walletData.uid}}&nbsp;(&nbsp;
+                {{walletData.uid}}&nbsp;&nbsp;
               </span>
               <span ng-if="walletData.pubkey && !formData.useRelative">{{convertedBalance | formatInteger}} {{unit | abbreviate}}</span>
               <span ng-if="walletData.pubkey && formData.useRelative">{{convertedBalance | formatDecimal}} {{'COMMON.UD' | translate}}<sub>{{unit | abbreviate}}</sub></span>
-              &nbsp;)
           </span>
       </span>
 
       <!-- Amount -->
-      <div class="item item-input item-floating-label item-icon-right" ng-if="!formData.useRelative">
+      <div class="item item-input item-floating-label item-button-right" ng-if="!formData.useRelative">
           <span class="input-label">{{'TRANSFER.AMOUNT' | translate}} ({{unit | abbreviate}})</span>
           <input type="number" name="amount" placeholder="{{'TRANSFER.AMOUNT_HELP' | translate}} ({{unit | abbreviate}})"
                  ng-model="formData.amount" required>
-        <i class="icon ion-android-more-vertical"ng-click="unitPopover.show($event)" >
-        </i>
-      </div>
-      <div class="item item-input item-floating-label item-icon-right" ng-if="formData.useRelative">
-          <span class="input-label">{{'TRANSFER.AMOUNT' | translate}} ({{'COMMON.UD' | translate}}<sub>{{unit | abbreviate}}</sub>)</span>
-          <input type="text" name="amount" placeholder="{{'TRANSFER.AMOUNT_HELP' | translate}} ({{'COMMON.UD' | translate}} {{unit | abbreviate}})" ng-model="formData.amount"
-                 required>
-        <i class="gray icon ion-android-more-vertical"ng-click="unitPopover.show($event)" >
-        </i>
+        <span class="gray button button-block icon ion-arrow-swap hidden-xs hidden-sm" ng-click="unitPopover.show($event)">
+        </span>
+        <span class="gray button button-block button-clear button-icon visible-xs visible-sm" ng-click="unitPopover.show($event)">
+          <i class="icon ion-android-more-vertical"></i>
+        </span>
       </div>
+      <ion-item class="item-input item-floating-label item-button-right" ng-if="formData.useRelative">
+        <span class="input-label">{{'TRANSFER.AMOUNT' | translate}} ({{'COMMON.UD' | translate}}<sub>{{unit | abbreviate}}</sub>)</span>
+        <input type="text" name="amount" placeholder="{{'TRANSFER.AMOUNT_HELP' | translate}} ({{'COMMON.UD' | translate}} {{unit | abbreviate}})" ng-model="formData.amount"
+               required>
+        <span class="gray button button-block icon ion-arrow-swap hidden-xs hidden-sm" ng-click="unitPopover.show($event)">
+        </span>
+        <span class="gray button button-block button-clear button-icon visible-xs visible-sm" ng-click="unitPopover.show($event)">
+          <i class="icon ion-android-more-vertical"></i>
+        </span>
+      </ion-item>
       <div class="form-errors"
            ng-show="transferForm.$submitted && transferForm.amount.$error"
            ng-messages="transferForm.amount.$error">
diff --git a/www/templates/wot/lookup_form.html b/www/templates/wot/lookup_form.html
index 47aba988d40b6ddacb366e4e6f34d778631472a6..fc6243fb58c944f19deb4713f6580c4eacd233f5 100644
--- a/www/templates/wot/lookup_form.html
+++ b/www/templates/wot/lookup_form.html
@@ -15,6 +15,10 @@
             <ion-spinner icon="android"></ion-spinner>
         </label>
 
+        <label class="center assertive" ng-if="!search.looking && search.results.length===0 && search.text.length > 0" translate>
+          COMMON.SEARCH_NO_RESULT
+        </label>
+
         <a ng-if="!search.looking"
            ng-repeat="found in search.results"
            class="item item-icon-left item-avatar ink"