diff --git a/psdash/run.py b/psdash/run.py
index 32e54bb..1b59222 100644
--- a/psdash/run.py
+++ b/psdash/run.py
@@ -5,6 +5,7 @@
 from gevent.pywsgi import WSGIServer
 import locale
 import argparse
+import collections
 import logging
 import socket
 import urllib
@@ -33,7 +34,7 @@ def create_from_cli_args(cls):
         return cls(args=None)
 
     def __init__(self, config_overrides=None, args=tuple()):
-        self._nodes = {}
+        self._nodes = collections.OrderedDict()
         config = self._load_args_config(args)
         if config_overrides:
             config.update(config_overrides)
diff --git a/psdash/templates/base.html b/psdash/templates/base.html
index 87f09ea..01d5f38 100644
--- a/psdash/templates/base.html
+++ b/psdash/templates/base.html
@@ -20,7 +20,7 @@
             <div class="header">
                 <div class="logo">
                     <a href="{{ url_for(".index") }}">
-                        <span class="app-name"># psdash <small>v0.6.0</small></span>
+                        <span class="app-name"># psdash <small>v{{ psdash_version }}</small></span>
                     </a>
                 </div>
                 <div class="top-nav">
diff --git a/psdash/web.py b/psdash/web.py
old mode 100755
new mode 100644
index 2ba70ce..bcd0c91
--- a/psdash/web.py
+++ b/psdash/web.py
@@ -7,6 +7,7 @@
 import locale
 from flask import render_template, request, session, jsonify, Response, Blueprint, current_app, g
 from werkzeug.local import LocalProxy
+from psdash import __version__ as psdash_version
 from psdash.helpers import socket_families, socket_types
 
 logger = logging.getLogger('psdash.web')
@@ -43,7 +44,8 @@ def inject_header_data():
     return {
         'os': sysinfo['os'].decode('utf-8'),
         'hostname': sysinfo['hostname'].decode('utf-8'),
-        'uptime': uptime
+        'uptime': uptime,
+        'psdash_version': psdash_version,
     }
 
 @webapp.url_defaults