diff --git a/src/web/templates/service.html b/src/web/templates/service.html
index 5c7a1e2..109c378 100644
--- a/src/web/templates/service.html
+++ b/src/web/templates/service.html
@@ -1,9 +1,9 @@
-<section class="mt-12 mb-5">
+<section class="mt-10 mb-5">
     <div class="flex items-center justify-center space-x-4">
-        <img class="w-16 h-16 rounded-full" src="{{.Service.LogoURL}}" alt="">
+        <img class="rounded-full w-14 h-14" src="{{.Service.LogoURL}}" alt="">
         <span class="flex items-center justify-center capitalize">
+            <span class="text-3xl font-bold">{{.Service.Name}}</span>
             {{if .Service.Verified}}
-                <span class="text-2xl font-bold">{{.Service.Name}}</span>
                 <a href="/about#verified">
                     <svg xmlns="http://www.w3.org/2000/svg" class="w-6 h-6 ml-1 {{if .Service.Verified}}text-blue-400/80{{else}} text-white/20 {{end}} discount-check-filled" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
                         <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
@@ -14,7 +14,7 @@
         </span>
     </div>
     <!-- Links -->
-    <div class="flex items-center justify-center mt-4 text-sm md:text-md">
+    <div class="flex items-center justify-center mt-4 text-md md:text-md">
         <div class="flex items-center justify-center">
             <a href="{{index .Service.Urls 0}}" target="_blank" class="flex items-center justify-center px-2 py-1 m-1 space-x-2 text-center text-white transition duration-300 border rounded bg-zinc-900 border-zinc-700 hover:border-lime-600 hover:text-lime-600">
                 <svg xmlns="http://www.w3.org/2000/svg" class="w-4 h-4 tabler-world-www" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
@@ -70,7 +70,7 @@
             </a>
             {{end}}
             <a href="#discuss" class="flex items-center justify-center px-2 py-1 m-1 space-x-2 text-center transition duration-300 border rounded text-sky-400 border-sky-700 bg-zinc-900 hover:border-lime-600 hover:text-lime-600">
-                <svg xmlns="http://www.w3.org/2000/svg" class="w-4 h-4 messages" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+                <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 messages" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
                     <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
                     <path d="M21 14l-3 -3h-7a1 1 0 0 1 -1 -1v-6a1 1 0 0 1 1 -1h9a1 1 0 0 1 1 1v10"></path>
                     <path d="M14 15v2a1 1 0 0 1 -1 1h-7l-3 3v-10a1 1 0 0 1 1 -1h2"></path>
@@ -78,9 +78,16 @@
             </a>
         </div>
     </div>
+
+    <!-- Icons -->
+    <div class="flex items-center justify-center mt-2 mb-4">
+        <a href="/about#icons" class="max-w-md text-xs">
+            {{template "components/service_icons" .Service}}
+        </a>
+    </div>
     
     <!-- Description -->
-    <div class="flex items-center justify-center p-4">
+    <div class="flex items-center justify-center mt-4">
         <p class="max-w-lg p-4 text-sm border rounded-lg md:text-base border-white/20 bg-gray-400/10">
             {{if ne .Service.Description ""}}
                 {{.Service.Description}}
@@ -91,11 +98,6 @@
     </div>
 </section>
 
-<!-- Icons -->
-<div class="flex items-center justify-center mb-4 text-xs">
-    {{template "components/service_icons" .Service}}
-</div>
-
 <!-- KYC Level -->
 <section class="flex items-center justify-center px-4 mb-2">
     {{template "components/kyc_level" .Service.KycLevel}}
@@ -108,12 +110,7 @@
             {{template "components/attribute_line" .}}
         {{end}}
     </div>
-</section>
-
-<!-- Notes -->
-<section class="flex flex-col items-center justify-center px-8 mt-4 mb-8">
-    <h2 class="mb-0.5 text-xl font-bold text-center capitalize">Additional info</h2>
-    <div class="max-w-lg space-y-1.5">
+    <div class="max-w-lg space-y-1.5 my-2">
         <p class="block font-bold py-1.5 px-3 text-center text-sm border rounded-lg transition duration-300 border-white/30 bg-white/10 hover:bg-white/20 hover:border-white">
             * Lorem ipsum dolor sit amet.
         </p>
@@ -121,7 +118,7 @@
 </section>
 
 <!-- ToS Checker -->
-<section class="flex flex-col items-center justify-center p-8 pb-4 border-t-2 border-opacity-50 border-dashed border-t-lime-400/10" id="tos">
+<section class="flex flex-col items-center justify-center p-4 pb-4 mt-2 border-t-2 border-opacity-50 border-dashed border-t-lime-400/10" id="tos">
     
     <a href="/about#tos-checker" class="text-xl font-bold">
         Automated ToS Checker
@@ -131,19 +128,23 @@
             <path d="M12 19l0 .01"></path>
         </svg>
     </a>
-    <p class="max-w-sm text-xs text-center text-gray-300 text-opacity-75">Automated, ai-driven weekly ToS checks.</p>
-    <p class="max-w-sm mt-1 text-xs text-center text-gray-400 text-opacity-75">Last Check: 2023-10-18</p>
+    {{if .Service.TosHighlights}}
+        <p class="max-w-sm text-xs text-center text-gray-300 text-opacity-75">Automated, ai-driven weekly ToS checks.</p>
+        <p class="max-w-sm mt-1 text-xs text-center text-gray-400 text-opacity-75">Last Check: 2023-10-18</p>
 
-    {{range .Service.TosHighlights}}
-        <div class="max-w-lg">
-            {{template "components/tos_check" .}}
-        </div>
+        {{range .Service.TosHighlights}}
+            <div class="max-w-lg">
+                {{template "components/tos_check" .}}
+            </div>
+        {{end}}
+    {{else}}
+        <p class="max-w-md mt-2 font-bold text-center text-opacity-75 text-amber-400 text-md">This service does not have any ToS checks.</p>
     {{end}}
 </section>
 
 <!-- Comments -->
 <section class="flex flex-col items-center justify-center px-8 pt-4 pb-8" id="discuss">
-        <a href="https://usenostr.org" class="text-xl font-bold">
+        <a href="https://usenostr.org" target="_blank" class="text-xl font-bold">
             Nostr Comments
             <svg xmlns="http://www.w3.org/2000/svg" class="inline-block w-4 h-4 question-mark" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
                 <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>