diff --git a/src/layout/Navbar.svelte b/src/layout/Navbar.svelte
index 27429f2..4e81330 100644
--- a/src/layout/Navbar.svelte
+++ b/src/layout/Navbar.svelte
@@ -169,7 +169,6 @@
           <!-- Language Switcher -->
           <Button 
             class="rounded-[5px] px-3 py-1 text-sm ml-2"
-            style="color: var(--orange)"
             buttonHoverStyle="color:var(--white)"
             onClick={() => switchLanguageRoute($currentLang === 'est' ? 'en' : 'est')}
           >
diff --git a/src/routes/Managment.svelte b/src/routes/Managment.svelte
new file mode 100644
index 0000000..63c87d4
--- /dev/null
+++ b/src/routes/Managment.svelte
@@ -0,0 +1,113 @@
+<script>
+  import {
+    Section,
+    Grid,
+    Card,
+    Center,
+    Container,
+    Stack,
+  } from "$components";
+  import { onMount } from "svelte";
+  import yaml from 'js-yaml';
+  import { currentLang, getLangText } from "$lib";
+  import Mailbox from "lucide-svelte/icons/mailbox";
+  import Phone from "lucide-svelte/icons/phone";
+
+  let currentManagement = [];
+  let pastManagement = [];
+  let lang = 'est';
+
+  currentLang.subscribe(value => {
+    lang = value;
+  });
+
+  onMount(async () => {
+    try {
+      const currentRes = await fetch('/_data/management.yml');
+      const currentYaml = await currentRes.text();
+      currentManagement = yaml.load(currentYaml) || [];
+
+      const pastRes = await fetch('/_data/past_management.yml');
+      const pastYaml = await pastRes.text();
+      pastManagement = yaml.load(pastYaml) || [];
+    } catch (error) {
+      console.error('Error loading management data:', error);
+    }
+  });
+</script>
+
+<!-- Current Management Section -->
+<Section padding="large">
+    <Center>
+      <h1 class="text-4xl font-light pb-8 text-center">Praegune juhtkond</h1>
+    </Center>
+    <Grid min="500px" gap="3rem">
+      {#each currentManagement as member (member.name)}
+        <div class="flex flex-col sm:flex-row gap-6 items-start">
+          <div class="w-full sm:w-auto sm:max-w-[200px] aspect-square shrink-0">
+            <img
+              src={`/assets/management-images/${member.photo}`}
+              alt={member.name}
+              class="w-full h-full object-cover rounded-md"
+            />
+          </div>
+          <div class="flex flex-col gap-2 grow">
+            <h3 class="text-2xl font-medium">{member.name}</h3>
+            <p class="text-base text-gray-700">
+              {getLangText(member, 'role', lang)} - {getLangText(member, 'subrole', lang)}
+            </p>
+            <a
+              href="mailto:{member.email}"
+              class="text-base flex items-center gap-2 text-[#f0941d] hover:opacity-80 transition"
+            >
+              <Mailbox size={18} />{member.email}
+            </a>
+            <a
+              href="tel:{member.phone}"
+              class="text-base flex items-center gap-2 text-[#f0941d] hover:opacity-80 transition"
+            >
+              <Phone size={18} />{member.phone}
+            </a>
+          </div>
+        </div>
+      {/each}
+    </Grid>
+</Section>
+
+<!-- Past Management Section -->
+<Section padding="large" background="rgba(240, 148, 29, 0.05)">
+  <Container>
+    <Center>
+      <h1 class="text-4xl font-light pb-8 text-center">
+        Organisatsiooni juhtinud inimesed läbi aegade
+      </h1>
+    </Center>
+    <Stack gap="3rem">
+      {#each pastManagement as yearData (yearData.year)}
+        <div>
+          <div class="flex items-center gap-4 pb-6 mb-6 border-b-2 border-[#f0941d]">
+            <h2 class="text-3xl font-light text-[#f0941d] whitespace-nowrap">
+              {yearData.year}
+            </h2>
+          </div>
+          <Grid min="120px" gap="1rem">
+            {#each yearData.members as member (member.name)}
+              <div class="flex flex-col items-center">
+                <div class="w-full h-auto max-w-[150px] mx-auto aspect-square mb-3">
+                  <img
+                    src={`/assets/past-management-images/optimised/${member.image}`}
+                    alt={member.name}
+                    class="w-full h-full object-cover rounded-md"
+                  />
+                </div>
+                <h3 class="text-base font-medium text-center">
+                  {member.name}
+                </h3>
+              </div>
+            {/each}
+          </Grid>
+        </div>
+      {/each}
+    </Stack>
+  </Container>
+</Section>
\ No newline at end of file
diff --git a/src/routes/index.js b/src/routes/index.js
index 21f4c76..9af6fd7 100644
--- a/src/routes/index.js
+++ b/src/routes/index.js
@@ -8,6 +8,7 @@ import Helpdesk from './Helpdesk.svelte'
 import OurWork from './OurWork.svelte'
 import AboutUs from './AboutUs.svelte'
 import Contact from './Contact.svelte'
+import Managment from './Managment.svelte'
 
 // Route mapping for language switching
 export const routeMap = {
@@ -74,4 +75,6 @@ export const routes = {
   '/aboutus': AboutUs,
   '/kontakt': Contact,
   '/contact': Contact,
+  '/juhatus': Managment,
+  '/management': Managment,
 }
\ No newline at end of file