diff --git a/myriad/manage.py b/myriad/manage.py
index fe127a7..db20158 100644
--- a/myriad/manage.py
+++ b/myriad/manage.py
@@ -506,3 +506,11 @@ def group_delete(gid):
     db.commit()
 
     return redirect(url_for("manage.groups"))
+
+@bp.route("/admin")
+@login_required
+def admin():
+    db = get_db()
+    users = db.execute("SELECT * FROM user").fetchall()
+
+    return render_template("manage/admin.html", users=users)
diff --git a/myriad/templates/base.html b/myriad/templates/base.html
index 2d42413..43633ef 100644
--- a/myriad/templates/base.html
+++ b/myriad/templates/base.html
@@ -23,6 +23,7 @@
     <div class="navitem">> <a href="{{ url_for('manage.import_member') }}">Import New Member</a></div>
     <div class="navitem">> <a href="{{ url_for('manage.groups') }}">Member groups</a></div>
     <div class="navitem">> <a href="{{ url_for('manage.assets') }}">Site Assets</a></div>
+    <div class="navitem">> <a href="{{ url_for('manage.admin') }}">Site Administration</a></div>
     {% endif %}
 
     <div class="heading">Blog</div>
diff --git a/myriad/templates/manage/admin.html b/myriad/templates/manage/admin.html
new file mode 100644
index 0000000..36dde19
--- /dev/null
+++ b/myriad/templates/manage/admin.html
@@ -0,0 +1,36 @@
+{% extends 'base.html' %}
+
+{% block header %}
+  <div class="title">{% block title %}Site Administration{% endblock %}</div>
+{% endblock %}
+
+{% block content %}
+<div class="container">
+
+  <div class="heading">Site Users</div>
+  <div class="maintext">These are the usernames that can log in to the site</div>
+  {% for user in users %}
+  <p><b>{{ user[1] }}</b>{% if user[0]!=g.user[0] %} | <a>Delete user</a>{% endif %}</p>
+  {% endfor %}
+  <p><a>Add New User</a></p>
+
+  <div class="heading">Admin Log</div>
+  <div class="maintext">Actions taken by registered users</div>
+
+  <div class="heading">Front Log</div>
+  <div class="maintext">Front change history</div>
+  
+  <div class="heading">Site Theme</div>
+  <div class="maintext">Choose the overall theme for the site here</div>
+  <form>
+  <select name="theme" id="theme">
+      {% for theme in get_themes() %}
+      {% set theme_name = theme.split(".")[0] %}
+      <option value="{{theme_name}}">{{theme_name}}</option>
+      {% endfor %}
+    </select>
+    <input type="submit" value="Submit">
+  </form>
+
+</div>
+{% endblock %}
\ No newline at end of file
diff --git a/myriad/templates/manage/edit.html b/myriad/templates/manage/edit.html
index 41db4a0..25ed7c6 100644
--- a/myriad/templates/manage/edit.html
+++ b/myriad/templates/manage/edit.html
@@ -21,7 +21,7 @@
     <textarea name="bio" id="bio">{{ member[5] }}</textarea><br><br>
     <label for="theme">Theme</label>
     <select name="theme" id="theme">
-      {% for theme in themes %}
+      {% for theme in get_themes() %}
       {% set theme_name = theme.split(".")[0] %}
       <option value="{{theme_name}}" {% if theme_name==member[10] %}selected{% endif %}>{{theme_name}}</option>
       {% endfor %}