diff --git a/assets/styles/style.css b/assets/styles/style.css
index 672a474..1cb9179 100644
--- a/assets/styles/style.css
+++ b/assets/styles/style.css
@@ -390,4 +390,9 @@ div.noAddressWrapper {
   font-size: 1.5em;
   text-decoration: underline;
   margin-bottom: 10px;
+}
+
+#sendFromAddressName,
+#sendToAddressName {
+  font-size: 95%;
 }
\ No newline at end of file
diff --git a/assets/templates/addresslist.html b/assets/templates/addresslist.html
index 65e51e6..e94ba19 100644
--- a/assets/templates/addresslist.html
+++ b/assets/templates/addresslist.html
@@ -15,7 +15,7 @@
             <tbody>
                 {{#addressData}}
                     <tr>
-                        <th scope="row" class="colEdit"><button type="button" class="btn btn-etho btnSelectToAddress" data-wallet="{{address}}">Select</button></th>
+                        <th scope="row" class="colEdit"><button type="button" class="btn btn-etho btnSelectToAddress" data-wallet="{{address}}" data-name="{{name}}"">Select</button></th>
                         <td>{{name}}</td>
                         <td><span class="textAddress">{{address}}</span></td>
                     </tr>
diff --git a/assets/templates/send.html b/assets/templates/send.html
index e6b314a..644bb75 100644
--- a/assets/templates/send.html
+++ b/assets/templates/send.html
@@ -10,12 +10,16 @@
                         {{/addressData}}
                     </select>
                     <label for="sendFromAddress">From address:</label>
+                    <small id="sendFromAddressName" class="form-text text-muted"></small>
                 </div>
-                <div class="input-field col s6 addressInputWrapper">
-                    <input id="sendToAddress" placeholder="recipient address" type="text">
+                <div class="input-field col s6">
                     <label for="sendToAddress" class="active">To address:</label>
-                    <button type="button" class="btn btn-etho btnSendToolButton" id="btnAddToAddressBook"><i class="fas fa-plus"></i></button>
-                    <button type="button" class="btn btn-etho btnSendToolButton" id="btnLookForToAddress"><i class="fas fa-search"></i></button>
+                    <div class="addressInputWrapper">
+                        <input id="sendToAddress" placeholder="recipient address" type="text">
+                        <button type="button" class="btn btn-etho btnSendToolButton" id="btnAddToAddressBook"><i class="fas fa-plus"></i></button>
+                        <button type="button" class="btn btn-etho btnSendToolButton" id="btnLookForToAddress"><i class="fas fa-search"></i></button>        
+                    </div>
+                    <small id="sendToAddressName" class="form-text text-muted"></small>
                 </div>
             </div>
             <div class="row">
diff --git a/renderer/addressBook.js b/renderer/addressBook.js
index 265286a..3f164de 100644
--- a/renderer/addressBook.js
+++ b/renderer/addressBook.js
@@ -8,14 +8,14 @@ class AddressBook {
     var addressBook = EthoDatatabse.getAddresses();
 
     // set the wallet name from the dialog box
-    addressBook.names[address] = name;
+    addressBook.names[address.toUpperCase()] = name;
     EthoDatatabse.setAddresses(addressBook);
   }
 
   getAddressName(address) {
     var addressBook = EthoDatatabse.getAddresses();
     // set the wallet name from the dialog box
-    return addressBook.names[address] || "";
+    return addressBook.names[address.toUpperCase()] || "";
   }
 
   getAddressList() {
@@ -131,6 +131,17 @@ $(document).on("render_addressBook", function() {
       EthoAddressBook.renderAddressBook();
     });
   });                
+
+  $(".textAddress").off('click').on('click', function() {
+    EthoMainGUI.copyToClipboard($(this).html());
+
+    iziToast.success({
+      title: 'Copied',
+      message: 'Address was copied to clipboard',
+      position: 'topRight',
+      timeout: 2000
+    }); 
+  });
 });                
   
 EthoAddressBook = new AddressBook();
\ No newline at end of file
diff --git a/renderer/send.js b/renderer/send.js
index bb16c5d..eb93639 100644
--- a/renderer/send.js
+++ b/renderer/send.js
@@ -52,6 +52,7 @@ class SendTransaction {
 
     resetSendForm() {
         if (EthoMainGUI.getAppState() == "send") {
+            $("#sendToAddressName").html("");
             $("#sendToAddress").val("");
             $("#sendAmmount").val(0);
         }
@@ -72,6 +73,26 @@ $(document).on("render_send", function() {
         $("#sendAmmount").val($("#sendMaxAmmount").html());
     });
     
+    $("#sendToAddress").off('input').on('input', function() {
+        var addressName = null;
+        $("#sendToAddressName").html("");
+        addressName = EthoAddressBook.getAddressName($("#sendToAddress").val()); 
+
+        if (!addressName) { 
+            var wallets = EthoDatatabse.getWallets();
+            addressName = wallets.names[$("#sendToAddress").val()];      
+        }
+        $("#sendToAddressName").html(addressName);
+    });
+    
+    $("#sendFromAddress").off('change').on('change', function() {
+        var optionText = $(this).find("option:selected").text();
+        var addrName = optionText.substr(0, optionText.indexOf('-')); 
+        var addrValue = optionText.substr(optionText.indexOf("-") + 1);
+        $(".fromAddressSelect input").val(addrValue.trim());  
+        $("#sendFromAddressName").html(addrName.trim());          
+    });    
+
     $("#btnLookForToAddress").off('click').on('click', function() {
         EthoBlockchain.getAddressListData(
             function(error) {
@@ -94,6 +115,7 @@ $(document).on("render_send", function() {
                 $('#dlgAddressList').iziModal('open');
 
                 $(".btnSelectToAddress").off('click').on('click', function() {
+                    $("#sendToAddressName").html($(this).attr('data-name'));
                     $("#sendToAddress").val($(this).attr('data-wallet'));
                     $('#dlgAddressList').iziModal('close');
                 });