diff --git a/app/static/css/screen-dark.css b/app/static/css/screen-dark.css
index 5aa8c92..5bf8d83 100644
--- a/app/static/css/screen-dark.css
+++ b/app/static/css/screen-dark.css
@@ -41,6 +41,15 @@ h2              { font-size: 1.2em; }
 	content: "]]"
 }
 
+.node        { 
+}
+
+.node-header {
+    text-align: left;
+    margin-bottom: 1em;
+    margin-left: 0.2em;
+}
+
 .subnode        { 
     font-family: sans-serif; 
     background: #1f1f1f; 
@@ -55,7 +64,6 @@ h2              { font-size: 1.2em; }
 
 .subnode-header {
     font-style: italic; 
-    text-align: center;
     margin-bottom: 1em;
 }
 
@@ -72,7 +80,6 @@ h2              { font-size: 1.2em; }
 
 .backlinks-header {
     font-style: italic; 
-    text-align: center;
     margin-bottom: 1em;
 }
 
diff --git a/app/templates/node_rendered.html b/app/templates/node_rendered.html
index 6931d57..e0bf239 100644
--- a/app/templates/node_rendered.html
+++ b/app/templates/node_rendered.html
@@ -24,12 +24,16 @@ If you <a href="https://flancia.org/go/agora">contributed a subnode</a> named '{
 Go back to <a href="/nodes">/nodes</a>?
 {% endif %}
 
+<div class="node">
+<span class="node-header"><strong>Node</strong> <a href="/node/{{wikilink}}">[[{{wikilink}}]]</a></span>
+
 {% for subnode in subnodes %}
 <div class="subnode">
-    <span class="subnode-header">Subnode <a href="{{subnode.url}}">{{subnode.uri}}</a> by <a href="/@{{subnode.user}}">@{{subnode.user}}</a></span>
+    <span class="subnode-header"><strong>Subnode</strong> <a href="{{subnode.url}}">{{subnode.uri}}</a> by <a href="/@{{subnode.user}}">@{{subnode.user}}</a></span>
 {{ subnode.content|markdown|linkify|safe }}
 </div>
 {% endfor %}
+</div>
 
 <div class="backlinks">
 <span class="backlinks-header">Backlinks (subnodes linking to <a href="/node/{{wikilink}}">[[{{wikilink}}]]</a>)</span><br />
diff --git a/app/templates/subnode_rendered.html b/app/templates/subnode_rendered.html
index 9840ed8..b3ff36c 100644
--- a/app/templates/subnode_rendered.html
+++ b/app/templates/subnode_rendered.html
@@ -23,7 +23,7 @@ Go back to <a href="/nodes">/nodes</a>, <a href="/subnodes">/nodes</a>?
 {% endif %}
 
 <div class="subnode">
-    <span class="subnode-header">Subnode by <a href="/@{{subnode.user}}">@{{subnode.user}}</a> in node <a href="/node/{{subnode.wikilink}}">[[{{subnode.wikilink}}]]</a></span><br />
+    <span class="subnode-header"><strong>Subnode</strong> <a href="{{subnode.url}}">{{subnode.uri}}</a> by <a href="/@{{subnode.user}}">@{{subnode.user}}</a> in <a href="/node/{{subnode.wikilink}}">[[{{subnode.wikilink}}]]</a></span>
 {{ subnode.content|markdown|linkify|safe }}
 </div>