diff --git a/app/static/css/screen-dark.css b/app/static/css/screen-dark.css
index ec3f98a..c010943 100644
--- a/app/static/css/screen-dark.css
+++ b/app/static/css/screen-dark.css
@@ -80,19 +80,22 @@ nav             { font-family: sans-serif}
 .subnode-header {
     font-style: italic; 
     margin-bottom: 1em;
-    display: flex;
     width: 100%;
-    gap: 5px;
+}
+
+.subnode-footer {
+    font-style: italic; 
+    width: 100%;
 }
 
 .subnode-id {
     text-align: left;
-    align: left;
+    display: block;
 }
 
 .subnode-links {
     text-align: left;
-    align: left;
+    display: block;
 }
 
 .links { 
diff --git a/app/templates/node_rendered.html b/app/templates/node_rendered.html
index 4c04766..8031996 100644
--- a/app/templates/node_rendered.html
+++ b/app/templates/node_rendered.html
@@ -35,8 +35,7 @@ Try listing all <a href="/nodes">nodes</a> or perhaps <a href="/search">search</
 {% for subnode in node.subnodes %}
 <div class="subnode">
     <div class="subnode-header">
-        <span><strong>Subnode</strong> <a href="/@{{subnode.user}}/{{node.uri}}">[[{{node.uri}}@{{subnode.user}}]]</a></span>
-        <span class="subnode-links">(by <a href="/@{{subnode.user}}">@{{subnode.user}}</a>)</span>
+        <span class="subnode-id"><strong>Subnode</strong> <a href="/@{{subnode.user}}/{{node.uri}}">[[{{node.uri}}@{{subnode.user}}]]</a></span> <span class="subnode-links">by <a href="/@{{subnode.user}}">@{{subnode.user}}</a></span>
     </div>
 {{ subnode.render()|linkify|safe }}
 </div>
@@ -50,7 +49,9 @@ Try listing all <a href="/nodes">nodes</a> or perhaps <a href="/search">search</
 
 {% for subnode in node.subnodes %}
 <div class="subnode">
-    <span class="subnode-header"><strong>Subnode</strong> <a href="{{subnode.url}}">{{subnode.uri}}</a> by <a href="/@{{subnode.user}}">@{{subnode.user}}</a></span>
+    <div class="subnode-header">
+        <span class="subnode-id"><strong>Subnode</strong> <a href="/@{{subnode.user}}/{{node.uri}}">[[{{node.uri}}@{{subnode.user}}]]</a></span> <span class="subnode-links">by <a href="/@{{subnode.user}}">@{{subnode.user}}</a></span>
+    </div>
 {{ subnode.render()|linkify|safe }}
 </div>
 {% endfor %}
diff --git a/app/templates/subnode_rendered.html b/app/templates/subnode_rendered.html
index 567b600..0ec62a4 100644
--- a/app/templates/subnode_rendered.html
+++ b/app/templates/subnode_rendered.html
@@ -17,11 +17,11 @@
 {% extends "base.html" %}
 {% block content %}
 
-{% if not subnode and not node %}
-<div class="message">
-No subnodes found matching '{{subnode}}'. 
+{% if not subnode and not node.subnodes %}
+<div class="not-found">
+No subnodes matching your query.
 <br /><br />
-Try listing <a href="/nodes">nodes</a> or perhaps <a href="/search">search</a>.
+Try going up to node <a href="/node/{{node.uri}}">[[{{node.uri}}]]</a> or perhaps <a href="/search">search</a>.
 </div>
 {% endif %}
 
@@ -30,8 +30,8 @@ Try listing <a href="/nodes">nodes</a> or perhaps <a href="/search">search</a>.
 {% for subnode in node.subnodes %}
 <div class="subnode">
     <div class="subnode-header">
-        <span><strong>Subnode</strong> <a href="/@{{subnode.user}}/{{node.uri}}">[[{{node.uri}}@{{subnode.user}}]]</a></span>
-        <span class="subnode-links">(<a href="/@{{subnode.user}}">user</a>) (<a href="/node/{{subnode.wikilink}}">up to node</a>) (<a href="{{subnode.url}}">source</a>)</span>
+        <span><strong>Subnode</strong> <a href="/@{{subnode.user}}/{{node.uri}}">[[{{node.uri}}@{{subnode.user}}]]</a></span><br />
+        <span class="subnode-links">by <a href="/@{{subnode.user}}">@{{subnode.user}}</a> | up to <span class="wikilink-marker">[[</span><a href="/node/{{subnode.wikilink}}">{{subnode.wikilink}}</a><span class="wikilink-marker">]]</span> | <a href="{{subnode.url}}">source</a></span>
     </div>
 {{ subnode.render()|linkify|safe }}
 </div>