diff --git a/app/static/css/screen-dark.css b/app/static/css/screen-dark.css
index 9428c6b..c194a5b 100644
--- a/app/static/css/screen-dark.css
+++ b/app/static/css/screen-dark.css
@@ -141,6 +141,40 @@ nav             { font-family: sans-serif}
     margin-left: 0.2em;
 }
 
+.search { 
+    width: 100%;
+    display: flex;
+    background: #161616; 
+    color: #cfcfcf; 
+    padding: 0.5em; 
+    margin-bottom: 10px; 
+    border-radius: 10px;
+    gap: 10px;
+}
+
+.search-header {
+    font-weight: bold;
+    text-align: left;
+    margin-bottom: 1em;
+    margin-left: 0.2em;
+}
+
+.search-agora {
+    float: left;
+    width: 50%;
+}
+
+.search-internet {
+    background: #161616; 
+    width: 50%;
+}
+
+.search-agora-header, .search-internet-header {
+    font-style: italic; 
+    font-weight: bold;
+    margin-bottom: 1em;
+}
+
 .listing { 
     display: inline-block;
     background: #161616; 
diff --git a/app/templates/node_search.html b/app/templates/node_search.html
index a750afc..7582206 100644
--- a/app/templates/node_search.html
+++ b/app/templates/node_search.html
@@ -15,25 +15,25 @@
 -->
 <br />
 
+<span class="search-header">Search</span><br />
 <div class="search">
-<strong>Search (the internet)</strong> <br />
-<a href="https://www.google.com/search?q={{query}}">Google</a> <br />
-<a href="https://www.duckduckgo.com/{{query}}">DuckDuckGo</a> <br />
-<a href="https://en.wikipedia.org/w/index.php?search={{query}}&title=Special%3ASearch&fulltext=1">Wikipedia</a> <br />
-<a href="https://twitter.com/search/?f=live&q={{query}}">Twitter</a> <br />
+    <div class="search-agora">
+        <span class="search-agora-header">In this Agora</span> <br />
+        {% if search %}
+        {% for subnode in search %}
+        <a href="/@{{subnode.user}}/{{subnode.wikilink}}">@{{subnode.user}}/{{subnode.wikilink}}</a><br />
+        {% endfor %}
+        {% else %}
+        No search results.
+        {% endif %}
+    </div>
+
+    <div class="search-internet">
+        <span class="search-internet-header">Around the internet</span> <br />
+        <a href="https://www.google.com/search?q={{query}}">Google</a> <br />
+        <a href="https://www.duckduckgo.com/{{query}}">DuckDuckGo</a> <br />
+        <a href="https://en.wikipedia.org/w/index.php?search={{query}}&title=Special%3ASearch&fulltext=1">Wikipedia</a> <br />
+        <a href="https://twitter.com/search/?f=live&q={{query}}">Twitter</a> <br />
+    </div>
 </div>
 
-<br />
-<div class="search">
-<strong>Search (this Agora)</strong>
-<br>
-{% if search %}
-{% for subnode in search %}
-(user: {{subnode.user}}) {{ subnode.uri }}: <a href="{{subnode.url}}">{{subnode.wikilink}}</a><br />
-{% endfor %}
-{% else %}
-No search results.
-{% endif %}
-</div>
-
-