diff --git a/basicswap/templates/identity.html b/basicswap/templates/identity.html
index 0cad1e6..3777e83 100644
--- a/basicswap/templates/identity.html
+++ b/basicswap/templates/identity.html
@@ -45,19 +45,19 @@
           <div class="w-full pt-2">
             <div class="container px-0 mx-auto mt-5">
               <div class="overflow-x-auto relative border sm:rounded-lg">
-                <form method="post">
+                <form method="post" autocomplete="off">
                   <table class="w-full text-sm text-left text-gray-500 outline-none border-gray-300">
                     <thead class="text-xs text-gray-700 border-b uppercase bg-gray-50 outline-none border-gray-300">
                       <tr>
-                        <th scope="col" class="py-3 px-6">Item</th>
-                        <th scope="col">Data </th>
+                        <th scope="col" class="py-3 px-6">Details</th>
+                        <th scope="col">Settings</th>
                       </tr>
                     </thead>
                     {% if data.show_edit_form %}
                     <tr>
                       <td class="py-4 px-6 bold">Label</td>
-                      <td class="py-4">
-                        <input class="appearance-none bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg outline-none focus:ring-blue-500 focus:border-blue-500 block p-2.5" type="text" id="label" name="label" value="{{ data.label }}">
+                      <td class="py-4 pr-5">
+                        <input class="appearance-none bg-gray-50 border w-full border-gray-300 text-gray-900 text-sm rounded-lg outline-none focus:ring-blue-500 focus:border-blue-500 block p-2.5" type="text" id="label" name="label" value="{{ data.label }}">
                       </td>
                     </tr>
                     {% else %}
@@ -97,16 +97,17 @@
               <div class="w-full md:w-0/12">
                 <div class="flex flex-wrap justify-end -m-1.5">
                   {% if data.show_edit_form %}
-                  <div class="w-full md:w-auto p-1.5 ml-2">
-                    <button name="apply" value="Apply" type="submit" class="flex flex-wrap justify-center w-full px-4 py-2.5 bg-blue-500 hover:bg-blue-600 font-medium text-sm text-white border border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none"> <span>Apply</span> </button>
-                  </div>
-                  <div class="w-full md:w-auto p-1.5 ml-2">
-                    <button name="cancel" value="Cancel" type="submit" class="flex flex-wrap justify-center w-full px-4 py-2.5 font-medium text-sm text-coolGray-500 hover:text-coolGray-600 border border-coolGray-200 hover:border-coolGray-300 bg-white rounded-md shadow-button focus:ring-0 focus:outline-none"> <span>Cancel</span> </button>
-                  </div>
+                       <div class="w-full md:w-auto p-1.5 ml-2">
+                          <button name="apply" value="Apply" type="submit" class="flex flex-wrap justify-center w-full px-4 py-2.5 bg-blue-500 hover:bg-blue-600 font-medium text-sm text-white border border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none"><svg class="text-gray-500 w-5 h-5 mr-2" xmlns="http://www.w3.org/2000/svg" height="24" width="24" viewBox="0 0 24 24"><g stroke-linecap="round" stroke-width="2" fill="none" stroke="#ffffff" stroke-linejoin="round" ><polyline points=" 6,12 10,16 18,8 " stroke="#ffffff"></polyline> <circle cx="12" cy="12" r="11"></circle></g></svg>Apply</button>
+                        </div>
+                   <div class="w-full md:w-auto p-1.5 ml-2">
+                          <button name="cancel" value="Cancel" type="submit"class="flex flex-wrap justify-center w-full px-4 py-2.5 font-medium text-sm text-red-500 hover:text-red-600 border border-red-400 hover:border-red-500 bg-white rounded-md shadow-button focus:ring-0 focus:outline-none"><svg class="text-gray-500 w-5 h-5 mr-2" xmlns="http://www.w3.org/2000/svg" height="24" width="24" viewBox="0 0 24 24"><g stroke-linecap="round" stroke-width="2" fill="none" stroke="#ef5844" stroke-linejoin="round" ><line x1="16" y1="8" x2="8" y2="16" stroke="#ef5844"></line> <line x1="16" y1="16" x2="8" y2="8" stroke="#ef5844"></line> <circle cx="12" cy="12" r="11"></circle></g></svg>Cancel</button>
+                        </div>
                   {% else %}
-                  <div class="w-full md:w-auto p-1.5 ml-2">
-                    <button name="edit" value="edit" type="submit" class="flex flex-wrap justify-center w-full px-4 py-2.5 bg-blue-500 hover:bg-blue-600 font-medium text-sm text-white border border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none"> <span>Edit</span> </button>
-                  </div>
+                    <div class="w-full md:w-auto p-1.5">
+                      <button name="edit" value="edit" type="submit" class="flex flex-wrap justify-center w-full px-4 py-2.5 bg-blue-500 hover:bg-blue-600 font-medium text-sm text-white border border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none">
+                      <svg class="text-gray-500 w-5 h-5 mr-2" xmlns="http://www.w3.org/2000/svg" height="24" width="24" viewBox="0 0 24 24"><g stroke-linecap="round" stroke-width="2" fill="none" stroke="#ffffff" stroke-linejoin="round" ><line x1="2" y1="23" x2="22" y2="23" stroke="#ffffff"></line> <line data-cap="butt" x1="13" y1="5" x2="17" y2="9"></line> <polygon points="8 18 3 19 4 14 16 2 20 6 8 18"></polygon></g></svg>Edit</button>
+                    </div>
                 {% endif %} </div>
               </div>
             </div>