diff --git a/basicswap/templates/bid.html b/basicswap/templates/bid.html
index 8b5c2bb..190630f 100644
--- a/basicswap/templates/bid.html
+++ b/basicswap/templates/bid.html
@@ -78,28 +78,45 @@
                   {% if data.was_sent == 'True' %}
                   <tr class="bg-white border-t hover:bg-gray-50">
                     <td class="py-4 px-6 bold">Swap</td>
-                    <td><span class="bold">{{ data.amt_to }} {{ data.ticker_to }}</span> for <span class="bold">{{ data.amt_from }} {{ data.ticker_from }}</span></td>
-                  </tr> {% else %}
+                    <td><span class="bold">(To) {{ data.amt_to }} {{ data.ticker_to }}</span> for <span class="bold">(From) {{ data.amt_from }} {{ data.ticker_from }}</span></td>
+                  </tr>
+                  {% else %}
                   <tr class="bg-white border-t hover:bg-gray-50">
                     <td class="py-4 px-6 bold">Swap</td>
-                    <td><span class="bold">{{ data.amt_from }} {{ data.ticker_from }}</span> for <span class="bold">{{ data.amt_to }} {{ data.ticker_to }}</span></td>
-                  </tr> {% endif %}
+                    <td><span class="bold">(From) {{ data.amt_from }} {{ data.ticker_from }}</span> for <span class="bold">(To) {{ data.amt_to }} {{ data.ticker_to }}</span></td>
+                  </tr>
+                  {% endif %}
                   <tr class="bg-white border-t hover:bg-gray-50">
                     <td class="py-4 px-6 bold">Bid Rate</td>
                     <td>{{ data.bid_rate }}</td>
                   </tr>
+                  {% if data.was_sent == 'True' %}
+                   <tr class="bg-white border-t hover:bg-gray-50">
+                    <td class="py-4 px-6 bold">You Send (To) </td>
+                    <td> <span class="inline-flex align-middle items-center justify-center w-9 h-10 bg-white-50 rounded">
+                      <img class="h-7" src="/static/images/coins/{{ data.coin_to }}.png" alt="{{ data.coin_to }}">
+                    </span> {{ data.coin_to }} </td>
+                  </tr>
                   <tr class="bg-white border-t hover:bg-gray-50">
-                    <td class="py-4 px-6 bold">Coin From (You Send) </td>
+                    <td class="py-4 px-6 bold">You Get (From)</td>
+                    <td> <span class="inline-flex align-middle items-center justify-center w-9 h-10 bg-white-50 rounded">
+                      <img class="h-7" src="/static/images/coins/{{ data.coin_from }}.png" alt="{{ data.coin_from }}">
+                    </span> {{ data.coin_from }} </td>
+                  </tr>
+                  {% else %}
+                  <tr class="bg-white border-t hover:bg-gray-50">
+                    <td class="py-4 px-6 bold">You Send (From)</td>
                     <td> <span class="inline-flex align-middle items-center justify-center w-9 h-10 bg-white-50 rounded">
                       <img class="h-7" src="/static/images/coins/{{ data.coin_from }}.png" alt="{{ data.coin_from }}">
                     </span> {{ data.coin_from }} </td>
                   </tr>
                   <tr class="bg-white border-t hover:bg-gray-50">
-                    <td class="py-4 px-6 bold">Coin To (You Get)</td>
+                    <td class="py-4 px-6 bold">You Get (To)</td>
                     <td> <span class="inline-flex align-middle items-center justify-center w-9 h-10 bg-white-50 rounded">
                       <img class="h-7" src="/static/images/coins/{{ data.coin_to }}.png" alt="{{ data.coin_to }}">
                     </span> {{ data.coin_to }} </td>
                   </tr>
+                  {% endif %}
                   <tr class="bg-white border-t hover:bg-gray-50">
                     <td class="py-4 px-6 bold">Bid State</td>
                     <td>{{ data.bid_state }}</td>
diff --git a/basicswap/templates/bid_xmr.html b/basicswap/templates/bid_xmr.html
index fc6c44b..192203a 100644
--- a/basicswap/templates/bid_xmr.html
+++ b/basicswap/templates/bid_xmr.html
@@ -77,31 +77,45 @@
                   {% if data.was_sent == 'True' %}
                   <tr class="bg-white border-t hover:bg-gray-50">
                     <td class="py-4 px-6 bold">Swap</td>
-                    <td><span class="bold">{{ data.amt_to }} {{ data.ticker_to }}</span> for <span class="bold">{{ data.amt_from }} {{ data.ticker_from }}</span></td>
+                    <td><span class="bold">(To) {{ data.amt_to }} {{ data.ticker_to }}</span> for <span class="bold">(From) {{ data.amt_from }} {{ data.ticker_from }}</span></td>
                   </tr>
                   {% else %}
                   <tr class="bg-white border-t hover:bg-gray-50">
                     <td class="py-4 px-6 bold">Swap</td>
-                    <td><span class="bold">{{ data.amt_from }} {{ data.ticker_from }}</span> for <span class="bold">{{ data.amt_to }} {{ data.ticker_to }}</span></td>
+                    <td><span class="bold">(From) {{ data.amt_from }} {{ data.ticker_from }}</span> for <span class="bold">(To) {{ data.amt_to }} {{ data.ticker_to }}</span></td>
                   </tr>
-
                   {% endif %}
                   <tr class="bg-white border-t hover:bg-gray-50">
                     <td class="py-4 px-6 bold">Bid Rate</td>
                     <td>{{ data.bid_rate }}</td>
                   </tr>
+                  {% if data.was_sent == 'True' %}
+                   <tr class="bg-white border-t hover:bg-gray-50">
+                    <td class="py-4 px-6 bold">You Send (To) </td>
+                    <td> <span class="inline-flex align-middle items-center justify-center w-9 h-10 bg-white-50 rounded">
+                      <img class="h-7" src="/static/images/coins/{{ data.coin_to }}.png" alt="{{ data.coin_to }}">
+                    </span> {{ data.coin_to }} </td>
+                  </tr>
                   <tr class="bg-white border-t hover:bg-gray-50">
-                    <td class="py-4 px-6 bold">Coin From (You Send) </td>
+                    <td class="py-4 px-6 bold">You Get (From)</td>
+                    <td> <span class="inline-flex align-middle items-center justify-center w-9 h-10 bg-white-50 rounded">
+                      <img class="h-7" src="/static/images/coins/{{ data.coin_from }}.png" alt="{{ data.coin_from }}">
+                    </span> {{ data.coin_from }} </td>
+                  </tr>
+                  {% else %}
+                  <tr class="bg-white border-t hover:bg-gray-50">
+                    <td class="py-4 px-6 bold">You Send (From)</td>
                     <td> <span class="inline-flex align-middle items-center justify-center w-9 h-10 bg-white-50 rounded">
                       <img class="h-7" src="/static/images/coins/{{ data.coin_from }}.png" alt="{{ data.coin_from }}">
                     </span> {{ data.coin_from }} </td>
                   </tr>
                   <tr class="bg-white border-t hover:bg-gray-50">
-                    <td class="py-4 px-6 bold">Coin To (You Get)</td>
+                    <td class="py-4 px-6 bold">You Get (To)</td>
                     <td> <span class="inline-flex align-middle items-center justify-center w-9 h-10 bg-white-50 rounded">
                       <img class="h-7" src="/static/images/coins/{{ data.coin_to }}.png" alt="{{ data.coin_to }}">
                     </span> {{ data.coin_to }} </td>
                   </tr>
+                  {% endif %}
                   <tr class="bg-white border-t hover:bg-gray-50">
                     <td class="py-4 px-6 bold">Bid State</td>
                     <td>{{ data.bid_state }}</td>
diff --git a/basicswap/templates/bids.html b/basicswap/templates/bids.html
index 051cd63..9064336 100644
--- a/basicswap/templates/bids.html
+++ b/basicswap/templates/bids.html
@@ -32,14 +32,22 @@
             <h2 class="mb-6 text-4xl font-bold text-white tracking-tighter">{{ page_type_available }} {{ page_type_received }} {{ page_type_sent }}</h2>
             <p class="font-semibold text-coolGray-200">{{ page_type_available_description }} {{ page_type_received_description }} {{ page_type_sent_description }}</p>
           </div>
+          <div class="w-full md:w-1/2 p-3 p-6 container flex flex-wrap items-center justify-end items-center mx-auto">
+            {% if refresh %}
+            <a id="refresh" href="/bid/{{ bid_id }}" class="flex flex-wrap justify-center px-5 py-4 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 fill="#ffffff" >
+                  <path fill="#ffffff" d="M12,3c1.989,0,3.873,0.65,5.43,1.833l-3.604,3.393l9.167,0.983L22.562,0l-3.655,3.442 C16.957,1.862,14.545,1,12,1C5.935,1,1,5.935,1,12h2C3,7.037,7.037,3,12,3z"></path>
+                  <path data-color="color-2" d="M12,21c-1.989,0-3.873-0.65-5.43-1.833l3.604-3.393l-9.167-0.983L1.438,24l3.655-3.442 C7.043,22.138,9.455,23,12,23c6.065,0,11-4.935,11-11h-2C21,16.963,16.963,21,12,21z"></path>
+                </g>
+              </svg> <span>Refresh {{ refresh }} seconds</span> </a>
+            {% endif %}
+          </div>
         </div>
       </div>
     </div>
   </section>
-  <!-- todo -->{% if refresh %}
-  <p>Page Refresh: {{ refresh }} seconds</p> {% endif %} {% for m in messages %}
-  <p>{{ m }}</p> {% endfor %}
-  <!-- todo -->
+  {% include 'inc_messages.html' %}
   <section class="bg-white">
     <div class="pl-6 pr-6 pt-0 pb-0 mt-5 h-full overflow-hidden bg-white">
       <div class="pb-6 border-coolGray-100">
diff --git a/basicswap/templates/footer.html b/basicswap/templates/footer.html
index 3488074..2b818e8 100644
--- a/basicswap/templates/footer.html
+++ b/basicswap/templates/footer.html
@@ -23,7 +23,7 @@
             <p class="text-sm text-coolGray-400 font-medium">GUI 0.1.2 </p> <span class="w-1 h-1 mx-1.5 bg-gray-500 rounded-full"></span>
             <p class="mr-2 text-sm font-bold text-gray-90 ">Made with </p>
             <svg xmlns="http://www.w3.org/2000/svg" height="20" width="20" viewBox="0 0 24 24">
-              <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#f80b0b" stroke-linejoin="round" class="nc-icon-wrapper">
+              <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#f80b0b" stroke-linejoin="round">
                 <path d="M21.243,3.757 c-2.343-2.343-6.142-2.343-8.485,0c-0.289,0.289-0.54,0.6-0.757,0.927c-0.217-0.327-0.469-0.639-0.757-0.927 c-2.343-2.343-6.142-2.343-8.485,0c-2.343,2.343-2.343,6.142,0,8.485L12,21.485l9.243-9.243C23.586,9.899,23.586,6.1,21.243,3.757z"></path>
               </g>
             </svg> <span class="ml-2 text-sm font-bold text-gray-90 ">by TV and CRZ</span> </div>
diff --git a/basicswap/templates/header.html b/basicswap/templates/header.html
index b6aeef6..53cb2c3 100644
--- a/basicswap/templates/header.html
+++ b/basicswap/templates/header.html
@@ -260,11 +260,11 @@
   <div class="flex-shrink-0 w-px h-10 bg-gray-600 ml-4 mr-5"></div>
 
               {% if debug_mode == true %}
-  <!-- dev mode icons on/off -->
+              <!-- dev mode icons on/off -->
               <ul class="xl:flex">
               <li>
                 <div data-tooltip-target="tooltip-DEV" class="ml-5 flex items-center text-gray-50 hover:text-gray-100 text-sm">
-                  <svg class="text-gray-500 w-5 h-5 mr-3" xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 24 24">
+                    <svg class="text-gray-500 w-5 h-5 mr-3" xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 24 24">
                     <g stroke-linecap="round" stroke-width="2" fill="none" stroke="#2ad167" stroke-linejoin="round" class="nc-icon-wrapper">
                       <circle cx="12" cy="12" r="11"></circle>
                       <path data-cap="butt" d="M9,16a3,3,0,0,0,6,0" stroke="#2ad167"></path>
@@ -278,9 +278,38 @@
                   <p>Debug mode: Active </p> {% if debug_ui_mode == true %}
                   <p> Debug UI mode: Active </p> {% endif %} </div>
                 </li>
+
                 </ul>
                 <!-- dev mode icons on/off -->
                 {% endif %}
+
+              {% if debug_mode == true %}
+                <!-- if wallets locked -->
+               <ul class="xl:flex">
+              <li>
+                <div data-tooltip-target="tooltip-locked-wallets" class="ml-5 flex items-center text-gray-50 hover:text-gray-100 text-sm">
+                   <svg class="text-gray-500 w-5 h-5 mr-3" 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="#2ad167" stroke-linejoin="round"><rect x="3" y="11" width="18" height="12" rx="2"></rect><circle cx="12" cy="17" r="2" stroke="#2ad167"></circle><path d="M17,7V6a4.951,4.951,0,0,0-4.9-5H12A4.951,4.951,0,0,0,7,5.9V7" stroke="#2ad167"></path></g></svg>             
+                  <span data-tooltip-target="tooltip-locked-wallets" ></span> </div>
+                <div class="tooltip-arrow" data-popper-arrow></div>
+                <div id="tooltip-locked-wallets" role="tooltip" class="inline-block absolute invisible z-10 py-2 px-3 text-sm font-medium text-white bg-blue-500 rounded-lg shadow-sm opacity-0 transition-opacity duration-300 tooltip">
+                  <p>Wallets locked </p>
+                  <p> </p> </div>
+                </li>                
+                </ul>
+                <!-- else wallets unlocked -->
+                <ul class="xl:flex">
+              <li>
+                <div data-tooltip-target="tooltip-unlocked-wallets" class="ml-5 flex items-center text-gray-50 hover:text-gray-100 text-sm">
+                   <svg class="text-gray-500 w-5 h-5 mr-3" 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="#f80b0b" stroke-linejoin="round" class="nc-icon-wrapper"><rect x="3" y="11" width="18" height="12"></rect><circle cx="12" cy="17" r="2" stroke="#f80b0b"></circle><path data-cap="butt" d="M17,6a4.951,4.951,0,0,0-4.9-5H12A4.951,4.951,0,0,0,7,5.9V11"></path></g></svg>        
+                  <span data-tooltip-target="tooltip-unlocked-wallets" ></span> </div>
+                <div class="tooltip-arrow" data-popper-arrow></div>
+                <div id="tooltip-unlocked-wallets" role="tooltip" class="inline-block absolute invisible z-10 py-2 px-3 text-sm font-medium text-white bg-blue-500 rounded-lg shadow-sm opacity-0 transition-opacity duration-300 tooltip">
+                  <p>Wallets unlocked </p>
+                  <p> </p> </div>
+                </li>                
+                </ul>
+                 <!-- end wallets locked/unlock -->
+                {% endif %}
                 {% if use_tor_proxy == true %}
                 <!-- tor -->
                 <ul class="xl:flex ml-5">
diff --git a/basicswap/templates/offer.html b/basicswap/templates/offer.html
index 8af6767..dfad83e 100644
--- a/basicswap/templates/offer.html
+++ b/basicswap/templates/offer.html
@@ -33,16 +33,26 @@
             <h2 class="mb-6 text-4xl font-bold text-white tracking-tighter">Offer (normal)</h2>
             <p class="font-semibold text-coolGray-200">Offer ID: {{ offer_id }}</p>
           </div>
-          <div class="w-full md:w-1/2 p-3"> {% if refresh %}
-            <a id="refresh" href=/offer/{{ offer_id }}>
-              <button class="block md:ml-auto px-5 py-3 font-medium text-lcg text-white bg-blue-500 hover:bg-blue-600 rounded-md focus:ring-0 focus:outline-none">Refresh {{ refresh }} seconds</button>
-            </a>
-            {% else %}
-            <a id="refresh" href=/offer/{{ offer_id }}>
-              <button class="block md:ml-auto px-5 py-3 font-medium text-lcg text-white bg-blue-500 hover:bg-blue-600 rounded-md focus:ring-0 focus:outline-none">Refresh</button>
-            </a>
-          {% endif %} </div>
-        </div>
+          <div class="w-full md:w-1/2 p-3 p-6 container flex flex-wrap items-center justify-end items-center mx-auto"> 
+            {% if refresh %}
+            <a id="refresh" href="/offer/{{ offer_id }}" class="flex flex-wrap justify-center px-5 py-4 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 fill="#ffffff">
+                  <path fill="#ffffff" d="M12,3c1.989,0,3.873,0.65,5.43,1.833l-3.604,3.393l9.167,0.983L22.562,0l-3.655,3.442 C16.957,1.862,14.545,1,12,1C5.935,1,1,5.935,1,12h2C3,7.037,7.037,3,12,3z"></path>
+                  <path data-color="color-2" d="M12,21c-1.989,0-3.873-0.65-5.43-1.833l3.604-3.393l-9.167-0.983L1.438,24l3.655-3.442 C7.043,22.138,9.455,23,12,23c6.065,0,11-4.935,11-11h-2C21,16.963,16.963,21,12,21z"></path>
+                </g>
+              </svg> <span>Refresh {{ refresh }} seconds</span> </a>
+              {% else %}
+            <a id="refresh" href="/offer/{{ offer_id }}" class="flex flex-wrap justify-center px-5 py-4 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 fill="#ffffff">
+                  <path fill="#ffffff" d="M12,3c1.989,0,3.873,0.65,5.43,1.833l-3.604,3.393l9.167,0.983L22.562,0l-3.655,3.442 C16.957,1.862,14.545,1,12,1C5.935,1,1,5.935,1,12h2C3,7.037,7.037,3,12,3z"></path>
+                  <path data-color="color-2" d="M12,21c-1.989,0-3.873-0.65-5.43-1.833l3.604-3.393l-9.167-0.983L1.438,24l3.655-3.442 C7.043,22.138,9.455,23,12,23c6.065,0,11-4.935,11-11h-2C21,16.963,16.963,21,12,21z"></path>
+                </g>
+              </svg> <span>Refresh</span> </a> 
+            {% endif %} 
+          </div>
+        </div>       
       </div>
     </div>
   </section>
@@ -85,8 +95,8 @@
                 <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"></th>
                     </tr>
                   </thead>
                   <tr class="bg-white border-t hover:bg-gray-50">
@@ -94,20 +104,24 @@
                     <td>{{ data.state }}</td>
                   </tr>
                   <tr class="bg-white border-t hover:bg-gray-50">
-                    <td class="py-4 px-6 bold">Coin From</td>
-                    <td>{{ data.coin_from }}</td>
+                  <td class="py-4 px-6 bold">Coin From (From)</td>
+                  <td><span class="inline-flex align-middle items-center justify-center w-9 h-10 bg-white-50 rounded">
+                      <img class="h-7" src="/static/images/coins/{{ data.coin_from }}.png" alt="{{ data.coin_from }}">
+                    </span> {{ data.coin_from }} </td>
                   </tr>
                   <tr class="bg-white border-t hover:bg-gray-50">
-                    <td class="py-4 px-6 bold">Coin To</td>
-                    <td>{{ data.coin_to }}</td>
+                    <td class="py-4 px-6 bold">Coin To (To)</td>
+                  <td><span class="inline-flex align-middle items-center justify-center w-9 h-10 bg-white-50 rounded">
+                      <img class="h-7" src="/static/images/coins/{{ data.coin_to }}.png" alt="{{ data.coin_to }}">
+                    </span> {{ data.coin_to }} </td>
                   </tr>
                   <tr class="bg-white border-t hover:bg-gray-50">
-                    <td class="py-4 px-6 bold">Amount From</td>
-                    <td>{{ data.amt_from }} {{ data.tla_from }}</td>
+                    <td class="py-4 px-6 bold">Amount (From)</td>
+                    <td class="bold">{{ data.amt_from }} {{ data.tla_from }}</td>
                   </tr>
                   <tr class="bg-white border-t hover:bg-gray-50">
-                    <td class="py-4 px-6 bold">Amount To</td>
-                    <td>{{ data.amt_to }} {{ data.tla_to }}</td>
+                    <td class="py-4 px-6 bold">Amount (To)</td>
+                    <td class="bold">{{ data.amt_to }} {{ data.tla_to }}</td>
                   </tr>
                   <tr class="bg-white border-t hover:bg-gray-50">
                     <td class="py-4 px-6 bold">Minimum Bid Amount</td>
@@ -143,11 +157,11 @@
                   </tr> {% else %}
                   <tr class="bg-white border-t hover:bg-gray-50">
                     <td class="py-4 px-6 bold">Address To</td>
-                    <td><a class="monospace" href="/identity/{{ data.addr_to }}">{{ data.addr_to }}</a> {{ data.addr_to_label }}</td>
+                    <td><a class="monospace bold" href="/identity/{{ data.addr_to }}">{{ data.addr_to }}</a> {{ data.addr_to_label }}</td>
                   </tr> {% endif %}
                   <tr class="bg-white border-t hover:bg-gray-50">
                     <td class="py-4 px-6 bold">Address From</td>
-                    <td><a class="monospace" href="/identity/{{ data.addr_from }}">{{ data.addr_from }}</a> {{ data.addr_from_label }}</td>
+                    <td><a class="monospace bold" href="/identity/{{ data.addr_from }}">{{ data.addr_from }}</a> {{ data.addr_from_label }}</td>
                   </tr>
                   <tr class="bg-white border-t hover:bg-gray-50">
                     <td class="py-4 px-6 bold">Created At</td>
@@ -190,7 +204,7 @@
                   <h4 class="font-semibold text-black text-2xl">Bids</h4> </div>
               </div>
             </section>
-            <div class="container px-0 mx-auto mt-5">
+            <div class="container px-0 mx-auto">
               <div class="overflow-x-auto relative border sm:rounded-lg">
                 <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">
@@ -222,7 +236,7 @@
                     <h4 class="font-semibold text-black text-2xl">New Bid</h4> </div>
                 </div>
               </section>
-              <div class="container px-0 mx-auto mt-5">
+              <div class="container px-0 mx-auto">
                 <div class="overflow-x-auto relative border sm:rounded-lg">
                   <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">
@@ -307,17 +321,33 @@
               <div class="p-6 pt-10 bg-white bg-opacity-60 rounded-b-md">
                 <div class="w-full md:w-0/12">
                   <div class="flex flex-wrap justify-end -m-1.5">
-                    <div class="w-full md:w-auto p-1.5 ml-2">
-                      <button name="newbid" value="New Bid" 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>New Bid</span> </button>
-                    </div>
+                        <div class="w-full md:w-auto p-1.5 ml-2">
+                          <button name="newbid" value="New Bid" 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">
+                  <circle cx="5" cy="5" r="4"></circle>
+                  <circle cx="19" cy="19" r="4"></circle>
+                  <polyline data-cap="butt" points="13,5 21,5 21,11 " stroke="#ffffff"></polyline>
+                  <polyline data-cap="butt" points="11,19 3,19 3,13 " stroke="#ffffff"></polyline>
+                  <polyline points=" 16,2 13,5 16,8 " stroke="#ffffff"></polyline>
+                  <polyline points=" 8,16 11,19 8,22 " stroke="#ffffff"></polyline>
+                </g>
+              </svg>New Bid</button>
+                        </div>
                     {% if data.sent == 'True' %}
-                    <div class="w-full md:w-auto p-1.5 ml-2">
-                      <button name="repeat_offer" value="Repeat Offer" 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>Repeat Offer</span> </button>
+                    <div class="w-full md:w-auto p-1.5">
+                      <button name="repeat_offer" value="Repeat Offer" 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">
+                        <svg class="mr-2" xmlns="http://www.w3.org/2000/svg" height="20" width="20" viewBox="0 0 24 24">
+                          <g fill="#556987">
+                            <path fill="#556987" d="M12,3c1.989,0,3.873,0.65,5.43,1.833l-3.604,3.393l9.167,0.983L22.562,0l-3.655,3.442 C16.957,1.862,14.545,1,12,1C5.935,1,1,5.935,1,12h2C3,7.037,7.037,3,12,3z"></path>
+                            <path data-color="#556987" d="M12,21c-1.989,0-3.873-0.65-5.43-1.833l3.604-3.393l-9.167-0.983L1.438,24l3.655-3.442 C7.043,22.138,9.455,23,12,23c6.065,0,11-4.935,11-11h-2C21,16.963,16.963,21,12,21z"></path>
+                          </g>
+                        </svg> <span>Repeat Offer</span> </button>
                     </div>
                     {% if data.was_revoked != true %}
-                    <div class="w-full md:w-auto p-1.5 ml-2">
-                      <button name="revoke_offer" value="Revoke Offer" type="submit" onclick="return confirmPopup();" 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>Revoke Offer</span> </button>
-                    </div>
+                       <div class="w-full md:w-auto p-1.5">
+                          <button name="revoke_offer" value="Revoke Offer" type="submit" onclick="return confirmPopup();" 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> Revoke Offer </button>
+                        </div>
                     {% endif %}
                     {% endif %}
                     <!-- todo
diff --git a/basicswap/templates/offer_confirm.html b/basicswap/templates/offer_confirm.html
index 3720f61..ebdad34 100644
--- a/basicswap/templates/offer_confirm.html
+++ b/basicswap/templates/offer_confirm.html
@@ -162,7 +162,7 @@
               <div class="w-full md:w-10/12">
                 <div class="flex flex-wrap -m-3">
                   <div class="w-full md:w-1/3 p-3">
-                    <p class="text-sm text-coolGray-800 font-semibold">You Send</p>
+                    <p class="text-sm text-coolGray-800 font-semibold">You Send (From)</p>
                   </div>
                   <div class="w-full md:flex-1 p-3">
                     <div class="flex flex-wrap -m-3">
@@ -172,7 +172,7 @@
                             <path d="M11.3333 6.1133C11.2084 5.98913 11.0395 5.91943 10.8633 5.91943C10.6872 5.91943 10.5182 5.98913 10.3933 6.1133L8.00001 8.47329L5.64001 6.1133C5.5151 5.98913 5.34613 5.91943 5.17001 5.91943C4.99388 5.91943 4.82491 5.98913 4.70001 6.1133C4.63752 6.17527 4.58792 6.249 4.55408 6.33024C4.52023 6.41148 4.50281 6.49862 4.50281 6.58663C4.50281 6.67464 4.52023 6.76177 4.55408 6.84301C4.58792 6.92425 4.63752 6.99799 4.70001 7.05996L7.52667 9.88663C7.58865 9.94911 7.66238 9.99871 7.74362 10.0326C7.82486 10.0664 7.912 10.0838 8.00001 10.0838C8.08801 10.0838 8.17515 10.0664 8.25639 10.0326C8.33763 9.99871 8.41136 9.94911 8.47334 9.88663L11.3333 7.05996C11.3958 6.99799 11.4454 6.92425 11.4793 6.84301C11.5131 6.76177 11.5305 6.67464 11.5305 6.58663C11.5305 6.49862 11.5131 6.41148 11.4793 6.33024C11.4454 6.249 11.3958 6.17527 11.3333 6.1133Z" fill="#8896AB"> </path>
                           </svg>
                           <select is="ms-dropdown" class="pl-10 appearance-none pr-10 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 w-full p-5 opacity-70" id="coin_from" name="coin_from" onchange="set_rate('coin_from');" disabled>
-                            <option value="-1">Coin</option>
+                            <option value="-1"></option>
                             {% for c in coins_from %}
                             <option{% if data.coin_from==c[0] %} selected{% endif %} value="{{ c[0] }}" data-image="/static/images/coins/{{ c[1]|replace(" ", "-") }}-20.png">{{ c[1] }}</option>
                             {% endfor %}
@@ -260,7 +260,7 @@
               <div class="w-full md:w-10/12">
                 <div class="flex flex-wrap -m-3">
                   <div class="w-full md:w-1/3 p-3">
-                    <p class="text-sm text-coolGray-800 font-semibold">You Get</p>
+                    <p class="text-sm text-coolGray-800 font-semibold">You Get (To)</p>
                   </div>
                   <div class="w-full md:flex-1 p-3">
                     <div class="flex flex-wrap -m-3">
@@ -270,7 +270,7 @@
                             <path d="M11.3333 6.1133C11.2084 5.98913 11.0395 5.91943 10.8633 5.91943C10.6872 5.91943 10.5182 5.98913 10.3933 6.1133L8.00001 8.47329L5.64001 6.1133C5.5151 5.98913 5.34613 5.91943 5.17001 5.91943C4.99388 5.91943 4.82491 5.98913 4.70001 6.1133C4.63752 6.17527 4.58792 6.249 4.55408 6.33024C4.52023 6.41148 4.50281 6.49862 4.50281 6.58663C4.50281 6.67464 4.52023 6.76177 4.55408 6.84301C4.58792 6.92425 4.63752 6.99799 4.70001 7.05996L7.52667 9.88663C7.58865 9.94911 7.66238 9.99871 7.74362 10.0326C7.82486 10.0664 7.912 10.0838 8.00001 10.0838C8.08801 10.0838 8.17515 10.0664 8.25639 10.0326C8.33763 9.99871 8.41136 9.94911 8.47334 9.88663L11.3333 7.05996C11.3958 6.99799 11.4454 6.92425 11.4793 6.84301C11.5131 6.76177 11.5305 6.67464 11.5305 6.58663C11.5305 6.49862 11.5131 6.41148 11.4793 6.33024C11.4454 6.249 11.3958 6.17527 11.3333 6.1133Z" fill="#8896AB"> </path>
                           </svg>
                           <select is="ms-dropdown" class="pl-10 appearance-none pr-10 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 w-full p-5 opacity-70" id="coin_to" name="coin_to" onchange="set_rate('coin_to');" disabled>
-                            <option value="-1">Coin</option>
+                            <option value="-1"></option>
                             {% for c in coins %}
                             <option{% if data.coin_to==c[0] %} selected{% endif %} value="{{ c[0] }}" data-image="/static/images/coins/{{ c[1]|replace(" ", "-") }}-20.png">{{ c[1] }}</option>
                             {% endfor %}
@@ -577,11 +577,7 @@
                 <div class="flex flex-wrap justify-end -m-1.5">
                   <div class="w-full md:w-auto p-1.5">
                     <button name="step2" type="submit" value="Back" 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">
-                      <svg class="mr-2" xmlns="http://www.w3.org/2000/svg" height="20" width="20" viewBox="0 0 24 24">
-                        <g fill="#556987">
-                          <path fill="#556987" d="M12,3c1.989,0,3.873,0.65,5.43,1.833l-3.604,3.393l9.167,0.983L22.562,0l-3.655,3.442 C16.957,1.862,14.545,1,12,1C5.935,1,1,5.935,1,12h2C3,7.037,7.037,3,12,3z"></path>
-                          <path data-color="#556987" d="M12,21c-1.989,0-3.873-0.65-5.43-1.833l3.604-3.393l-9.167-0.983L1.438,24l3.655-3.442 C7.043,22.138,9.455,23,12,23c6.065,0,11-4.935,11-11h-2C21,16.963,16.963,21,12,21z"></path>
-                        </g>
+                      <svg class="mr-2" xmlns="http://www.w3.org/2000/svg" height="20" width="20" viewBox="0 0 24 24"><g stroke-linecap="round" stroke-width="2" fill="none" stroke="#556987" stroke-linejoin="round"><circle cx="12" cy="12" r="11"></circle><polyline points="13 16 9 12 13 8" stroke="#556987"></polyline></g></svg>
                       </svg> <span>Back</span> </button>
                   </div>
                   <div class="w-full md:w-auto p-1.5">
diff --git a/basicswap/templates/offer_new_1.html b/basicswap/templates/offer_new_1.html
index fd16191..147ca1b 100644
--- a/basicswap/templates/offer_new_1.html
+++ b/basicswap/templates/offer_new_1.html
@@ -150,7 +150,7 @@
                 <div class="w-full md:w-10/12">
                   <div class="flex flex-wrap -m-3">
                     <div class="w-full md:w-1/3 p-3">
-                      <p class="text-sm text-coolGray-800 font-semibold">You Send</p>
+                      <p class="text-sm text-coolGray-800 font-semibold">You Send (From</p>
                     </div>
                     <div class="w-full md:flex-1 p-3">
                       <div class="flex flex-wrap -m-3">
@@ -160,7 +160,7 @@
                               <path d="M11.3333 6.1133C11.2084 5.98913 11.0395 5.91943 10.8633 5.91943C10.6872 5.91943 10.5182 5.98913 10.3933 6.1133L8.00001 8.47329L5.64001 6.1133C5.5151 5.98913 5.34613 5.91943 5.17001 5.91943C4.99388 5.91943 4.82491 5.98913 4.70001 6.1133C4.63752 6.17527 4.58792 6.249 4.55408 6.33024C4.52023 6.41148 4.50281 6.49862 4.50281 6.58663C4.50281 6.67464 4.52023 6.76177 4.55408 6.84301C4.58792 6.92425 4.63752 6.99799 4.70001 7.05996L7.52667 9.88663C7.58865 9.94911 7.66238 9.99871 7.74362 10.0326C7.82486 10.0664 7.912 10.0838 8.00001 10.0838C8.08801 10.0838 8.17515 10.0664 8.25639 10.0326C8.33763 9.99871 8.41136 9.94911 8.47334 9.88663L11.3333 7.05996C11.3958 6.99799 11.4454 6.92425 11.4793 6.84301C11.5131 6.76177 11.5305 6.67464 11.5305 6.58663C11.5305 6.49862 11.5131 6.41148 11.4793 6.33024C11.4454 6.249 11.3958 6.17527 11.3333 6.1133Z" fill="#8896AB"> </path>
                             </svg>
                             <select is="ms-dropdown" class="pl-10 appearance-none pr-10 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 w-full p-2.5" id="coin_from" name="coin_from" onchange="set_rate('coin_from');">
-                              <option value="-1">Select coin you send:</option>
+                              <option value="-1">Select coin you send (From):</option>
                               {% for c in coins_from %}
                              <option{% if data.coin_to==c[0] %} selected{% endif %} value="{{ c[0] }}" data-image="/static/images/coins/{{ c[1]|replace(" ", "-") }}-20.png">{{ c[1] }}</option>
                               {% endfor %}
@@ -191,7 +191,7 @@
                 <div class="w-full md:w-10/12">
                   <div class="flex flex-wrap -m-3">
                     <div class="w-full md:w-1/3 p-3">
-                      <p class="text-sm text-coolGray-800 font-semibold">You Get</p>
+                      <p class="text-sm text-coolGray-800 font-semibold">You Get (To)</p>
                     </div>
                     <div class="w-full md:flex-1 p-3">
                       <div class="flex flex-wrap -m-3">
@@ -201,7 +201,7 @@
                               <path d="M11.3333 6.1133C11.2084 5.98913 11.0395 5.91943 10.8633 5.91943C10.6872 5.91943 10.5182 5.98913 10.3933 6.1133L8.00001 8.47329L5.64001 6.1133C5.5151 5.98913 5.34613 5.91943 5.17001 5.91943C4.99388 5.91943 4.82491 5.98913 4.70001 6.1133C4.63752 6.17527 4.58792 6.249 4.55408 6.33024C4.52023 6.41148 4.50281 6.49862 4.50281 6.58663C4.50281 6.67464 4.52023 6.76177 4.55408 6.84301C4.58792 6.92425 4.63752 6.99799 4.70001 7.05996L7.52667 9.88663C7.58865 9.94911 7.66238 9.99871 7.74362 10.0326C7.82486 10.0664 7.912 10.0838 8.00001 10.0838C8.08801 10.0838 8.17515 10.0664 8.25639 10.0326C8.33763 9.99871 8.41136 9.94911 8.47334 9.88663L11.3333 7.05996C11.3958 6.99799 11.4454 6.92425 11.4793 6.84301C11.5131 6.76177 11.5305 6.67464 11.5305 6.58663C11.5305 6.49862 11.5131 6.41148 11.4793 6.33024C11.4454 6.249 11.3958 6.17527 11.3333 6.1133Z" fill="#8896AB"> </path>
                             </svg>
                             <select is="ms-dropdown" class="pl-10 appearance-none pr-10 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 w-full p-5" id="coin_to" name="coin_to" onchange="set_rate('coin_to');">
-                              <option value="-1">Select coin you get:</option>
+                              <option value="-1">Select coin you get (To):</option>
                               {% for c in coins %}
                               <option{% if data.coin_to==c[0] %} selected{% endif %} value="{{ c[0] }}" data-image="/static/images/coins/{{ c[1]|replace(" ", "-") }}-20.png">{{ c[1] }}</option>
                               {% endfor %}
diff --git a/basicswap/templates/offer_new_2.html b/basicswap/templates/offer_new_2.html
index 55bcbee..9bfa435 100644
--- a/basicswap/templates/offer_new_2.html
+++ b/basicswap/templates/offer_new_2.html
@@ -153,7 +153,7 @@
               <div class="w-full md:w-10/12">
                 <div class="flex flex-wrap -m-3">
                   <div class="w-full md:w-1/3 p-3">
-                    <p class="text-sm text-coolGray-800 font-semibold">You Send</p>
+                    <p class="text-sm text-coolGray-800 font-semibold">You Send (From)</p>
                   </div>
                   <div class="w-full md:flex-1 p-3">
                     <div class="flex flex-wrap -m-3">
@@ -163,7 +163,7 @@
                             <path d="M11.3333 6.1133C11.2084 5.98913 11.0395 5.91943 10.8633 5.91943C10.6872 5.91943 10.5182 5.98913 10.3933 6.1133L8.00001 8.47329L5.64001 6.1133C5.5151 5.98913 5.34613 5.91943 5.17001 5.91943C4.99388 5.91943 4.82491 5.98913 4.70001 6.1133C4.63752 6.17527 4.58792 6.249 4.55408 6.33024C4.52023 6.41148 4.50281 6.49862 4.50281 6.58663C4.50281 6.67464 4.52023 6.76177 4.55408 6.84301C4.58792 6.92425 4.63752 6.99799 4.70001 7.05996L7.52667 9.88663C7.58865 9.94911 7.66238 9.99871 7.74362 10.0326C7.82486 10.0664 7.912 10.0838 8.00001 10.0838C8.08801 10.0838 8.17515 10.0664 8.25639 10.0326C8.33763 9.99871 8.41136 9.94911 8.47334 9.88663L11.3333 7.05996C11.3958 6.99799 11.4454 6.92425 11.4793 6.84301C11.5131 6.76177 11.5305 6.67464 11.5305 6.58663C11.5305 6.49862 11.5131 6.41148 11.4793 6.33024C11.4454 6.249 11.3958 6.17527 11.3333 6.1133Z" fill="#8896AB"> </path>
                           </svg>
                           <select is="ms-dropdown" class="pl-10 appearance-none pr-10 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 w-full p-5" id="coin_from" name="coin_from" onchange="set_rate('coin_from');" disabled>
-                            <option value="-1">Coin</option>
+                            <option value="-1"></option>
                             {% for c in coins_from %}
                             <option{% if data.coin_from==c[0] %} selected{% endif %} value="{{ c[0] }}" data-image="/static/images/coins/{{ c[1]|replace(" ", "-") }}-20.png">{{ c[1] }}</option>
                             {% endfor %}
@@ -237,7 +237,7 @@
               <div class="w-full md:w-10/12">
                 <div class="flex flex-wrap -m-3">
                   <div class="w-full md:w-1/3 p-3">
-                    <p class="text-sm text-coolGray-800 font-semibold">You Get</p>
+                    <p class="text-sm text-coolGray-800 font-semibold">You Get (To)</p>
                   </div>
                   <div class="w-full md:flex-1 p-3">
                     <div class="flex flex-wrap -m-3">
@@ -247,7 +247,7 @@
                             <path d="M11.3333 6.1133C11.2084 5.98913 11.0395 5.91943 10.8633 5.91943C10.6872 5.91943 10.5182 5.98913 10.3933 6.1133L8.00001 8.47329L5.64001 6.1133C5.5151 5.98913 5.34613 5.91943 5.17001 5.91943C4.99388 5.91943 4.82491 5.98913 4.70001 6.1133C4.63752 6.17527 4.58792 6.249 4.55408 6.33024C4.52023 6.41148 4.50281 6.49862 4.50281 6.58663C4.50281 6.67464 4.52023 6.76177 4.55408 6.84301C4.58792 6.92425 4.63752 6.99799 4.70001 7.05996L7.52667 9.88663C7.58865 9.94911 7.66238 9.99871 7.74362 10.0326C7.82486 10.0664 7.912 10.0838 8.00001 10.0838C8.08801 10.0838 8.17515 10.0664 8.25639 10.0326C8.33763 9.99871 8.41136 9.94911 8.47334 9.88663L11.3333 7.05996C11.3958 6.99799 11.4454 6.92425 11.4793 6.84301C11.5131 6.76177 11.5305 6.67464 11.5305 6.58663C11.5305 6.49862 11.5131 6.41148 11.4793 6.33024C11.4454 6.249 11.3958 6.17527 11.3333 6.1133Z" fill="#8896AB"> </path>
                           </svg>
                           <select is="ms-dropdown" class="pl-10 appearance-none pr-10 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 w-full p-5" id="coin_to" name="coin_to" onchange="set_rate('coin_to');" disabled>
-                            <option value="-1">Coin</option>
+                            <option value="-1"></option>
                             {% for c in coins %}
                             <option{% if data.coin_to==c[0] %} selected{% endif %} value="{{ c[0] }}" data-image="/static/images/coins/{{ c[1]|replace(" ", "-") }}-20.png">{{ c[1] }}</option>
                             {% endfor %}
@@ -495,11 +495,7 @@
                 <div class="flex flex-wrap justify-end -m-1.5">
                   <div class="w-full md:w-auto p-1.5">
                     <button name="step1" type="submit" value="Back" 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">
-                      <svg class="mr-2" xmlns="http://www.w3.org/2000/svg" height="20" width="20" viewBox="0 0 24 24">
-                        <g fill="#556987">
-                          <path fill="#556987" d="M12,3c1.989,0,3.873,0.65,5.43,1.833l-3.604,3.393l9.167,0.983L22.562,0l-3.655,3.442 C16.957,1.862,14.545,1,12,1C5.935,1,1,5.935,1,12h2C3,7.037,7.037,3,12,3z"></path>
-                          <path data-color="#556987" d="M12,21c-1.989,0-3.873-0.65-5.43-1.833l3.604-3.393l-9.167-0.983L1.438,24l3.655-3.442 C7.043,22.138,9.455,23,12,23c6.065,0,11-4.935,11-11h-2C21,16.963,16.963,21,12,21z"></path>
-                        </g>
+                      <svg class="mr-2" xmlns="http://www.w3.org/2000/svg" height="20" width="20" viewBox="0 0 24 24"><g stroke-linecap="round" stroke-width="2" fill="none" stroke="#556987" stroke-linejoin="round"><circle cx="12" cy="12" r="11"></circle><polyline points="13 16 9 12 13 8" stroke="#556987"></polyline></g></svg>
                       </svg> <span>Back</span> </button>
                   </div>
                   <div class="w-full md:w-auto p-1.5">
diff --git a/basicswap/templates/offers.html b/basicswap/templates/offers.html
index eea66ca..b986be6 100644
--- a/basicswap/templates/offers.html
+++ b/basicswap/templates/offers.html
@@ -334,12 +334,12 @@
                     <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"> TIME AT </th>
-                        <th scope="col" class="py-3 px-6"> From </th>
+                        <th scope="col" class="py-3 px-6"> Network </th>
                         <th scope="col" class="py-3 px-6"> Recipient </th>
                         <!--<th scope="col" class="py-3 px-6">ID</th>-->
-                        <th scope="col" class="py-3"> You Get </th>
+                        <th scope="col" class="py-3"> You Get (From) </th>
                         <th scope="col" class="py-3"></th>
-                        <th scope="col" class="py-3"> You Send </th>
+                        <th scope="col" class="py-3"> You Send (To)</th>
                         <th scope="col" class="py-3"></th>
                         <th scope="col" class="py-3 px-6"> Rate </th>
                         <!--Todo: Add swap + id back -->
@@ -363,7 +363,7 @@
                         <!--<td class="py-4 px-6 text-xs"><a class="monospace text-xs" href=/offer/{{ o[1] }}>{{ o[1]|truncate(6, True) }}</a></td>-->
                         <!--<td class="py-4 px-6 text-xs monospace">{{ o[8] }}{% if o[9]==true %} <b>Sent</b>{% endif %}</td>-->
                         <!--Todo: Add link back -->
-                        <td class="py-4 px-6 monospace">{{ o[7] }} {% if o[12]==2 %}Revoked{% elif o[11]==true %}Not Active{% else %}Active{% endif %}</td>
+                        <td class="py-4 px-6 monospace">{{ o[7] }} {% if o[12]==2 %}(Revoked){% elif o[11]==true %}(Not Active){% else %}(Active){% endif %}</td>
                         <td class="py-4 px-6 text-xs monospace"><a href="/identity/{{ o[8] }}{% if o[9]==true %}{% endif %}">{{ o[8] }}</a></td>
                         <td class="py-4"><span class="inline-flex align-middle items-center justify-center w-9 h-10 bg-white-50 rounded"><img class="h-7" src="/static/images/coins/{{ o[2]|replace(" ", "-") }}.png" alt=""></span> {{ o[2] }}</td>
                         <td class="py-4 text-xs">{{ o[4] }}</td>