diff --git a/templates/bot_accounts.html b/templates/bot_accounts.html
index b1f09ce..43eae1c 100644
--- a/templates/bot_accounts.html
+++ b/templates/bot_accounts.html
@@ -17,16 +17,19 @@
 	</div>
 	
 	<div class="container" style="min-height: 300px;">
+		{% for user in users %}
 		<div class="row light">
-			<div class="panel-icon"></div>
+			<div class="panel-icon {{ "online" if user['enabled'] else "offline" }}"></div>
 			<div class="panel-text">
-				<div class="panel-name">@user<span class="subtle tiny">@instan.ce</span></div>
-				<div class="panel-status">12345 posts stored</div>
+				{% set handle_list = user['fedi_id'].split('@') %}
+				<div class="panel-name">@{{ handle_list[1] }}<span class="subtle tiny">@{{ handle_list[2] }}</span></div>				
+				<div class="panel-status">{{ "Active" if user['enabled'] else "Inactive" }}</div>
 			</div>
 			<div class="panel-actions">
 				<a class="button btn-secondary" href="/bot/accounts/toggle/insert id here" title="Turn on/off"><i class="fas fa-power-off"></i></a><a class="button btn-dangerous" href="/bot/accounts/delete/insert id here" title="Delete"><i class="fas fa-trash"></i></a>
 			</div>
 		</div>
+		{% endfor %}
 	</div>
 
 	{% include 'footer.html' %}
diff --git a/webui.py b/webui.py
index 63feddb..0f7b5e9 100644
--- a/webui.py
+++ b/webui.py
@@ -78,7 +78,7 @@ def settings():
 
 @app.route("/bot/edit/<id>")
 def bot_edit(id):
-	return render_template("bot_edit.html")
+	return render_template("coming_soon.html")
 
 @app.route("/bot/delete/<id>", methods=['GET', 'POST'])
 def bot_delete(id):
@@ -119,7 +119,20 @@ def bot_blacklist(id):
 def bot_accounts(id):
 	if bot_check(id):
 		session['bot'] = id
-		return render_template("bot_accounts.html")
+		c = mysql.connection.cursor()
+		c.execute("SELECT COUNT(*) FROM `bot_learned_accounts` WHERE `bot_id` = %s", (id,))
+		user_count = c.fetchone()[0]
+		users = {}
+
+		if user_count > 0:
+			dc = mysql.connection.cursor(MySQLdb.cursors.DictCursor)
+			dc.execute("SELECT `fedi_id`, `enabled` FROM `bot_learned_accounts` WHERE `bot_id` = %s", (id,))
+			users = dc.fetchall()
+			dc.close()
+
+		c.close()
+
+		return render_template("bot_accounts.html", users = users)
 
 @app.route("/bot/accounts/add", methods = ['GET', 'POST'])
 def bot_accounts_add():