diff --git a/static/style.css b/static/style.css
index 4ab395b..22b832c 100644
--- a/static/style.css
+++ b/static/style.css
@@ -135,14 +135,24 @@ label.important {
 	font-weight: 300;
 	display:block;
 }
-input {
-	width: 100%;
+input, select {
 	font-size: 1.2em;
 	line-height:1.4em;
 	border: 3px grey solid;
 	border-radius: none;
 	padding: 3px;
 }
-input:focus {
+input:focus, select:focus {
 	border: 3px mediumpurple solid;
 }
+
+label, input {
+	flex-basis: 0;
+}
+label {
+	flex-grow: 1;
+}
+
+form .row {
+	margin: 10px 0;
+}
diff --git a/templates/bot_edit.html b/templates/bot_edit.html
new file mode 100644
index 0000000..8912b2c
--- /dev/null
+++ b/templates/bot_edit.html
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="UTF-8">
+	<title>FediBooks</title>
+	{% include 'imports.html' %}
+</head>
+
+<body>
+	<div class="container">
+		<h1 class="thin centred">Edit bot</h1>
+		<p class="large centred">@botname@example.com</p>
+	</div>
+	
+	<div class="container centred">
+		<form action="/do/bot/edit" method="post" class="full-width">
+			<div class="row">
+				<label for="username" class="large">Username</label>
+				<input type="text" name="username" value="Bot Name"><br>
+			</div>
+			<div class="row">
+				<label for="freq" class="large">Post frequency (minutes)</label>
+				<input type="number" min="5" max="240" step="5" value="30"> 
+			</div>
+			<div class="row">
+				<label for="cw" class="large">Content warning (subject)</label>
+				<input type="text" placeholder="None">
+			</div>
+			<div class="row">
+				<label for="cw-learning" class="large">Learn from posts with content warnings (subjects)</label>
+				<input type="checkbox">
+			</div>
+			<div class="row">
+				<label for="fake-mentions" class="large">Insert fake mentions</label>
+				<select>
+					<option value="full">At any time</option>
+					<option value="start" default>Only at the start of posts</option>
+					<option value="never">Never</option>
+				</select>
+			</div>
+			<div class="row">
+				<label for="length" class="large">Maximum post length (characters)</label>
+				<input type="number" min="100" max="5000" value="500">
+			</div>
+		</form>
+	</div>
+
+	{% include 'footer.html' %}
+</body>
+</html>
diff --git a/templates/login.html b/templates/login.html
index a191314..9bdc3e1 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -14,7 +14,7 @@
 	<div class="container centred">
 		<form action="/do/{% if signup %}signup{% else %}login{% endif %}" method="POST">
 			<p>
-				<label for="email" class="important">Email</label>
+				<label for="email" class="important full-width">Email</label>
 				<input type="email" name="email" placeholder="you@example.com">
 				{% if signup %}
 				<p class="small">
@@ -22,7 +22,7 @@
 				</p>
 				{% endif %}
 				<br>
-				<label for="password" class="important">Password</label>
+				<label for="password" class="important full-width">Password</label>
 				<input type="password" name="password">
 				{% if signup %}
 				<p class="small">
diff --git a/webui.py b/webui.py
index 4e9c035..568d1fd 100644
--- a/webui.py
+++ b/webui.py
@@ -22,3 +22,7 @@ def show_login_page():
 @app.route("/signup")
 def show_signup_page():
 	return render_template("login.html", signup = True)
+
+@app.route("/bot/edit/<id>")
+def bot_edit(id):
+	return render_template("bot_edit.html")
