diff --git a/README.md b/README.md
index a123dfb..e4ee052 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ Learn to Implement this project: [Tutorial - Login Register in Spring Boot](http
 application.properties (change database settings)
 ```
 #-------------------- server properties ---------------
-server.port=8080
+server.port='Your port of choice'
 server.error.include-message=always
 
 #--------------------- Logging ------------------
@@ -19,14 +19,14 @@ logging.level.org.springframework.web=DEBUG
 logging.level.org.hibernate=ERROR
 
 #--------------------- DB Connection ------------------
-spring.datasource.url=jdbc:postgresql://localhost:5432/demo
-spring.datasource.username=demo
-spring.datasource.password=password
+spring.datasource.url=jdbc:'your sql provider'://localhost:5432/demo
+spring.datasource.username='username for your database'
+spring.datasource.password='password to your database'
 
 #--------------------JPA-ORM Properties-----------------
 spring.jpa.show-sql=true
 spring.jpa.hibernate.ddl-auto=update
-spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
+spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.'Your SQL dialect option'
 spring.jpa.properties.hibernate.format_sql=true
 ```
 
diff --git a/pom.xml b/pom.xml
index 4bae3e6..4c1ef3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.7.2</version>
+		<version>2.7.16</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.example</groupId>
@@ -14,7 +14,7 @@
 	<name>Login Register</name>
 	<description>Login Register Example for Spring Boot (Maven)</description>
 	<properties>
-		<java.version>17</java.version>
+		<java.version>21</java.version>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -35,8 +35,8 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.postgresql</groupId>
-			<artifactId>postgresql</artifactId>
+			<groupId>com.mysql</groupId>
+			<artifactId>mysql-connector-j</artifactId>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
@@ -58,6 +58,11 @@
 			<groupId>org.thymeleaf.extras</groupId>
 			<artifactId>thymeleaf-extras-springsecurity5</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<optional>true</optional>
+		</dependency>
 	</dependencies>
 
 	<build>
@@ -65,6 +70,14 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
+				<configuration>
+					<excludes>
+						<exclude>
+							<groupId>org.projectlombok</groupId>
+							<artifactId>lombok</artifactId>
+						</exclude>
+					</excludes>
+				</configuration>
 			</plugin>
 		</plugins>
 	</build>
diff --git a/src/main/java/com/example/demo/config/CustomLoginSucessHandler.java b/src/main/java/com/example/demo/config/CustomLoginSuccessHandler.java
similarity index 91%
rename from src/main/java/com/example/demo/config/CustomLoginSucessHandler.java
rename to src/main/java/com/example/demo/config/CustomLoginSuccessHandler.java
index f979338..4f4c201 100644
--- a/src/main/java/com/example/demo/config/CustomLoginSucessHandler.java
+++ b/src/main/java/com/example/demo/config/CustomLoginSuccessHandler.java
@@ -15,7 +15,7 @@
 import java.util.List;
 
 @Configuration
-public class CustomLoginSucessHandler extends SimpleUrlAuthenticationSuccessHandler {
+public class CustomLoginSuccessHandler extends SimpleUrlAuthenticationSuccessHandler {
     @Override
     protected void handle(HttpServletRequest request, HttpServletResponse response, Authentication authentication)
     throws IOException {
@@ -28,7 +28,7 @@ protected void handle(HttpServletRequest request, HttpServletResponse response,
     protected String determineTargetUrl(Authentication authentication){
         String url = "/login?error=true";
         Collection<? extends GrantedAuthority> authorities = authentication.getAuthorities();
-        List<String> roles = new ArrayList<String>();
+        List<String> roles = new ArrayList<>();
         for(GrantedAuthority a : authorities){
             roles.add(a.getAuthority());
         }
diff --git a/src/main/java/com/example/demo/config/WebSecurityConfig.java b/src/main/java/com/example/demo/config/WebSecurityConfig.java
index 424e360..66ae996 100644
--- a/src/main/java/com/example/demo/config/WebSecurityConfig.java
+++ b/src/main/java/com/example/demo/config/WebSecurityConfig.java
@@ -1,6 +1,7 @@
 package com.example.demo.config;
 
 import com.example.demo.service.UserServiceImpl;
+import lombok.AllArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -17,16 +18,10 @@
 
 @Configuration
 @EnableWebSecurity
+@AllArgsConstructor
 public class WebSecurityConfig {
 
-    @Autowired
-    private CustomLoginSucessHandler sucessHandler;
-
-    @Bean
-    public UserDetailsService userDetailsService() {
-        return new UserServiceImpl();
-    }
-
+    private CustomLoginSuccessHandler successHandler;
     @Bean
     public BCryptPasswordEncoder passwordEncoder() {
         return new BCryptPasswordEncoder();
@@ -37,31 +32,21 @@ public AuthenticationManager authenticationManager(AuthenticationConfiguration a
         return authConfig.getAuthenticationManager();
     }
 
-    @Bean
-    public DaoAuthenticationProvider authenticationProvider() {
-        DaoAuthenticationProvider authProvider = new DaoAuthenticationProvider();
-
-        authProvider.setUserDetailsService(userDetailsService());
-        authProvider.setPasswordEncoder(passwordEncoder());
-
-        return authProvider;
-    }
-
     @Bean
     public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
 
                 http.authorizeRequests()
                 // URL matching for accessibility
-                .antMatchers("/", "/login", "/register").permitAll()
+                .antMatchers("/", "/auth/login", "/auth/register").permitAll()
                 .antMatchers("/admin/**").hasAnyAuthority("ADMIN")
                 .antMatchers("/account/**").hasAnyAuthority("USER")
                 .anyRequest().authenticated()
                 .and()
                 // form login
                 .csrf().disable().formLogin()
-                .loginPage("/login")
-                .failureUrl("/login?error=true")
-                .successHandler(sucessHandler)
+                .loginPage("/auth/login")
+                .failureUrl("/auth/login?error=true")
+                .successHandler(successHandler)
                 .usernameParameter("email")
                 .passwordParameter("password")
                 .and()
@@ -72,10 +57,6 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                 .and()
                 .exceptionHandling()
                 .accessDeniedPage("/access-denied");
-
-                http.authenticationProvider(authenticationProvider());
-                http.headers().frameOptions().sameOrigin();
-
                 return http.build();
     }
 
diff --git a/src/main/java/com/example/demo/controller/AdminController.java b/src/main/java/com/example/demo/controller/AdminController.java
index b9d8feb..60812bf 100644
--- a/src/main/java/com/example/demo/controller/AdminController.java
+++ b/src/main/java/com/example/demo/controller/AdminController.java
@@ -1,13 +1,15 @@
 package com.example.demo.controller;
 
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
 @Controller
+@RequestMapping("/admin")
 public class AdminController {
 
-    @RequestMapping(value = {"/admin/dashboard"}, method = RequestMethod.GET)
+    @GetMapping("/dashboard")
     public String adminHome(){
         return "admin/dashboard";
     }
diff --git a/src/main/java/com/example/demo/controller/AuthController.java b/src/main/java/com/example/demo/controller/AuthController.java
index 659a394..bb49f5b 100644
--- a/src/main/java/com/example/demo/controller/AuthController.java
+++ b/src/main/java/com/example/demo/controller/AuthController.java
@@ -2,36 +2,39 @@
 
 import com.example.demo.model.User;
 import com.example.demo.service.UserService;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 
 import javax.validation.Valid;
 import java.util.List;
 
 @Controller
+@AllArgsConstructor
+@RequestMapping("/auth")
 public class AuthController {
-    @Autowired
+
     UserService userService;
 
-    @RequestMapping(value = {"/login"}, method = RequestMethod.GET)
+    @GetMapping("/login")
     public String login(){
         return "auth/login";
     }
 
-    @RequestMapping(value = {"/register"}, method = RequestMethod.GET)
+    @GetMapping("/register")
     public String register(Model model){
         model.addAttribute("user", new User());
         return "auth/register";
     }
 
-    @RequestMapping(value = {"/register"}, method = RequestMethod.POST)
+    @PostMapping("/register")
     public String registerUser(Model model, @Valid User user, BindingResult bindingResult){
         if(bindingResult.hasErrors()){
-            model.addAttribute("successMessage", "User registered successfully!");
+            model.addAttribute("errorMessage", "User not Registered!");
             model.addAttribute("bindingResult", bindingResult);
             return "auth/register";
         }
diff --git a/src/main/java/com/example/demo/controller/UserController.java b/src/main/java/com/example/demo/controller/UserController.java
index af8ea4f..b65ff31 100644
--- a/src/main/java/com/example/demo/controller/UserController.java
+++ b/src/main/java/com/example/demo/controller/UserController.java
@@ -1,13 +1,15 @@
 package com.example.demo.controller;
 
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
 @Controller
+@RequestMapping("/user")
 public class UserController {
 
-    @RequestMapping(value = {"/dashboard"}, method = RequestMethod.GET)
+    @GetMapping()
     public String homePage(){
         return "user/dashboard";
     }
diff --git a/src/main/java/com/example/demo/model/Role.java b/src/main/java/com/example/demo/model/Role.java
index aad0ca6..d4f37e4 100644
--- a/src/main/java/com/example/demo/model/Role.java
+++ b/src/main/java/com/example/demo/model/Role.java
@@ -1,5 +1,9 @@
 package com.example.demo.model;
 
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
 public enum Role {
     USER("User"),
     ADMIN("Admin");
@@ -10,7 +14,4 @@ private Role(String value) {
         this.value = value;
     }
 
-    public String getValue() {
-        return value;
-    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/example/demo/model/User.java b/src/main/java/com/example/demo/model/User.java
index 423eb22..0fca644 100644
--- a/src/main/java/com/example/demo/model/User.java
+++ b/src/main/java/com/example/demo/model/User.java
@@ -1,8 +1,11 @@
 package com.example.demo.model;
 
+import lombok.Data;
+
 import org.hibernate.annotations.CreationTimestamp;
 import org.hibernate.annotations.UpdateTimestamp;
 import org.hibernate.validator.constraints.Length;
+
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
@@ -10,12 +13,16 @@
 import javax.persistence.*;
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotNull;
+
 import java.time.LocalDateTime;
+
+
 import java.util.Collection;
 import java.util.Collections;
 
 
 @Entity
+@Data
 @Table(name = "users")
 public class User implements UserDetails  {
     @SequenceGenerator(
@@ -30,26 +37,30 @@ public class User implements UserDetails  {
     )
     private Long id;
 
+
     @NotNull(message = "First Name cannot be empty")
     @Column(name = "first_name")
     private String firstName;
 
+
     @NotNull(message = "Last Name cannot be empty")
     @Column(name = "last_name")
     private String lastName;
 
+
     @NotNull(message = "Email cannot be empty")
     @Email(message = "Please enter a valid email address")
     @Column(name = "email", unique = true)
     private String email;
 
     @NotNull(message = "Password cannot be empty")
-    @Length(min = 7, message = "Password should be atleast 7 characters long")
+    @Length(min = 7, message = "Password should be at least 7 characters long")
     @Column(name = "password")
     private String password;
 
+
     @Column(name = "mobile", unique = true)
-    @Length(min = 10, message = "Password should be atleast 10 number long")
+    @Length(min = 10, message = "Password should be at least 10 number long")
     private String mobile;
 
     @CreationTimestamp
@@ -60,6 +71,7 @@ public class User implements UserDetails  {
     @Column(name = "updated_at")
     private LocalDateTime updatedAt;
 
+
     @Enumerated(EnumType.STRING)
     private Role role;
 
@@ -108,26 +120,4 @@ public boolean isCredentialsNonExpired() {
     public boolean isEnabled() {
         return enabled;
     }
-
-    public Role getRole() { return role; }
-
-    public void setRole(com.example.demo.model.Role role) {
-        this.role = role;
-    }
-
-    public String getEmail() { return email; }
-
-    public void setEmail(String email) { this.email = email; }
-
-    public String getFirstName() { return firstName; }
-
-    public void setFirstName(String firstName) { this.firstName = firstName; }
-
-    public String getMobile() { return mobile; }
-
-    public void setMobile(String mobile) { this.mobile = mobile; }
-
-    public String getLastName() { return lastName; }
-
-    public void setLastName(String lastName) { this.lastName = lastName; }
 }
diff --git a/src/main/java/com/example/demo/service/UserServiceImpl.java b/src/main/java/com/example/demo/service/UserServiceImpl.java
index 32832dc..b16d9e2 100644
--- a/src/main/java/com/example/demo/service/UserServiceImpl.java
+++ b/src/main/java/com/example/demo/service/UserServiceImpl.java
@@ -2,31 +2,30 @@
 
 import com.example.demo.model.User;
 import com.example.demo.repository.UserRepository;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 
+import lombok.AllArgsConstructor;
+
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 
 @Service
+@AllArgsConstructor
 public class UserServiceImpl implements UserService, UserDetailsService {
 
-    @Autowired
     BCryptPasswordEncoder bCryptPasswordEncoder;
 
-    @Autowired
     UserRepository userRepository;
 
     @Override
     public void saveUser(User user) {
         String encodedPassword = bCryptPasswordEncoder.encode(user.getPassword());
         user.setPassword(encodedPassword);
-//        user.setRole(Role.USER);
         userRepository.save(user);
     }
 
@@ -54,8 +53,8 @@ public List<Object> isUserPresent(User user) {
     @Override
     public UserDetails loadUserByUsername(String email) throws UsernameNotFoundException {
         return userRepository.findByEmail(email).orElseThrow(
-                ()-> new UsernameNotFoundException(
-                        String.format("USER_NOT_FOUND", email)
+                () -> new UsernameNotFoundException(
+                        String.format("user with email %s not found", email)
                 ));
     }
 }
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index ce83caa..4cb2601 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -9,12 +9,13 @@ logging.level.org.springframework.web=DEBUG
 logging.level.org.hibernate=ERROR
 
 #--------------------- DB Connection ------------------
-spring.datasource.url=jdbc:postgresql://localhost:5432/matrimony
-spring.datasource.username=matrimonyuser
-spring.datasource.password=password
+spring.datasource.url=jdbc:mysql://localhost:3306/login_register?createDatabaseIfNotExist=true
+spring.datasource.username=root
+spring.datasource.password=june12003
 
 #--------------------JPA-ORM Properties-----------------
 spring.jpa.show-sql=true
 spring.jpa.hibernate.ddl-auto=update
-spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
+spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQLDialect
 spring.jpa.properties.hibernate.format_sql=true
+
diff --git a/src/main/resources/templates/about-us.html b/src/main/resources/templates/about-us.html
index c341232..8c115a2 100644
--- a/src/main/resources/templates/about-us.html
+++ b/src/main/resources/templates/about-us.html
@@ -1,9 +1,11 @@
 <!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
+<html xmlns:th="http://www.thymeleaf.org" lang="en">
 <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>About Us</title>
 </head>
 <body>
-    <h2>About Us</h2>
+    <h1>About Us</h1>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/access-denied.html b/src/main/resources/templates/access-denied.html
index 26a782a..91a0486 100644
--- a/src/main/resources/templates/access-denied.html
+++ b/src/main/resources/templates/access-denied.html
@@ -1,9 +1,12 @@
 <!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
+<html xmlns:th="http://www.thymeleaf.org" lang="en">
 <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
     <title>Access Denied</title>
 </head>
 <body>
     <h2>Access Denied</h2>
+    <p>OOPS, you are not allowed to access this end point. Contact your administrator</p>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/admin/dashboard.html b/src/main/resources/templates/admin/dashboard.html
index 9a140e2..eca1e6b 100644
--- a/src/main/resources/templates/admin/dashboard.html
+++ b/src/main/resources/templates/admin/dashboard.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
+<html xmlns:th="http://www.thymeleaf.org"
+      xmlns:sec="http://www.w3.org/1999/xhtml" lang="en">
 <head>
   <title>User Dashboard</title>
 </head>
diff --git a/src/main/resources/templates/auth/login.html b/src/main/resources/templates/auth/login.html
index 1acd9e2..fe7d693 100644
--- a/src/main/resources/templates/auth/login.html
+++ b/src/main/resources/templates/auth/login.html
@@ -1,15 +1,57 @@
 <!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
+<html xmlns:th="http://www.thymeleaf.org"
+      xmlns="http://www.w3.org/1999/xhtml"
+      lang="en">
 <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" >
     <title>Login</title>
 </head>
 <body>
-    <form th:action="@{/login}" method="POST" class="form-signin">
-        <h3 th:text="Login"></h3>
-        <input type="text" name="email" th:placeholder="Email" /> <br /><br />
-        <input type="password" th:placeholder="Password" name="password" /> <br /><br />
-        <button type="Submit" th:text="Login"></button> | <a th:href="@{|/register|}" th:text="'Register'"></a><br />
-        <div th:if="${param.error}"><p>Email or Password is invalid.</p></div> <br />
-    </form>
+    <nav class="navbar navbar-expand-lg navbar-dark bg-dark">
+        <div class="container-fluid">
+            <a class="navbar-brand">Login Register</a>
+            <button class="navbar-toggler" type="button"
+                    data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent"
+                    aria-controls="navbarSupportedContent" aria-expanded="false"
+                    aria-label="Toggle navigation">
+                <span class="navbar-toggler-icon"></span>
+            </button>
+        </div>
+    </nav>
+    <br />
+    <br />
+    <div class="container">
+        <div class="row">
+            <div class="col-md-6 offset-md-3">
+                <div th:if="${errorMessage != null}">
+                    <div class="alert alert-danger">Invalid Username or Password</div>
+                </div>
+                <div th:if="${errorMessage == null}">
+                    <div class="alert alert-success">You have been logged out</div>
+                </div>
+                <div class="card">
+                    <div class="card-header">
+                        <h2 class="text-center">Login</h2>
+                    </div>
+                    <div class="card-body">
+                        <form method="post" role="form" th:action="@{/login}" class="form-horizontal">
+                            <div class="form-group mb-3">
+                                <label for="username" class="control-label">Username</label>
+                                <input type="text" placeholder="Enter username" id="username" name="username" class="form-control" />
+                            </div>
+                            <div class="form-group mb-3">
+                                <label for="password" class="control-label">Password</label>
+                                <input type="password" placeholder="Enter password" id="password" name="password" class="form-control" />
+                            </div>
+                            <div class="form-group mb-3">
+                                <button type="submit" class="btn btn-primary">Submit</button>
+                            </div>
+                        </form>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
 </body>
 </html>
diff --git a/src/main/resources/templates/auth/register.html b/src/main/resources/templates/auth/register.html
index 9608f88..38034c2 100644
--- a/src/main/resources/templates/auth/register.html
+++ b/src/main/resources/templates/auth/register.html
@@ -1,28 +1,73 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org">
 <head>
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" >
   <title>Login</title>
 </head>
 <body>
-  <form th:action="@{/register}" th:object="${user}" method="post">
-    <h3>Registration</h3>
-    <input type="text" th:field="*{firstName}" placeholder="First Name" /> <br/><br/>
-    <input type="text" th:field="*{lastName}" placeholder="Last Name" /> <br/><br/>
-    <input type="text" th:field="*{mobile}" placeholder="Mobile Number" /> <br/><br/>
-    <input type="text" th:field="*{email}" placeholder="Email" /> <br/><br/>
-    <input type="password" th:field="*{password}" placeholder="Password" /> <br/><br/>
-    <select th:field="*{role}" required>
-      <option value="">Select</option>
-      <option value="ADMIN">ADMIN</option>
-      <option value="USER">USER</option>
-    </select> <br/><br/>
-    <button type="submit">Register</button> | <a th:href="@{|/login|}" th:text="'Log in'"></a>
-    <span th:utext="${successMessage}"></span>
-    <div th:if="${bindingResult!=null && bindingResult.getAllErrors()!=null}">
-      <ul th:each="data : ${bindingResult.getAllErrors()}">
-        <li th:text="${data.getObjectName() + ' :: ' + data.getDefaultMessage()}"></li>
+<nav class="navbar navbar-expand-lg navbar-dark bg-dark">
+  <div class="container-fluid">
+    <a class="navbar-brand">Home Page</a>
+    <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+    <div class="collapse navbar-collapse" id="navbarSupportedContent">
+      <ul class="navbar-nav me-auto mb-2 mb-lg-0">
+        <li class="nav-item">
+          <a class="nav-link active" aria-current="page" th:href="@{/logout}">Logout</a>
+        </li>
       </ul>
     </div>
-</form>
+  </div>
+</nav>
+<br /><br />
+
+  <div class="container">
+    <div class="row">
+      <div class="col-md-6 offset-md-3">
+        <div class="card">
+          <div class="card-header">
+            <h2 class="text-center">Register</h2>
+          </div>
+          <div class="card-body">
+            <form th:action="@{/register}" th:object="${user}" method="post" role="form">
+              <div class="form-group mb-3">
+                <label for="firstName">First Name</label>
+                <input type="text" th:field="*{firstName}" class="form-control" id="firstName" placeholder="First Name" />
+              </div>
+              <div class="form-group mb-3">
+                <label for="lastName">Last Name</label>
+                <input type="text" th:field="*{lastName}" class="form-control" id="lastName" placeholder="Last Name" />
+              </div>
+              <div class="form-group mb-3">
+                <label for="mobile">Mobile</label>
+                <input type="text" th:field="*{mobile}" class="form-control" id="mobile" placeholder="Mobile Number" />
+              </div>
+              <div class="form-group mb-3">
+                <label for="email">Email</label>
+                <input type="text" th:field="*{email}" id="email" class="form-control" placeholder="Email" />
+              </div>
+              <div class="form-group mb-3">
+                <label for="password">Password</label>
+                <input type="password" id="password" class="form-control" th:field="*{password}" placeholder="Password" />
+              </div>
+              <div class="input-group mb-3">
+                <label class="input-group-text" for="role">Role</label>
+                <select class="form-select" th:field="*{role}" id="role" required>
+                  <option value="ADMIN">ADMIN</option>
+                  <option value="USER">USER</option>
+                </select>
+              </div>
+              <div class="form-group mb-3 d-flex">
+                <button class="btn btn-primary me-3 " type="submit">Register</button><a class="btn btn-outline-secondary" th:href="@{/login}" th:text="'Log in'" role="button">Log in</a>
+              </div>
+            </form>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/homepage.html b/src/main/resources/templates/homepage.html
index 6deb9e1..c1321fd 100644
--- a/src/main/resources/templates/homepage.html
+++ b/src/main/resources/templates/homepage.html
@@ -1,27 +1,52 @@
 <!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
+<html xmlns:th="http://www.thymeleaf.org"
+      xmlns:sec="http://www.w3.org/1999/xhtml"
+      lang="en">
 <head>
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" >
     <title>Homepage</title>
 </head>
 <body>
-  <h2>Welcome to Homepage</h2>
-  <p sec:authorize="hasRole('ROLE_ANONYMOUS')">Text visible to anonymous.</p>
-  <p sec:authorize="hasRole('USER')">Text visible to user.</p>
-  <p sec:authorize="hasRole('ADMIN')">Text visible to admin.</p>
-  <p sec:authorize="isAuthenticated()">Text visible only to authenticated users.</p>
+  <nav class="navbar navbar-expand-lg navbar-dark bg-dark">
+    <div class="container-fluid">
+      <a class="navbar-brand">Home Page</a>
+      <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+        <span class="navbar-toggler-icon"></span>
+      </button>
+      <div class="collapse navbar-collapse" id="navbarSupportedContent">
+        <ul class="navbar-nav me-auto mb-2 mb-lg-0">
+          <li class="nav-item">
+            <a class="nav-link active" aria-current="page" th:href="@{/logout}">Logout</a>
+          </li>
+        </ul>
+      </div>
+    </div>
+  </nav>
+<br /><br />
 
-  <div sec:authorize="hasRole('ROLE_ANONYMOUS')">
-    <p><a th:href="@{|/login|}" th:text="'Log in'"></a></p>
-    <p><a th:href="@{|/register|}" th:text="'Register'"></a></p>
-  </div>
+  <div class="container">
+    <div class="row">
+      <h2>Welcome to Homepage</h2>
+      <p sec:authorize="hasRole('ROLE_ANONYMOUS')">Text visible to anonymous.</p>
+      <p sec:authorize="hasRole('USER')">Text visible to user.</p>
+      <p sec:authorize="hasRole('ADMIN')">Text visible to admin.</p>
+      <p sec:authorize="isAuthenticated()">Text visible only to authenticated users.</p>
+
+      <div sec:authorize="hasRole('ROLE_ANONYMOUS')">
+        <p><a th:href="@{/login}" th:text="'Log in'"></a></p>
+        <p><a th:href="@{/auth/register}" th:text="'Register'"></a></p>
+      </div>
 
-  <div sec:authorize="isAuthenticated()">
-    <p>Logged as: <span sec:authentication="name"></span></p>
-    <p>Has role: <span sec:authentication="authorities"></span></p>
-    <p sec:authorize="hasAuthority('USER')"><a th:href="@{|/dashboard|}" th:text="'User Dashboard'"></a></p>
-    <p sec:authorize="hasAuthority('ADMIN')"><a th:href="@{|/admin/dashboard|}" th:text="'Admin Dashboard'"></a></p>
-    <a th:href="@{/logout}">Log out</a>
+      <div sec:authorize="isAuthenticated()">
+        <p>Logged as: <span sec:authentication="name"></span></p>
+        <p>Has role: <span sec:authentication="authorities"></span></p>
+        <p sec:authorize="hasAuthority('USER')"><a th:href="@{dashboard}" th:text="'User Dashboard'"></a></p>
+        <p sec:authorize="hasAuthority('ADMIN')"><a th:href="@{admin/dashboard}" th:text="'Admin Dashboard'"></a></p>
+        <a th:href="@{/logout}">Log out</a>
+      </div>
+    </div>
   </div>
 
+
 </body>
 </html>
\ No newline at end of file