diff --git a/server/djrandom/frontend/templates/about.html b/server/djrandom/frontend/templates/about.html
index df3049d9bcdaf2a9ce569aa1ebdbd0bec3114b78..ec50e01e6c74fc8d468ae8ca108b25c97853a8b2 100644
--- a/server/djrandom/frontend/templates/about.html
+++ b/server/djrandom/frontend/templates/about.html
@@ -2,7 +2,7 @@
 {% block title %}About{% endblock %}
 {% block main %}
 
-        <h3>DJ:Random</h3>
+        <h3>{{ config['SITE_NAME'] }}</h3>
 
         <p>
           <b>{{ num_users }}</b> users,
diff --git a/server/djrandom/frontend/templates/index.html b/server/djrandom/frontend/templates/index.html
index da1780d29d0c7d70df30217bd7ebbc43c131f406..7daa4031f232f791f3dd1906f5c0dd1b0357787c 100644
--- a/server/djrandom/frontend/templates/index.html
+++ b/server/djrandom/frontend/templates/index.html
@@ -10,7 +10,7 @@ $(document).ready(function() {
 {% endblock %}
 
 {% block title %}
-DJ:Random
+{{ config['SITE_NAME'] }}
 {% endblock %}
 
 {% block body %}
@@ -87,16 +87,14 @@ DJ:Random
     | <a id="playlistNever5">Never 5</a>&nbsp;<a id="playlistNever25">(25)</a>     
     | <a id="playlistSave">Save as</a><div id="saveForm" style="display:none;" >
       <input type="text" name="s" size="15" id="savetext" ><a id="playlistSaveBtn" >Save</a></div>     
-  </div>
-  <div id="playlistDiv">
-  </div>
-
-  <div id="playlistControls" class="buttonbox">
-    <a id="playlistExtendBtn">Extend</a>
+    | <a id="playlistExtendBtn">Extend</a>
     | <a id="playlistClearBtn">Clear</a>
     | <a id="playlistStreamBtn">Stream</a> 
       <span id="playlistStreamUrl"></span>
   </div>
+  <div id="playlistDiv">
+  </div>
+
 </div>
 
 <img id="albumart_fs" style="display:none;">
diff --git a/server/djrandom/frontend/views.py b/server/djrandom/frontend/views.py
index 08112081a81abe8872ae85380f150a1a0959885b..6edcd5a225f85bb41ae659b8206b72f8891e63a5 100644
--- a/server/djrandom/frontend/views.py
+++ b/server/djrandom/frontend/views.py
@@ -51,14 +51,14 @@ def about():
     num_users = User.query.filter_by(active=True).count()
     return render_template('about.html', num_users=num_users,
                            num_songs=num_songs, used_gb=used_gb,
-                           dup_songs=dup_songs)
+                           dup_songs=dup_songs, config=app.config)
 
 
 @app.route('/')
 @require_auth
 def homepage():
     user = User.query.get(g.userid)
-    return render_template('index.html', user=user)
+    return render_template('index.html', user=user, config=app.config)
 
 
 @app.route('/ext')