diff --git a/templates/layout/base.html b/templates/layout/base.html
index fcf4b49..05236f1 100644
--- a/templates/layout/base.html
+++ b/templates/layout/base.html
@@ -3,8 +3,11 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>{{ .Title }}</title>
-    <link rel="stylesheet" href="/static/css/styles.css" >
+    <link rel="stylesheet" href="/static/css/base.css" >
+    <link rel="icon" type="image/png" href="/static/icon.png">
 </head>
 <body>
     <!-- <header> -->
diff --git a/templates/layout/footer.html b/templates/layout/footer.html
index b0564a7..878d3f5 100644
--- a/templates/layout/footer.html
+++ b/templates/layout/footer.html
@@ -1,4 +1,5 @@
 {{ define "footer" }}
+<link rel="stylesheet" href="/static/css/footer.css">
 <footer class="footer"><p>&copy; 2025 HSP Guard</p></footer>
 {{ end }}
 
diff --git a/templates/pages/login.html b/templates/pages/login.html
index bc19fa1..91fb11e 100644
--- a/templates/pages/login.html
+++ b/templates/pages/login.html
@@ -1,17 +1,37 @@
 {{ define "content" }}
-    <form method="POST" action="/api/v1/login">
-        <label for="email">
-            Email:
-            <input type="email" name="email" required>
-        </label>
-        <br>
-        <label for="email">
-            Password:
-            <input type="password" name="password" required>
-        </label>
-        <br>
-        <button type="submit">
-            Login
-        </button>
-    </form>
+<link rel="stylesheet" href="/static/css/login.css">
+<div class="icon-wrapper">
+    <img src="/static/icon.png" alt="icon" class="icon">
+</div>
+<h1 class="modal-title">
+    Welcome to Home Guard
+</h1>
+<h3 class="modal-description">
+    Enter your credentials to access home services and tools.
+</h3>
+<form method="POST" action="/api/v1/login" class="form">
+    <div class="input-group">
+        <div class="input-icon">
+            @
+        </div>
+        <input class="input-field" type="email" name="email" placeholder="Email" required>
+    </div>
+    <div class="input-group">
+        <div class="input-icon">
+            <img src="/static/icons/padlock.png" alt="user">
+        </div>
+        <input class="input-field" type="password" name="password" placeholder="Password" required>
+    </div>
+    
+    <div class="checkbox-group">
+        <input type="checkbox" name="terms_and_conditions">
+        <div>
+            <p>By checking this checkbox I submit, that read and accepted terms and conditions of this service and home lab.</p>
+        </div>
+    </div>
+
+    <button class="button primary login-btn" type="submit">
+        Login
+    </button>
+</form>
 {{ end }}
diff --git a/templates/pages/register.html b/templates/pages/register.html
index 2dcedb3..ffcda02 100644
--- a/templates/pages/register.html
+++ b/templates/pages/register.html
@@ -1,14 +1,18 @@
 {{ define "content" }}
+<link rel="stylesheet" href="/static/css/register.css">
 <div class="icon-wrapper">
     <img src="/static/icon.png" alt="icon" class="icon">
 </div>
 <h1 class="modal-title">
-    Create an account to enter homelab
+    Welcome to Home Guard
 </h1>
-<form method="POST" action="/api/v1/register">
+<h3 class="modal-description">
+    Create an account to access home services and tools.
+</h3>
+<form method="POST" action="/api/v1/register" class="form">
     <div class="input-group">
         <div class="input-icon">
-            &copy;
+            <img src="/static/icons/user.png" alt="user">
         </div>
         <input class="input-field" type="text" name="full_name" placeholder="Full Name" required>
     </div>
@@ -20,11 +24,31 @@
     </div>
     <div class="input-group">
         <div class="input-icon">
-            P
+            <img src="/static/icons/telephone.png" alt="user">
+        </div>
+        <input class="input-field" type="tel" name="phone" placeholder="Phone Number" required>
+    </div>
+    <div class="input-group">
+        <div class="input-icon">
+            <img src="/static/icons/padlock.png" alt="user">
         </div>
         <input class="input-field" type="password" name="password" placeholder="Password" required>
     </div>
-    <button type="submit">
+    <div class="input-group">
+        <div class="input-icon">
+            <img src="/static/icons/padlock.png" alt="user">
+        </div>
+        <input class="input-field" type="password" name="password" placeholder="Repeat Password" required>
+    </div>
+    
+    <div class="checkbox-group">
+        <input type="checkbox" name="terms_and_conditions">
+        <div>
+            <p>By checking this checkbox I submit, that read and accepted terms and conditions of this service and home lab.</p>
+        </div>
+    </div>
+
+    <button class="button primary register-btn" type="submit">
         Register
     </button>
 </form>
