diff --git a/src/layout/Footer.vue b/src/layout/Footer.vue
index aa195a2..3acc81d 100644
--- a/src/layout/Footer.vue
+++ b/src/layout/Footer.vue
@@ -11,7 +11,7 @@ import { text } from "../lib/index.js";
 </script>
 
 <template>
-<Section bg="bg-gray-900" class="text-white">
+<Section bg="bg-gray-900" class="text-white" id="kontakt">
     <Grid>
         <div>
             <h3 class="text-3xl font-light pb-4">MTÜ Lapikud</h3>
diff --git a/src/layout/Navbar.vue b/src/layout/Navbar.vue
index 4551836..e673f40 100644
--- a/src/layout/Navbar.vue
+++ b/src/layout/Navbar.vue
@@ -356,7 +356,7 @@ function handleResize() {
                                         )
                                     "
                                     :onClick="
-                                        () => handleNavigation('/kontakt')
+                                        () => handleNavigation('#kontakt')
                                     "
                                 >
                                     {{ text.contact }}
diff --git a/src/lib/router/router.js b/src/lib/router/router.js
index 209da11..08a85e5 100644
--- a/src/lib/router/router.js
+++ b/src/lib/router/router.js
@@ -12,6 +12,13 @@ export function navigate(path, options = {}) {
 
     if (external) {
         window.open(path, '_blank', 'noopener,noreferrer');
+    } else if (path.startsWith('#')) {
+        const hash = path;
+        const target = document.getElementById(hash.slice(1));
+        if (target) {
+            window.history.pushState({}, '', `${window.location.pathname}${window.location.search}${hash}`);
+            target.scrollIntoView({ behavior: 'smooth' });
+        }
     } else {
         const url = new URL(path, window.location.origin);
         if (url.origin !== window.location.origin) {
@@ -29,12 +36,24 @@ export function navigate(path, options = {}) {
 }
 
 function commitNavigation(path) {
+    const hash = new URL(path, window.location.origin).hash;
     window.history.pushState({}, '', path);
-    window.scrollTo(0, 0);
     window.dispatchEvent(new PopStateEvent('popstate'));
 
     const lang = getLanguageFromRoute(new URL(path, window.location.origin).pathname);
     if (lang) switchLang(lang);
+
+    if (hash) {
+        const scrollToHash = () => {
+            const target = document.getElementById(hash.slice(1));
+            if (target) {
+                target.scrollIntoView({ behavior: 'smooth' });
+            }
+        };
+        requestAnimationFrame(scrollToHash);
+    } else {
+        window.scrollTo(0, 0);
+    }
 }
 
 /**
diff --git a/src/routes/Contact.vue b/src/routes/Contact.vue
deleted file mode 100644
index d6992a9..0000000
--- a/src/routes/Contact.vue
+++ /dev/null
@@ -1,19 +0,0 @@
-<script setup>
-  import {
-    Section,
-    Grid,
-    Center,
-  } from "../components/index.js";
-
-  import { usePageText } from "../lib/index.js";
-
-  const text = usePageText("Contact");
-</script>
-
-<template>
-<div class="safe-area-navbar">
-<Section>
-  <p>In development...</p>
-</Section>
-</div>
-</template>
diff --git a/src/routes/index.js b/src/routes/index.js
index d171244..2a38fd2 100644
--- a/src/routes/index.js
+++ b/src/routes/index.js
@@ -7,7 +7,6 @@ const loadMentors = () => import('./Mentors.vue');
 const loadHelpdesk = () => import('./Helpdesk.vue');
 const loadOurWork = () => import('./OurWork.vue');
 const loadAboutUs = () => import('./AboutUs.vue');
-const loadContact = () => import('./Contact.vue');
 const loadManagment = () => import('./Managment.vue');
 const loadStriim = () => import('./Striim.vue');
 const loadCalendar = () => import('./Calendar.vue');
@@ -101,8 +100,6 @@ export const routes = {
   '/ourwork': loadOurWork,
   '/lapikutest': loadAboutUs,
   '/aboutus': loadAboutUs,
-  '/kontakt': loadContact,
-  '/contact': loadContact,
   '/juhatus': loadManagment,
   '/management': loadManagment,
   '/koolitused': loadWorkshops,