diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 40bb2ff..22aa4df 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1,24 +1,24 @@
 <script>
-	// Importing dropdown component	
-	import Dropdown from '$lib/dropdown.svelte';
+    // Importing dropdown component
+    import Dropdown from "$lib/dropdown.svelte";
 
-	// Importing page store
-	import { page } from '$app/stores';
+    // Importing page store
+    import { page } from "$app/stores";
 
-	import '../app.css';
-	import logo from '$lib/assets/logo.svg';
+    import "../app.css";
+    import logo from "$lib/assets/logo.svg";
 
-	// Icon imports (Lucide)
-	import Coffee from 'lucide-svelte/icons/coffee';
-	import CalendarClock from 'lucide-svelte/icons/calendar-clock';
-	import Presentation from 'lucide-svelte/icons/presentation';
-	import Swords from 'lucide-svelte/icons/swords';
-	import Lectern from 'lucide-svelte/icons/lectern';
-	import Bot from 'lucide-svelte/icons/bot';
-	import HandHeart from 'lucide-svelte/icons/hand-heart';
-	import Trophy from 'lucide-svelte/icons/trophy';
+    // Icon imports (Lucide)
+    import Coffee from "lucide-svelte/icons/coffee";
+    import CalendarClock from "lucide-svelte/icons/calendar-clock";
+    import Presentation from "lucide-svelte/icons/presentation";
+    import Swords from "lucide-svelte/icons/swords";
+    import Lectern from "lucide-svelte/icons/lectern";
+    import Bot from "lucide-svelte/icons/bot";
+    import HandHeart from "lucide-svelte/icons/hand-heart";
+    import Trophy from "lucide-svelte/icons/trophy";
 
-	let { children } = $props();
+    let { children } = $props();
 </script>
 
 <nav class="w-full fixed z-20 inline-flex items-center h-32 p-8 justify-evenly bg-white">
@@ -51,24 +51,30 @@
 </nav>
 
 <div class="pt-32">
-	{@render children()}
+    {@render children()}
 </div>
 
 <footer class="w-full bg-black text-[#f0941d] text-center p-8">
-	<div class="grid grid-cols-2 max-w-[64rem] mx-auto">
-		<div class="text-left">
-			<h3 class="pb-4 text-2xl">MTÜ Lapikud</h3>
-			<p>Aadress: Akadeemia tee 5, 12616 Tallinn, Eesti</p>
-			<p>E-post: +372 58 160 799</p>
-			<p>Messenger: m.me/Lapikud</p>
-			<p>Reg. kood: 801 67 145</p>
-			<p>Swedbank: EE812200221019551756</p>
-		</div>
-		<div class="text-left">
-			<h3 class="pb-4 text-2xl">Meie sotsiaalid!</h3>
-			<p>Facebook: <a href="https://www.facebook.com/Lapikud">Lapikud</a></p>
-			<p>Instagram: <a href="https://www.instagram.com/lapikud/">@Lapikud</a></p>
-		</div>
-	</div>
-	<p class="py-8">&copy; 2025 MTÜ Lapikud</p>
+    <div class="grid grid-cols-2 max-w-[64rem] mx-auto">
+        <div class="text-left">
+            <h3 class="pb-4 text-2xl">MTÜ Lapikud</h3>
+            <p>Aadress: Akadeemia tee 5, 12616 Tallinn, Eesti</p>
+            <p>E-post: +372 58 160 799</p>
+            <p>Messenger: m.me/Lapikud</p>
+            <p>Reg. kood: 801 67 145</p>
+            <p>Swedbank: EE812200221019551756</p>
+        </div>
+        <div class="text-left">
+            <h3 class="pb-4 text-2xl">Meie sotsiaalid!</h3>
+            <p>
+                Facebook: <a href="https://www.facebook.com/Lapikud">Lapikud</a>
+            </p>
+            <p>
+                Instagram: <a href="https://www.instagram.com/lapikud/"
+                    >@Lapikud</a
+                >
+            </p>
+        </div>
+    </div>
+    <p class="py-8">&copy; 2025 MTÜ Lapikud</p>
 </footer>
diff --git a/src/routes/helpdesk/+page.svelte b/src/routes/helpdesk/+page.svelte
index 809f9e8..7628e0d 100644
--- a/src/routes/helpdesk/+page.svelte
+++ b/src/routes/helpdesk/+page.svelte
@@ -1,6 +1,17 @@
 <script>
     import helpdeskbg from "$lib/assets/458396300_921856893308127_7829656149477072375_n.jpg";
     import helpdesk from "$lib/assets/helpdesk-on-black.png";
+
+    import { MapLibre, Marker } from "svelte-maplibre";
+    import MapPin from "lucide-svelte/icons/map-pin";
+    import BusFront from "lucide-svelte/icons/bus-front";
+
+    // Coordinates for Akadeemia tee 5, 12616 Tallinn [longitude, latitude]
+    const center = [24.66887400515207, 59.396427975093935];
+    // Coordinates for Keemia bus stop [longitude, latitude]
+    const keemiaBusStop = [24.668325396145953, 59.397074517662276];
+    // Coordinates for Tehnikaülikool bus stop [longitude, latitude]
+    const tehnikaBusStop = [24.67328945396854, 59.39508874042947];
 </script>
 
 <div class="flex flex-col pb-8">
@@ -17,7 +28,7 @@
         />
     </div>
     <div class="max-w-[96rem] mx-auto flex flex-col py-16 px-8">
-        <div class="grid lg:grid-cols-2 gap-0 lg:gap-16">
+        <div class="grid lg:grid-cols-2 gap-16">
             <div class="flex flex-col">
                 <h2 class="text-4xl font-light pb-4">Mis on HELPDESK?</h2>
                 <p class="text-lg">
@@ -28,6 +39,234 @@
                     Tehnikaülikooli IT-tudengitest.
                 </p>
             </div>
+            <div class="flex flex-col">
+                <h2 class="text-4xl font-light pb-4">Mis teenuseid osutame?</h2>
+                <ul class="text-lg list-disc pl-5">
+                    <li>Arvuti riistvara diagnostika ja remont</li>
+                    <li>Arvuti riistvara hooldus</li>
+                    <li>Tarkvara diagnostika ja seadistamine</li>
+                    <li>Tarkvara paigaldamine</li>
+                    <li>Muu elektroonika parandamine</li>
+                </ul>
+            </div>
+            <div class="flex flex-col">
+                <h2 class="text-4xl font-light pb-4">Hinnakiri</h2>
+                <div
+                    class="overflow-hidden rounded-lg border border-gray-200 shadow-sm"
+                >
+                    <table class="w-full text-lg">
+                        <thead class="bg-gray-50">
+                            <tr>
+                                <th
+                                    class="px-6 py-4 text-left font-semibold text-gray-900 border-b border-gray-200"
+                                    >Teenus</th
+                                >
+                                <th
+                                    class="px-6 py-4 text-left font-semibold text-gray-900 border-b border-gray-200"
+                                    >Kogus/Aeg</th
+                                >
+                                <th
+                                    class="px-6 py-4 text-left font-semibold text-gray-900 border-b border-gray-200"
+                                    >Hind</th
+                                >
+                            </tr>
+                        </thead>
+                        <tbody class="bg-white divide-y divide-gray-200">
+                            <tr
+                                class="hover:bg-gray-50 transition-colors duration-200"
+                            >
+                                <td class="px-6 py-4 text-gray-900"
+                                    >Arvuti diagnostika</td
+                                >
+                                <td class="px-6 py-4 text-gray-600">15min</td>
+                                <td class="px-6 py-4 font-medium text-green-600"
+                                    >Tasuta</td
+                                >
+                            </tr>
+                            <tr
+                                class="hover:bg-gray-50 transition-colors duration-200"
+                            >
+                                <td class="px-6 py-4 text-gray-900"
+                                    >Arvuti diagnostika (alates +15min)</td
+                                >
+                                <td class="px-6 py-4 text-gray-600">tk</td>
+                                <td class="px-6 py-4 font-medium text-gray-900"
+                                    >20€</td
+                                >
+                            </tr>
+                            <tr
+                                class="hover:bg-gray-50 transition-colors duration-200"
+                            >
+                                <td class="px-6 py-4 text-gray-900"
+                                    >Detaili paigaldamine arvutisse</td
+                                >
+                                <td class="px-6 py-4 text-gray-600">tk</td>
+                                <td class="px-6 py-4 font-medium text-gray-900"
+                                    >10-15€</td
+                                >
+                            </tr>
+                            <tr
+                                class="hover:bg-gray-50 transition-colors duration-200"
+                            >
+                                <td class="px-6 py-4 text-gray-900"
+                                    >Sülearvuti tolmupuhastus + termopasta</td
+                                >
+                                <td class="px-6 py-4 text-gray-600">tk</td>
+                                <td class="px-6 py-4 font-medium text-gray-900"
+                                    >10-20€</td
+                                >
+                            </tr>
+                            <tr
+                                class="hover:bg-gray-50 transition-colors duration-200"
+                            >
+                                <td class="px-6 py-4 text-gray-900"
+                                    >Sülearvuti ekraani paigaldus</td
+                                >
+                                <td class="px-6 py-4 text-gray-600">tk</td>
+                                <td class="px-6 py-4 font-medium text-gray-900"
+                                    >15€</td
+                                >
+                            </tr>
+                            <tr
+                                class="hover:bg-gray-50 transition-colors duration-200"
+                            >
+                                <td class="px-6 py-4 text-gray-900"
+                                    >Arvuti komplekteerimine</td
+                                >
+                                <td class="px-6 py-4 text-gray-600">tk</td>
+                                <td class="px-6 py-4 font-medium text-gray-900"
+                                    >20€</td
+                                >
+                            </tr>
+                            <tr
+                                class="hover:bg-gray-50 transition-colors duration-200"
+                            >
+                                <td class="px-6 py-4 text-gray-900"
+                                    >Tarkvara hooldustöö ja paigaldamine</td
+                                >
+                                <td class="px-6 py-4 text-gray-600">tk</td>
+                                <td class="px-6 py-4 font-medium text-gray-900"
+                                    >10-15€</td
+                                >
+                            </tr>
+                            <tr
+                                class="hover:bg-gray-50 transition-colors duration-200"
+                            >
+                                <td class="px-6 py-4 text-gray-900"
+                                    >Muu elektroonika parandus</td
+                                >
+                                <td class="px-6 py-4 text-gray-600">tk</td>
+                                <td class="px-6 py-4 font-medium text-gray-900"
+                                    >10-50€</td
+                                >
+                            </tr>
+                            <tr
+                                class="hover:bg-gray-50 transition-colors duration-200"
+                            >
+                                <td class="px-6 py-4 text-gray-900"
+                                    >Andmete taastamine</td
+                                >
+                                <td class="px-6 py-4 text-gray-600">tk</td>
+                                <td class="px-6 py-4 font-medium text-gray-900"
+                                    >10-30€</td
+                                >
+                            </tr>
+                            <tr
+                                class="hover:bg-gray-50 transition-colors duration-200"
+                            >
+                                <td class="px-6 py-4 text-gray-900"
+                                    >Nutiseadmete tarkvarahooldus</td
+                                >
+                                <td class="px-6 py-4 text-gray-600">tk</td>
+                                <td class="px-6 py-4 font-medium text-gray-900"
+                                    >15€</td
+                                >
+                            </tr>
+                            <tr
+                                class="hover:bg-gray-50 transition-colors duration-200"
+                            >
+                                <td class="px-6 py-4 text-gray-900"
+                                    >Operatsioonisüsteemi taaspaigaldus</td
+                                >
+                                <td class="px-6 py-4 text-gray-600">tk</td>
+                                <td class="px-6 py-4 font-medium text-gray-900"
+                                    >15€</td
+                                >
+                            </tr>
+                            <tr
+                                class="hover:bg-gray-50 transition-colors duration-200"
+                            >
+                                <td class="px-6 py-4 text-gray-900"
+                                    >Nutitelefoni klaasi/ekraani/aku vahetus</td
+                                >
+                                <td class="px-6 py-4 text-gray-600">tk</td>
+                                <td class="px-6 py-4 font-medium text-gray-900"
+                                    >15-30€</td
+                                >
+                            </tr>
+                        </tbody>
+                    </table>
+                </div>
+                <p class="pt-4 text-lg font-bold">
+                    Jupid tellitakse kliendi enda poolt või kokkuleppel
+                    tehnikuga.
+                    <br /><br />
+                    Vajadusel tuleme üliõpilasküla ja Tehnopoli piires kohale.
+                    <br /><br />
+                    Oma tudengisõbralike hindade ja personaalse lähenemisega pakume
+                    teenust, milles ei pea pettuma!
+                </p>
+            </div>
+            <div class="flex flex-col">
+                <h2 class="text-4xl font-light pb-4">
+                    Lahtiolekuajad: <br /><strong>E</strong>smaspäevast –
+                    <strong>R</strong>eedeni 14-19*
+                </h2>
+                <p class="text-lg font-light opacity-70 pb-16">
+                    * Tegu on ajaperioodiga, mil meid on kõige tõenäolisem
+                    tabada. Siiski ei saa garanteerida kohalolekut.
+                </p>
+                <h2 class="text-4xl font-light pb-4">Asukoht</h2>
+                <div class="w-full h-96 rounded-lg overflow-hidden">
+                    <MapLibre
+                        style="https://basemaps.cartocdn.com/gl/positron-gl-style/style.json"
+                        class="relative aspect-video w-full h-full"
+                        standardControls
+                        {center}
+                        zoom={15}
+                    >
+                        <Marker lngLat={center}>
+                            <MapPin class="w-8 h-8 text-[#E69635]" />
+                        </Marker>
+                        <Marker
+                            class="flex flex-col items-center"
+                            lngLat={keemiaBusStop}
+                        >
+                            <p>Keemia</p>
+                            <BusFront class="w-8 h-8 text-[#E69635]" />
+                        </Marker>
+                        <Marker
+                            class="flex flex-col items-center"
+                            lngLat={tehnikaBusStop}
+                        >
+                            <p>Tehnikaülikool</p>
+                            <BusFront class="w-8 h-8 text-[#E69635]" />
+                        </Marker>
+                    </MapLibre>
+                </div>
+                <p class="pb-4 text-lg">
+                    Saab <span class="text-[#E69635]"
+                        >11, 37, 83, 91 bussiga Keemia peatusest</span
+                    >
+                    või
+                    <span class="text-[#E69635]"
+                        >Tehnikaülikool peatusest 10, 27, 33, 36, 45 bussiga.</span
+                    >
+                </p>
+                <p class="text-lg font-bold">
+                    Akadeemia tee 5 ühiselamu, ruum 008A
+                </p>
+            </div>
         </div>
     </div>
 </div>
diff --git a/src/routes/kontakt/+page.svelte b/src/routes/kontakt/+page.svelte
index 5731e08..55a6b96 100644
--- a/src/routes/kontakt/+page.svelte
+++ b/src/routes/kontakt/+page.svelte
@@ -38,7 +38,7 @@
             </p>
         </div>
         <div>
-            <h2 class="text-3xl pb-4">Mittetulundusühing Lapikud</h2>
+            <h2 class="text-3xl pb-4">MTÜ Lapikud</h2>
 
             <p class="text-xl font-medium pb-2">
                 Aadress: <span class="text-[#E69635] font-normal"
@@ -71,7 +71,7 @@
         </div>
     </div>
     <h2 class="text-3xl font-light pb-2 pt-8">Asukoht</h2>
-    <p class="pb-4 text-neutral-500 text-lg">
+    <p class="pb-4 text-lg">
         Saab <span class="text-[#E69635]"
             >11, 37, 83, 91 bussiga Keemia peatusest</span
         >
diff --git a/src/routes/koolitused/+page.svelte b/src/routes/koolitused/+page.svelte
index fb3788a..16b64e4 100644
--- a/src/routes/koolitused/+page.svelte
+++ b/src/routes/koolitused/+page.svelte
@@ -25,7 +25,7 @@
 </div>
 <div class="max-w-[96rem] mx-auto flex flex-col py-4 px-8">
     <div class="grid grid-cols-1 md:grid-cols-2 gap-16 py-16">
-        <div class="flex flex-col">
+        <div class="flex-col hidden">
             <h2 class="text-4xl font-light pb-4">Mis on plaanis?</h2>
             <ul class="space-y-4">
                 {#each uritused as uritus}
@@ -73,5 +73,27 @@
                 uusi kontakte ja saada osa meie aktiivsest ja toetavast kogukonnast.
             </p>
         </div>
+        <div class="flex flex-col">
+            <h2 class="text-4xl font-light pb-4">Mida pakkume?</h2>
+            <p class="text-lg">
+                Meie koolitused katavad IT-valdkonna olulisimaid tööriistu ja
+                oskusi. Tutvustame <strong class="text-[#f0941d]">Git</strong>
+                versioonihaldust, mis on arendaja ning haldaja igapäevase töö kasuks,
+                ning
+                <strong class="text-[#f0941d]">Python</strong>
+                ja <strong class="text-[#f0941d]">Java</strong>
+                programmeerimiskeeli, mis annavad tugeva aluse algkursustel ning
+                edasiseks karjääriks IT-sektoris.
+                <br /><br />
+                Lisaks tehnilisele poolele pöörame tähelepanu ka karjääri ehitamisele
+                - õpetame koostama muljetavaldavat
+                <strong class="text-[#f0941d]">CV-d</strong>
+                ja jagame praktilisi nõuandeid
+                <strong class="text-[#f0941d]">tööotsinguks</strong>. Meie
+                eesmärk on anda tudengitele kõik vajalikud tööriistad, et nad
+                saaksid edukalt siseneda IT-tööturule ja alustada oma karjääri.
+                <br /><br />
+            </p>
+        </div>
     </div>
 </div>
diff --git a/src/routes/remondikohvik/+page.svelte b/src/routes/remondikohvik/+page.svelte
index 1b07cd9..7bfc84a 100644
--- a/src/routes/remondikohvik/+page.svelte
+++ b/src/routes/remondikohvik/+page.svelte
@@ -37,7 +37,7 @@
         />
     </div>
     <div class="max-w-[96rem] mx-auto flex flex-col py-16 px-8">
-        <div class="grid lg:grid-cols-2 gap-0 lg:gap-16">
+        <div class="grid lg:grid-cols-2 gap-16">
             <div class="flex flex-col">
                 <h2 class="text-4xl font-light pb-4">Mis on remondikohvik?</h2>
                 <p class="text-lg">
@@ -69,7 +69,7 @@
             </div>
         </div>
         <div>
-            <h1 class="text-4xl font-light pb-4">Koostööpartnerid</h1>
+            <h1 class="text-4xl font-light pb-4 pt-16">Koostööpartnerid</h1>
             <div class="flex flex-row gap-x-4">
                 <div class="flex justify-center items-center">
                     <a href="https://www.tthk.ee/">