diff --git a/templates/add-workspace.html b/templates/add-workspace.html
index cd6c836594e07944b8c237f3b3fb850214f4daa8..160593e5fb1b5a0b39201471bf287259cf612cfb 100644
--- a/templates/add-workspace.html
+++ b/templates/add-workspace.html
@@ -2,56 +2,56 @@
 {% block title %}Add Workspace{% endblock %}
 {% block mainBlock %}
 <form action="/admin/add-workspace" method="POST">
-	<div>
-		<label for="name">Name:</label>
-		<input id="name" type="text" name="name">
-	</div>
-	<div>
-		<label for="name">Address:</label>
-		<input id="address" type="text" name="address">
-	</div>
-	<div>
-		<label for="main-photo">Main Photo:</label>
-		<input id="main-photo" type="text" name="main_photo">
-	</div>
-	<div>
-		<label for="additional-photos">Additional Photos:</label>
-		<div><textarea id="additional-photos" name="additional_photos"></textarea></div>
-	</div>
-	<div>
-		<label for="description">Description:</label>
-		<div><textarea id="description" name="description"></textarea></div>
-	</div>
-	<div>
-		<label for="website">Website:</label>
-		<input id="website" type="text" name="website">
-	</div>
-	<div>
-		<label for="email">Email:</label>
-		<input id="email" type="text" name="email">
-	</div>
-	<div>
-		<label for="phone-number">Phone Number:</label>
-		<input id="phone-number" type="text" name="phone_number">
-	</div>
-	<div>
-		<label for="opening-hours">Opening Hours:</label>
-		<input id="opening-hours" type="text" name="opening_hours">
-	</div>
-	<div>
-		<label for="checkin-instructions">Checkin Instructions:</label>
-		<div><textarea id="checkin-instructions" name="checkin_instructions"></textarea></div>
-	</div>
-	<div>
-		<label for="latitude">Latitude:</label>
-		<input id="latitude" type="text" name="latitude">
-	</div>
-	<div>
-		<label for="longitude">Longitude:</label>
-		<input id="longitude" type="text" name="longitude">
-	</div>
-	<div>
-		<input type="submit">
-	</div>
+	<table>
+		<tr>
+			<td><label for="name">Name:</label></td>
+			<td><input id="name" type="text" name="name"></td>
+		</tr>
+		<tr>
+			<td><label for="name">Address:</label></td>
+			<td><input id="address" type="text" name="address"></td>
+		</tr>
+		<tr>
+			<td><label for="main-photo">Main Photo:</label></td>
+			<td><input id="main-photo" type="text" name="main_photo"></td>
+		</tr>
+		<tr>
+			<td><label for="additional-photos">Additional Photos:</label></td>
+			<td><div><textarea id="additional-photos" name="additional_photos"></textarea></div></td>
+		</tr>
+		<tr>
+			<td><label for="description">Description:</label></td>
+			<td><div><textarea id="description" name="description"></textarea></div></td>
+		</tr>
+		<tr>
+			<td><label for="website">Website:</label></td>
+			<td><input id="website" type="text" name="website"></td>
+		</tr>
+		<tr>
+			<td><label for="email">Email:</label></td>
+			<td><input id="email" type="text" name="email"></td>
+		</tr>
+		<tr>
+			<td><label for="phone-number">Phone Number:</label></td>
+			<td><input id="phone-number" type="text" name="phone_number"></td>
+		</tr>
+		<tr>
+			<td><label for="opening-hours">Opening Hours:</label></td>
+			<td><input id="opening-hours" type="text" name="opening_hours"></td>
+		</tr>
+		<tr>
+			<td><label for="checkin-instructions">Check-in Instructions:</label></td>
+			<td><div><textarea id="checkin-instructions" name="checkin_instructions"></textarea></div></td>
+		</tr>
+		<tr>
+			<td><label for="latitude">Latitude:</label></td>
+			<td><input id="latitude" type="text" name="latitude"></td>
+		</tr>
+		<tr>
+			<td><label for="longitude">Longitude:</label></td>
+			<td><input id="longitude" type="text" name="longitude"></td>
+		</tr>
+	</table>
+	<input type="submit">
 </form>
 {% endblock %}
\ No newline at end of file