diff --git a/public/css/style.css b/public/css/style.css
index 876bc2f..59bdbc6 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -366,6 +366,11 @@ body {
 	padding: 10px;
 }
 
+.table__cell_center-bold {
+	text-align: center;
+	font-weight: bold;
+}
+
 .pagination {
 	margin-top: 40px;
 	display: flex;
@@ -613,6 +618,10 @@ body {
 		min-width: 48px;
 	}
 
+	.table__cell_full-b32 {
+		display: none;
+	}
+
 	.text-input {
 		padding: 0 6px;
 		font-size: 16px;
@@ -639,4 +648,4 @@ body {
 	.main-menu__item {
 		min-width: 45vw;
 	}
-}
\ No newline at end of file
+}
diff --git a/templates/alive.twig b/templates/alive.twig
index 3d1a30d..cac3ba8 100644
--- a/templates/alive.twig
+++ b/templates/alive.twig
@@ -12,15 +12,19 @@
             <thead class="table__head">
                 <tr class="table__row">
                     <th class="table__cell">Domain</th>
-                    <th class="table__cell">Base32</th>
+                    <th class="table__cell"><dfn title="Address Helper">AH</dfn></th>
+                    <th class="table__cell"><dfn title="Base32 address">B32</dfn></th>
+                    <th class="table__cell table__cell_full-b32">Full Base32</th>
                     <th class="table__cell">Last seen</th>
                 </tr>
             </thead>
             <tbody class="table__body">
                 {% for host in hosts %}
                 <tr class="table__row">
-                    <td class="table__cell"><a href="http://{{ host.host }}/?i2paddresshelper={{ host.base64 }}">{{ host.host }}</a></td>
-                    <td class="table__cell table__cell_long-ass"><a href="http://{{ host.base32 }}.b32.i2p/">{{ host.base32 }}.b32.i2p</a></td>
+                    <td class="table__cell"><a href="http://{{ host.host }}/">{{ host.host }}</a></td>
+                    <td class="table__cell table__cell_center-bold"><a href="http://{{ host.host }}/?i2paddresshelper={{ host.base64 }}">A</a></td>
+                    <td class="table__cell table__cell_center-bold"><a href="http://{{ host.base32 }}.b32.i2p/">B</a></td>
+                    <td class="table__cell table__cell_full-b32 table__cell_long-ass">{{ host.base32 }}.b32.i2p</td>
                     <td class="table__cell">{{ host.last_seen }}</td>
                 </tr>
                 {% endfor %}
diff --git a/templates/all.twig b/templates/all.twig
index 4fc07ed..86af9e3 100644
--- a/templates/all.twig
+++ b/templates/all.twig
@@ -13,15 +13,19 @@
             <thead class="table__head">
                 <tr class="table__row">
                     <th class="table__cell">Domain</th>
-                    <th class="table__cell">Base32</th>
+                    <th class="table__cell"><dfn title="Address Helper">AH</dfn></th>
+                    <th class="table__cell"><dfn title="Base32 address">B32</dfn></th>
+                    <th class="table__cell table__cell_full-b32">Full Base32</th>
                     <th class="table__cell">Last seen</th>
                 </tr>
             </thead>
             <tbody class="table__body">
                 {% for host in hosts %}
                 <tr class="table__row">
-                    <td class="table__cell"><a href="http://{{ host.host }}/?i2paddresshelper={{ host.base64 }}">{{ host.host }}</a></td>
-                    <td class="table__cell table__cell_long-ass"><a href="http://{{ host.base32 }}.b32.i2p/">{{ host.base32 }}.b32.i2p</a></td>
+                    <td class="table__cell"><a href="http://{{ host.host }}/">{{ host.host }}</a></td>
+                    <td class="table__cell table__cell_center-bold"><a href="http://{{ host.host }}/?i2paddresshelper={{ host.base64 }}">A</a></td>
+                    <td class="table__cell table__cell_center-bold"><a href="http://{{ host.base32 }}.b32.i2p/">B</a></td>
+                    <td class="table__cell table__cell_full-b32 table__cell_long-ass">{{ host.base32 }}.b32.i2p</td>
                     <td class="table__cell">{{ host.last_seen != '0000-00-00 00:00:00' ? host.last_seen : 'Never' }}</td>
                 </tr>
                 {% endfor %}
diff --git a/templates/latest.twig b/templates/latest.twig
index e365dd1..6975a46 100644
--- a/templates/latest.twig
+++ b/templates/latest.twig
@@ -13,15 +13,19 @@
             <thead class="table__head">
                 <tr class="table__row">
                     <th class="table__cell">Domain</th>
-                    <th class="table__cell">Base32</th>
+                    <th class="table__cell"><dfn title="Address Helper">AH</dfn></th>
+                    <th class="table__cell"><dfn title="Base32 address">B32</dfn></th>
+                    <th class="table__cell table__cell_full-b32">Full Base32</th>
                     <th class="table__cell">Added</th>
                 </tr>
             </thead>
             <tbody class="table__body">
                 {% for host in hosts %}
                 <tr class="table__row">
-                    <td class="table__cell"><a href="http://{{ host.host }}/?i2paddresshelper={{ host.base64 }}">{{ host.host }}</a></td>
-                    <td class="table__cell table__cell_long-ass"><a href="http://{{ host.base32 }}.b32.i2p/">{{ host.base32 }}.b32.i2p</a></td>
+                    <td class="table__cell"><a href="http://{{ host.host }}/">{{ host.host }}</a></td>
+                    <td class="table__cell table__cell_center-bold"><a href="http://{{ host.host }}/?i2paddresshelper={{ host.base64 }}">A</a></td>
+                    <td class="table__cell table__cell_center-bold"><a href="http://{{ host.base32 }}.b32.i2p/">B</a></td>
+                    <td class="table__cell table__cell_full-b32 table__cell_long-ass">{{ host.base32 }}.b32.i2p</td>
                     <td class="table__cell">{{ host.add_date }}</td>
                 </tr>
                 {% endfor %}
diff --git a/templates/search.twig b/templates/search.twig
index 840ae70..16dc575 100644
--- a/templates/search.twig
+++ b/templates/search.twig
@@ -20,16 +20,20 @@
                 <table class="table">
                     <thead class="table__head">
                         <tr class="table__row">
-                            <td class="table__cell">Domain</td>
-                            <td class="table__cell">Base32</td>
-                            <td class="table__cell">Last seen</td>
+                            <th class="table__cell">Domain</th>
+                            <th class="table__cell"><dfn title="Address Helper">AH</dfn></th>
+                            <th class="table__cell"><dfn title="Base32 address">B32</dfn></th>
+                            <th class="table__cell table__cell_full-b32">Full Base32</th>
+                            <th class="table__cell">Last seen</th>
                         </tr>
                     </thead>
                     <tbody class="table__body">
                         {% for host in result %}
                         <tr class="table__row">
-                            <td class="table__cell"><a href="http://{{ host.host }}/?i2paddresshelper={{ host.base64 }}">{{ host.host }}</a></td>
-                            <td class="table__cell table__cell_long-ass"><a href="http://{{ host.base32 }}.b32.i2p/">{{ host.base32 }}.b32.i2p</a></td>
+                            <td class="table__cell"><a href="http://{{ host.host }}/">{{ host.host }}</a></td>
+                            <td class="table__cell table__cell_center-bold"><a href="http://{{ host.host }}/?i2paddresshelper={{ host.base64 }}">A</a></td>
+                            <td class="table__cell table__cell_center-bold"><a href="http://{{ host.base32 }}.b32.i2p/">B</a></td>
+                            <td class="table__cell table__cell_full-b32 table__cell_long-ass">{{ host.base32 }}.b32.i2p</td>
                             <td class="table__cell">{{ host.last_seen != '0000-00-00 00:00:00' ? host.last_seen : 'Never' }}</td>
                         </tr>
                         {% endfor %}