diff --git a/assets/main.css b/assets/main.css
index 70b781b..a5f4e2e 100644
--- a/assets/main.css
+++ b/assets/main.css
@@ -182,18 +182,20 @@ ul#server_selection_list {
 	display: none;
 	text-align: center;
 }
+#login h2 {
+	margin-bottom: 0.3em;
+}
 #login:target {
 	display: block;
 }
-#login table {
-	margin: 0 auto 1em;
+#login input {
+	width: 100%;
 }
-#login table th {
-	font-weight: normal;
-	text-align: right;
+#login_server {
+	margin-bottom: 1em;
 }
-#login_server_row td, #login_server_row th {
-	padding-bottom: 1em;
+.login-form {
+	margin-bottom: 0.5em;
 }
 
 .post {
diff --git a/index.html b/index.html
index 700c20c..68c27f6 100644
--- a/index.html
+++ b/index.html
@@ -27,18 +27,12 @@
 
 				<div id="login">
 					<h2>Add a server</h2>
-					<table>
-						<tr id="login_server_row">
-							<th>Server</th>
-							<td><input type="text" id="login_server" value="http://localhost:8080" required/></td>
-						</tr><tr>
-							<th>Email or username</th>
-							<td><input type="text" id="login_login_id" required/></td>
-						</tr><tr>
-							<th>Password</th>
-							<td><input type="password" id="login_password" required/></td>
-						</tr>
-					</table>
+					<div class="login-form">
+						<input type="text" id="login_server" placeholder="Server URL" value="http://localhost:8080" required/>
+
+						<input type="text" id="login_login_id" placeholder="Username or email" required/>
+						<input type="password" id="login_password" placeholder="Password" required/>
+					</div>
 
 					<button id="login_button">Log in</button>
 					<a href="#"><button id="server_selection_add">Cancel</button></a>