diff --git a/static/css/main.css b/static/css/main.css
index bccbc8a..540578b 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -8,11 +8,4 @@
 }
 #invalidCredentials {
     color: red;
-}
-input {
-    margin-left:150px;
-    width:250px;
-}
-label {
-    position:absolute;
 }
\ No newline at end of file
diff --git a/templates/login.html b/templates/login.html
index 4d3ed3d..cc1f18c 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -26,19 +26,22 @@
 		</div>
 		<div class="container col-lg-12" id="content">
 			<form id="loginForm" action="/api/v1/login" method="POST" class="center-block">
-				<label for="username">User</label>
-				<input type="text" name="username" /><br />
-
-				<label for="password">Password</label>
-				<input type="password" name="password" /><br />
-
-				<div id="invalidCredentials">
-					The entered credentials are invalid
+				<div class="form-group">
+					<label for="username">User</label>
+					<input type="text" name="username" class="form-control" />
 				</div>
 
-				<input type="submit" value="Login" />
+				<div class="form-group">
+					<label for="password">Password</label>
+					<input type="password" name="password" class="form-control" />
+					<p id="invalidCredentials">
+						The entered credentials are invalid
+					</p>
+				</div>
+
+				<input type="submit" value="Login" class="btn btn-default" />
 			</form>
 		</div>
 	</body>
 </html>
-{{end}}
\ No newline at end of file
+{{end}}