diff --git a/index.php b/index.php
index b8f9c21..3c8b37b 100644
--- a/index.php
+++ b/index.php
@@ -160,8 +160,10 @@ h1 { text-align: center; }
 .sitename { margin-top: 5rem; margin-bottom: 3rem; font-size: 2.5rem; }
 main { padding: 2rem; background: #faf8fb; box-shadow: 0 0.1rem 1rem 0.3rem rgba(50, 50, 50, 0.5); }
 
-textarea { width: 100%; min-height: 35rem; }
-textarea ~ input[type=submit] { width: calc(100% + 0.5rem); padding: 0.5rem; font-weight: bolder; }
+label { display: inline-block; min-width: 7rem; }
+input[type=text], input[type=password], textarea { margin: 0.5rem 0.8rem; padding: 0.5rem 0.8rem; background: #d5cbf9; border: 0; border-radius: 0.3rem; font-size: 1rem; color: #442772; }
+textarea { width: calc(100% - 2rem); min-height: 35rem; font-size: 1.25rem; }
+textarea ~ input[type=submit] { width: calc(100% - 0.3rem); margin: 0.5rem 0.8rem; padding: 0.5rem; font-weight: bolder; }
 
 footer { padding: 2rem; }
 ";
@@ -1215,11 +1217,13 @@ register_module([
 			$content = "<h1>Login to $settings->sitename</h1>\n";
 			if(isset($_GET["failed"]))
 				$content .= "\t\t<p><em>Login failed.</em></p>\n";
-			$content .= "\t\t<form method='post' action='index.php?action=checklogin&returnto=" . rawurlencode($_SERVER['REQUEST_URI']) . "'><label for='user'>Username:</label>
-				<input type='text' name='user' />
+			$content .= "\t\t<form method='post' action='index.php?action=checklogin&returnto=" . rawurlencode($_SERVER['REQUEST_URI']) . "'>
+				<label for='user'>Username:</label>
+				<input type='text' name='user' id='user' />
 				<br />
 				<label for='pass'>Password:</label>
-				<input type='password' name='pass' />
+				<input type='password' name='pass' id='pass' />
+				<br />
 				<input type='submit' value='Login' />
 			</form>";
 			exit(page_renderer::render_main($title, $content));
diff --git a/module_index.json b/module_index.json
index 7afac2b..8bd1b64 100644
--- a/module_index.json
+++ b/module_index.json
@@ -61,7 +61,7 @@
         "author": "Starbeamrainbowlabs",
         "description": "Adds a pair of actions (login and checklogin) that allow users to login. You need this one if you want your users to be able to login.",
         "id": "page-login",
-        "lastupdate": 1432497592
+        "lastupdate": 1438004499
     },
     {
         "name": "Logout",
diff --git a/modules/page-login.php b/modules/page-login.php
index 19bcf0c..cdc6993 100644
--- a/modules/page-login.php
+++ b/modules/page-login.php
@@ -20,11 +20,13 @@ register_module([
 			$content = "<h1>Login to $settings->sitename</h1>\n";
 			if(isset($_GET["failed"]))
 				$content .= "\t\t<p><em>Login failed.</em></p>\n";
-			$content .= "\t\t<form method='post' action='index.php?action=checklogin&returnto=" . rawurlencode($_SERVER['REQUEST_URI']) . "'><label for='user'>Username:</label>
-				<input type='text' name='user' />
+			$content .= "\t\t<form method='post' action='index.php?action=checklogin&returnto=" . rawurlencode($_SERVER['REQUEST_URI']) . "'>
+				<label for='user'>Username:</label>
+				<input type='text' name='user' id='user' />
 				<br />
 				<label for='pass'>Password:</label>
-				<input type='password' name='pass' />
+				<input type='password' name='pass' id='pass' />
+				<br />
 				<input type='submit' value='Login' />
 			</form>";
 			exit(page_renderer::render_main($title, $content));
diff --git a/settings.fragment.php b/settings.fragment.php
index ec6ef27..288066a 100644
--- a/settings.fragment.php
+++ b/settings.fragment.php
@@ -157,8 +157,10 @@ h1 { text-align: center; }
 .sitename { margin-top: 5rem; margin-bottom: 3rem; font-size: 2.5rem; }
 main { padding: 2rem; background: #faf8fb; box-shadow: 0 0.1rem 1rem 0.3rem rgba(50, 50, 50, 0.5); }
 
-textarea { width: 100%; min-height: 35rem; }
-textarea ~ input[type=submit] { width: calc(100% + 0.5rem); padding: 0.5rem; font-weight: bolder; }
+label { display: inline-block; min-width: 7rem; }
+input[type=text], input[type=password], textarea { margin: 0.5rem 0.8rem; padding: 0.5rem 0.8rem; background: #d5cbf9; border: 0; border-radius: 0.3rem; font-size: 1rem; color: #442772; }
+textarea { width: calc(100% - 2rem); min-height: 35rem; font-size: 1.25rem; }
+textarea ~ input[type=submit] { width: calc(100% - 0.3rem); margin: 0.5rem 0.8rem; padding: 0.5rem; font-weight: bolder; }
 
 footer { padding: 2rem; }
 ";