diff --git a/app/static/css/screen-dark.css b/app/static/css/screen-dark.css
index c10d13dcb..f48b0a6ea 100644
--- a/app/static/css/screen-dark.css
+++ b/app/static/css/screen-dark.css
@@ -56,6 +56,7 @@ nav             { font-family: sans-serif}
 }
 
 .mini-cli {
+    width: 28%;
 }
 
 .node, .context, .stoa {
diff --git a/app/templates/base.html b/app/templates/base.html
index 7653dd6b9..5b2e3acfd 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -43,7 +43,7 @@
 	</head>
     <body>
     <nav class="navigation">
-		<a href="/"><img src="/static/img/agora.png" class="logo" width="20" height="20"></a>
+		<a href="/"><img style="display: inline;" src="/static/img/agora.png" class="logo" width="20" height="20"></a>
         | 
         <a href="/nodes">nodes</a>
 		| 
@@ -51,7 +51,7 @@
 		| 
         <a href="/latest">Δ</a>
         | 
-        <a href="/node/agora-cli">cli</a>
+        <a href="/node/agora-cli">→</a>
         <form action="/exec" style="display: inline;" method="get">
         <input class="mini-cli" id="mini-cli" type="text" value="{{qstr}}" name="q">
         </form>
@@ -61,15 +61,18 @@
         <a href="/node/agora-help" style="text-decoration: none;" class="help-button">❓</a>
     </nav>
 	<hr>
-        ↪ <a href="https://www.google.com/search?q={{q}}">Google</a>
-        ↪ <a href="https://www.duckduckgo.com/{{q}}">DDG</a>
-        ↪ <a href="https://en.wikipedia.org/wiki/Special:Search/{{q}}">Wikipedia</a>
-        ↪ <a href="https://twitter.com/search/?f=live&q={{q}}">Twitter</a>
-        ↪ <a href="https://github.com/search?q={{q}}">Github</a>
-        ↪ <a href="https://forum.effectivealtruism.org/search?terms={{q}}">EA</a>
-        ↪ <a href="https://www.lesswrong.com/search?terms={{q}}">LW</a>
-        ↪ <a href="http://encyclopedia.uia.org/en/problems?combine={{q}}">World Problems</a>
-        ↪ <a href="https://www.pubpub.org/search?q={{q}}">PubPub</a>
+    <strong>Search '{{qstr}}' on → </strong>
+    <span class="mini-search">
+        <a href="https://www.google.com/search?q={{q}}">Google</a>
+        | <a href="https://www.duckduckgo.com/{{q}}">DDG</a>
+        | <a href="https://en.wikipedia.org/wiki/Special:Search/{{q}}">Wikipedia</a>
+        | <a href="https://twitter.com/search/?f=live&q={{q}}">Twitter</a>
+        | <a href="https://github.com/search?q={{q}}">Github</a>
+        | <a href="https://forum.effectivealtruism.org/search?terms={{q}}">EA</a>
+        | <a href="https://www.lesswrong.com/search?terms={{q}}">LW</a>
+        | <a href="http://encyclopedia.uia.org/en/problems?combine={{q}}">World Problems</a>
+        | <a href="https://www.pubpub.org/search?q={{q}}">PubPub</a>
+    </span>
 	<hr>
     <div class="content">
 	{% block content %}
diff --git a/app/templates/node.html b/app/templates/node.html
index edc953735..0c7360ba7 100644
--- a/app/templates/node.html
+++ b/app/templates/node.html
@@ -45,7 +45,7 @@
 
 {% if node.subnodes %}
 <div class="node">
-<span class="node-header">Node <a href="/node/{{node.uri}}">[[{{node.uri}}]]</a> ↓</span>
+<span class="node-header">Agora node <a href="/node/{{node.uri}}">[[{{node.uri}}]]</a> ↓</span>
 
 {% for subnode in node.subnodes %}
 <div class="subnode">
