diff --git a/.gitignore b/.gitignore
index b6d3320..8186e8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,4 @@ build/
 
 ### Database files ###
 *.db
+*.mv.db
diff --git a/data/maradona/dbfile.mv.db b/data/maradona/dbfile.mv.db
index b1a506f..85f7074 100644
Binary files a/data/maradona/dbfile.mv.db and b/data/maradona/dbfile.mv.db differ
diff --git a/src/main/resources/templates/core/_navigation.html b/src/main/resources/templates/core/_navigation.html
index 3b8a040..9cfc6c9 100644
--- a/src/main/resources/templates/core/_navigation.html
+++ b/src/main/resources/templates/core/_navigation.html
@@ -1,20 +1,22 @@
-<nav>
-  <ul class="nav justify-content-end">
-    <li class="nav-item">
-      <a
-        class="nav-link"
-        th:href="@{/projects}"
-        th:classappend="${activePage == 'projects' ? 'active' : ''}"
-        >Projekte</a
-      >
-    </li>
-    <li class="nav-item">
-      <a
-        class="nav-link"
-        th:href="@{/skills}"
-        th:classappend="${activePage == 'profile' ? 'active' : ''}"
-        >Skills</a
-      >
-    </li>
-  </ul>
-</nav>
+<div th:fragment="navigation">
+  <nav>
+    <ul class="nav justify-content-end">
+      <li class="nav-item">
+        <a
+          class="nav-link"
+          th:href="@{/projects}"
+          th:classappend="${activePage == 'projects' ? 'active' : ''}"
+          >Projekte</a
+        >
+      </li>
+      <li class="nav-item">
+        <a
+          class="nav-link"
+          th:href="@{/skills}"
+          th:classappend="${activePage == 'profile' ? 'active' : ''}"
+          >Skills</a
+        >
+      </li>
+    </ul>
+  </nav>
+</div>
diff --git a/src/main/resources/templates/pages/projects/projects-create.html b/src/main/resources/templates/pages/projects/create.html
similarity index 100%
rename from src/main/resources/templates/pages/projects/projects-create.html
rename to src/main/resources/templates/pages/projects/create.html
diff --git a/src/main/resources/templates/pages/projects/projects.html b/src/main/resources/templates/pages/projects/overview.html
similarity index 90%
rename from src/main/resources/templates/pages/projects/projects.html
rename to src/main/resources/templates/pages/projects/overview.html
index 67205e4..5600777 100644
--- a/src/main/resources/templates/pages/projects/projects.html
+++ b/src/main/resources/templates/pages/projects/overview.html
@@ -4,6 +4,9 @@
     <div th:replace="~{/core/_metadata :: metadata}"></div>
     <title>Projects</title>
     <link rel="stylesheet" href="/css/projects/projects.css" />
+    <link rel="stylesheet" href="/css/core/style.css" />
+    <link rel="stylesheet" href="/css/core/header.css" />
+    <link rel="stylesheet" href="/css/core/footer.css" />
   </head>
   <body>
     <div class="wrapper">
diff --git a/src/main/resources/templates/pages/skills/skills-add.html b/src/main/resources/templates/pages/skills/add.html
similarity index 83%
rename from src/main/resources/templates/pages/skills/skills-add.html
rename to src/main/resources/templates/pages/skills/add.html
index 7b358d4..cd08989 100644
--- a/src/main/resources/templates/pages/skills/skills-add.html
+++ b/src/main/resources/templates/pages/skills/add.html
@@ -15,11 +15,12 @@
         <h2 class="mb-4">Add Skill</h2>
         <form
           th:action="@{/skills/add}"
-          th:object="${skillForm}"
+          th:object="${skillProtoype}"
           method="post"
           class="project-card"
         >
           <div class="card-body">
+            <!-- Primary Skill Dropdown -->
             <div class="form-group">
               <label for="primarySkill">Primary Skill</label>
               <select
@@ -28,6 +29,9 @@
                 class="form-control"
                 th:field="*{primarySkillId}"
               >
+                <option value="" disabled selected>
+                  Select a primary skill
+                </option>
                 <option
                   th:each="primarySkill : ${primarySkills}"
                   th:value="${primarySkill.psid}"
@@ -35,6 +39,8 @@
                 ></option>
               </select>
             </div>
+
+            <!-- Secondary Skill Dropdown -->
             <div class="form-group">
               <label for="secondarySkill">Secondary Skill</label>
               <select
@@ -48,6 +54,8 @@
                 </option>
               </select>
             </div>
+
+            <!-- Skill Level Dropdown -->
             <div class="form-group">
               <label for="level">Level</label>
               <select
@@ -56,6 +64,7 @@
                 class="form-control"
                 th:field="*{level}"
               >
+                <option value="" disabled selected>Select skill level</option>
                 <option
                   th:each="level : ${#numbers.sequence(1, 5)}"
                   th:value="${level}"
@@ -63,12 +72,14 @@
                 ></option>
               </select>
             </div>
+
+            <!-- Submit Button -->
             <button type="submit" class="btn-create-project">Add Skill</button>
           </div>
         </form>
       </div>
       <div th:replace="~{/core/_footer :: footer}"></div>
     </div>
-    <script src="/js/skills/skills.js"></script>
+    <script src="/js/skills/fetchSecondarySkills.js"></script>
   </body>
 </html>
diff --git a/src/main/resources/templates/pages/skills/skills-create.html b/src/main/resources/templates/pages/skills/create.html
similarity index 100%
rename from src/main/resources/templates/pages/skills/skills-create.html
rename to src/main/resources/templates/pages/skills/create.html
diff --git a/src/main/resources/templates/pages/skills/skills.html b/src/main/resources/templates/pages/skills/overview.html
similarity index 97%
rename from src/main/resources/templates/pages/skills/skills.html
rename to src/main/resources/templates/pages/skills/overview.html
index d688b9c..a28128a 100644
--- a/src/main/resources/templates/pages/skills/skills.html
+++ b/src/main/resources/templates/pages/skills/overview.html
@@ -5,6 +5,8 @@
     <title>Skills</title>
     <link rel="stylesheet" href="/css/skills/skills.css" />
     <link rel="stylesheet" href="/css/core/style.css" />
+    <link rel="stylesheet" href="/css/core/header.css" />
+    <link rel="stylesheet" href="/css/core/footer.css" />
   </head>
   <body>
     <div class="wrapper">
