Index: src/main/resources/templates/login.html
===================================================================
--- src/main/resources/templates/login.html	(revision 448bd84fdf9afb4e8cbe65e87648142640def91f)
+++ src/main/resources/templates/login.html	(revision 533c366878d72fa5afabf0a589d13e5ba90838c7)
@@ -1,10 +1,20 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Title</title>
-</head>
-<body>
 
-</body>
-</html>
+<div>
+    <form th:method="POST" th:action="@{/login}">
+        <div class="container">
+            <form class="form-signin mt-xl-5" method="post" action="/login">
+                <h2 class="form-signin-heading">SIGN IN</h2>
+                <p>
+                    <label for="username" class="sr-only">Username</label>
+                    <input type="text" id="username" name="username" class="form-control" placeholder="Username" required="" autofocus=""/>
+                </p>
+                <p>
+                    <label for="password" class="sr-only">Password</label>
+                    <input type="password" id="password" name="password" class="form-control" placeholder="Password" required=""/>
+                </p>
+            </form>
+            <button id="submit" class="btn btn-lg btn-primary btn-block" type="submit">Sign in</button>
+        </div>
+    </form>
+    <a href="/register" class="btn btn-block btn-light">Register Here!</a>
+</div>
Index: src/main/resources/templates/register.html
===================================================================
--- src/main/resources/templates/register.html	(revision 448bd84fdf9afb4e8cbe65e87648142640def91f)
+++ src/main/resources/templates/register.html	(revision 533c366878d72fa5afabf0a589d13e5ba90838c7)
@@ -1,10 +1,44 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Title</title>
-</head>
-<body>
-
-</body>
-</html>
+<div class="container">
+    <h1 th:if="${hasError}" th:text="${error}"></h1>
+</div>
+<div class="container">
+    <form class="form-signin mt-xl-5" method="post" action="/register">
+        <h2 class="form-signin-heading">Register</h2>
+        <p>
+            <label for="username" class="sr-only">Username</label>
+            <input type="text" id="username" name="username" class="form-control" placeholder="Username" required=""
+                   autofocus="">
+        </p>
+        <p>
+            <label for="password" class="sr-only">Password</label>
+            <input type="password" id="password" name="password" class="form-control" placeholder="Password"
+                   required="">
+        </p>
+        <p>
+            <label for="repeatedPassword" class="sr-only">Repeat Password</label>
+            <input type="password" id="repeatedPassword" name="repeatedPassword" class="form-control"
+                   placeholder="Repeat Password" required="">
+        </p>
+        <p>
+            <label for="first_name" class="sr-only">First Name</label>
+            <input type="text" id="first_name" name="first_name" class="form-control" placeholder="First Name" required="" autofocus="">
+        </p>
+        <p>
+            <label for="last_name" class="sr-only">Last Name</label>
+            <input type="text" id="last_name" name="last_name" class="form-control" placeholder="Last Name" required=""
+                   autofocus="">
+        </p>
+        <p>
+        <div class="form-check form-check-inline">
+            <input class="form-check-input" name="role" type="radio" id="ROLE_ADMIN" value="ROLE_ADMIN">
+            <label class="form-check-label" for="ROLE_ADMIN">ROLE_ADMIN</label>
+        </div>
+        <div class="form-check form-check-inline">
+            <input class="form-check-input" name="role"  type="radio" id="ROLE_USER" value="ROLE_USER">
+            <label class="form-check-label" for="ROLE_USER">ROLE_USER</label>
+        </div>
+        </p>
+        <button class="btn btn-lg btn-primary btn-block" type="submit">Sign up</button>
+    </form>
+    <a href="/login" class="btn btn-block btn-light">Already have an account? Login here!</a>
+</div>
