diff --git a/app/templates/node_rendered.html b/app/templates/node_rendered.html
index f02c4c5..c606939 100644
--- a/app/templates/node_rendered.html
+++ b/app/templates/node_rendered.html
@@ -34,7 +34,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 class="subnode-id"><strong>Subnode</strong> <a href="/@{{subnode.user}}/{{node.uri}}">[[{{node.uri}}@{{subnode.user}}]]</a></span> 
+        <span class="subnode-id"><strong>Subnode</strong> <a href="/@{{subnode.user}}/{{node.uri}}">[[@{{subnode.user}}/{{node.uri}}]]</a></span> 
         <span class="subnode-links">by <a href="/@{{subnode.user}}">@{{subnode.user}}</a></span>
     </div>
     <br />
@@ -51,7 +51,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 class="subnode-id"><strong>Subnode</strong> <a href="/@{{subnode.user}}/{{node.uri}}">[[{{node.uri}}@{{subnode.user}}]]</a></span>
+        <span class="subnode-id"><strong>Subnode</strong> <a href="/@{{subnode.user}}/{{node.uri}}">[[@{{subnode.user}}/{{node.uri}}]]</a></span> 
         <span class="subnode-links">by <a href="/@{{subnode.user}}">@{{subnode.user}}</a></span>
     </div>
     <br />
diff --git a/app/templates/subnode_rendered.html b/app/templates/subnode_rendered.html
index e1ee77b..9732672 100644
--- a/app/templates/subnode_rendered.html
+++ b/app/templates/subnode_rendered.html
@@ -30,7 +30,7 @@ Try going up to node <a href="/node/{{node.uri}}">[[{{node.uri}}]]</a> or perhap
 {% 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> in <a href="/node/{{subnode.wikilink}}">[[{{subnode.wikilink}}]]</a></span>
+        <span><strong>Subnode</strong> <a href="/@{{subnode.user}}/{{node.uri}}">[[@{{subnode.user}}/{{node.uri}}]]</a></span> in <strong>node</strong> <a href="/node/{{subnode.wikilink}}">[[{{subnode.wikilink}}]]</a></span>
     <span class="subnode-links">by <a href="/@{{subnode.user}}">@{{subnode.user}}</a></span>
     <br />
     </div>