diff --git a/templates/landingpage.html b/templates/landingpage.html
index 755f6aca077c33efb2fc957977ddc5059b4cbfb6..f11aaa4a558bcd6e96e8fd7ffe4274b34a5379e9 100644
--- a/templates/landingpage.html
+++ b/templates/landingpage.html
@@ -9,10 +9,10 @@
     <div class="container-fluid">
       <ul class="navbar-nav">
         <li class="nav-item">
-          <a class="nav-link" href="locations.html">Coworking locations</a>
+          <a class="nav-link" href="/locations">Coworking locations</a>
         </li>
        <li class="nav-item">
-          <a class="nav-link" href="/Manage_Coworking_Spaces">Manage locations</a>
+          <a class="nav-link" href="/coworking">Manage locations</a>
         </li>
       </ul>
     </div>
diff --git a/static/login.html b/templates/login.html
similarity index 72%
rename from static/login.html
rename to templates/login.html
index 71052178cbba342d53701c1b47e3b394dd5b0796..e797e0efbcb69b1288c89e40f8b614e93aa3a008 100644
--- a/static/login.html
+++ b/templates/login.html
@@ -3,6 +3,15 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 </head>
+<nav class="navbar navbar-expand-sm bg-dark navbar-dark">
+    <div class="container-fluid">
+      <ul class="navbar-nav">
+        <li class="nav-item">
+          <a class="nav-link" href="landingpage.html">Back</a>
+        </li>
+      </ul>
+    </div>
+  </nav>
 <header class="masthead bg-dark text-white text-center">
     <div class="container-fluid">
         <img id="logo" src="Media/logo.png"/>
@@ -17,7 +26,7 @@
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
     <link href="https://fonts.googleapis.com/css2?family=Sora:wght@800&display=swap" rel="stylesheet">
     <link rel="stylesheet" href="CSS/loginstyle.css">
-<!-- <script src="JS/login.js"></script> -->
+    <script src="JS/login.js"></script>
     <title>Login</title>
     <div id="card" class="card text-dark w-25 text-center">
         <div class="card-body text-center">
@@ -36,29 +45,11 @@
                 <label class="form-label" for="form2Example2">Password</label>
             </div>
   
-            <!-- 2 column grid layout for inline styling -->
-            <div class="row mb-4">
-            <div class="col d-flex justify-content-center">
-            <!-- Checkbox -->
-                <div class="form-check">
-                    <input class="form-check-input" type="checkbox" value="" id="form2Example31" checked />
-                    <label class="form-check-label" for="form2Example31"> Remember me </label>
-                </div>
-            </div>
-  
-            <div class="col">
-                <!-- Simple link -->
-                <a href="#!">Forgot password?</a>
-            </div>
-  
             <!-- Submit button -->
             <button type="submit" class="btn btn-light" id="loginButton">
                 <span class="spinner-grow spinner-grow-sm"></span>
                 Sign in
             </button>
-            <!-- Register buttons -->
-            <div class="text-center">
-            <p>Not a member? <a href="#!">Register</a></p>
         </form>
     </body>
 </html>
diff --git a/static/make_booking.html b/templates/make_booking.html
similarity index 100%
rename from static/make_booking.html
rename to templates/make_booking.html
diff --git a/testloginserver.py b/testloginserver.py
index a8e30bee50f08148010054db4734ccc9890f1542..997396bdf5a8ad834a94995e35900551ffa83738 100644
--- a/testloginserver.py
+++ b/testloginserver.py
@@ -6,6 +6,17 @@ app = Flask(__name__)
 
 ALLOWED_EXTENSIONS = set(['txt', 'pdf', 'png', 'jpg', 'jpeg', 'gif'])
 
+@app.route("/home", methods=["GET"])
+def load():
+    return render_template('landingpage.html')
+
+@app.route("/locations", methods=["GET"])
+def loadlocations():
+    return render_template('locations.html')
+
+@app.route("/coworking", methods=["GET"])
+def loadcoworking():
+    return render_template('manage_coworking_spaces.html')
 
 @app.route("/login", methods=['GET', 'POST'])
 def login():
@@ -30,7 +41,7 @@ def login():
         finally:
                 conn.close()
                 return render_template('landingpage.html')
- 
+
 def select():
     conn = sqlite3.connect("login.db")
     cur = conn.cursor()