diff --git a/src/lib/components/GroupsSection.svelte b/src/lib/components/GroupsSection.svelte
index d0b83463..24e98b6d 100644
--- a/src/lib/components/GroupsSection.svelte
+++ b/src/lib/components/GroupsSection.svelte
@@ -1,6 +1,6 @@
 <script>
     import { GroupsData } from "$lib/models/GroupsData.js";
-    import { searchGroups, filterByGroupType } from "$lib/services/groupsManager.js";
+    import { searchGroups, filterByGroupType, filterByMultiplePlatforms } from "$lib/services/groupsManager.js";
     import { currentLanguage } from '$lib/stores/languageStore';
 
     $: language = $currentLanguage;
@@ -10,8 +10,11 @@
     import { t } from "$lib/locales/translations.js";
 
     let groupType = "All"
-    let groupTypes = ["All", "WhatsApp", "Telegram", "Multiplatform", "Other"]
+    let groupTypes = ["WhatsApp", "Telegram", "Other"]
 
+    // Change to support multiple selections
+    let selectedPlatforms = new Set(["WhatsApp", "Telegram", "Other"]) // Default to all remaining platforms
+    
     let groups = GroupsData
 
     let searchTerm = ""
@@ -20,9 +23,27 @@
         groups = searchGroups(searchTerm, language)
     }
 
-    function handleGroupTypeChange() {
-        groups = filterByGroupType(groupType.toLowerCase())
-        console.log(groupType)
+    // New function to handle multiple platform selection
+    function handlePlatformToggle(platform) {
+        // Toggle the platform
+        if (selectedPlatforms.has(platform)) {
+            selectedPlatforms.delete(platform)
+        } else {
+            selectedPlatforms.add(platform)
+        }
+        
+        // If no platforms selected, show all groups (select all platforms)
+        if (selectedPlatforms.size === 0) {
+            selectedPlatforms = new Set(["WhatsApp", "Telegram", "Other"])
+        }
+        
+        // Update the groups display
+        groups = filterByMultiplePlatforms(Array.from(selectedPlatforms))
+    }
+
+    // Update groups when selectedPlatforms changes
+    $: {
+        groups = filterByMultiplePlatforms(Array.from(selectedPlatforms))
     }
 </script>
 
@@ -38,21 +59,20 @@
     </div>
 
     <div class="settingsBar">
-        <div class="groupTypeFilter">
-            <label 
-                title="Filter groups by type" 
-                for="type">Type</label>
-            <select 
-                bind:value={groupType} 
-                on:change={handleGroupTypeChange} 
-                title="Filter groups by type" 
-                id="type" 
-                name="type">
-
-                {#each groupTypes as type}
-                    <option value={type}>{type}</option>
+        <div class="platformFilter">
+            <label class="filter-label">Platform:</label>
+            <div class="checkbox-group">
+                {#each groupTypes as platform}
+                    <label class="checkbox-item">
+                        <input 
+                            type="checkbox" 
+                            checked={selectedPlatforms.has(platform)}
+                            on:change={() => handlePlatformToggle(platform)}
+                        />
+                        <span class="checkbox-text">{platform}</span>
+                    </label>
                 {/each}
-            </select>
+            </div>
         </div>
         
         <div class="searchbar">
@@ -80,6 +100,14 @@
             <GroupCard GroupDataObject={groupDataObject} />
         {/each}
     </div>
+
+    <!-- GitHub Link Footer -->
+    <div class="github-footer">
+        <a href="https://github.com/ian-codes/connectbern" target="_blank" rel="noopener" class="github-link">
+            <span class="github-icon"></span>
+            View on GitHub
+        </a>
+    </div>
 </section>
 
 
@@ -95,18 +123,81 @@
         .settingsBar {
             margin: 0 !important;
             padding: 0 !important;
+            flex-direction: column;
+            align-items: stretch;
+        }
+
+        .platformFilter {
+            padding: 0.75rem;
+            font-size: 0.8rem;
+        }
+
+        .checkbox-group {
+            justify-content: flex-start;
+            gap: 0.5rem;
+        }
+
+        .checkbox-item {
+            padding: 0.2rem 0.4rem;
+        }
+
+        .checkbox-text {
+            font-size: 0.8rem;
         }
     }
 
-    .groupTypeFilter {
+    .platformFilter {
         color: white;
-        font-size: 1em;
-        border: none;
+        font-size: 0.9rem;
+        display: flex;
+        flex-direction: column;
+        gap: 0.5rem;
+        padding: 1rem;
+        background: rgba(255, 255, 255, 0.1);
+        border-radius: 8px;
         box-shadow: 0 2px 2px rgba(50, 50, 50, 0.425);
+    }
+
+    .filter-label {
+        font-weight: bold;
+        margin-bottom: 0.5rem;
+    }
+
+    .checkbox-group {
+        display: flex;
+        flex-wrap: wrap;
+        gap: 0.75rem;
+    }
+
+    .checkbox-item {
         display: flex;
         align-items: center;
-        gap: 1em;
-        padding-left: .5em;
+        gap: 0.5rem;
+        cursor: pointer;
+        padding: 0.25rem 0.5rem;
+        border-radius: 4px;
+        transition: background-color 0.2s ease;
+    }
+
+    .checkbox-item:hover {
+        background: rgba(255, 255, 255, 0.1);
+    }
+
+    .checkbox-item input[type="checkbox"] {
+        width: 16px;
+        height: 16px;
+        accent-color: #0066cc;
+        cursor: pointer;
+    }
+
+    .checkbox-text {
+        font-size: 0.9rem;
+        user-select: none;
+    }
+
+    /* Old styles to remove/replace */
+    .groupTypeFilter {
+        display: none; /* Hide old filter */
     }
 
     select {
@@ -182,4 +273,39 @@
         justify-content: center;
         align-items: center;
     }
+
+    .github-footer {
+        margin-top: 3rem;
+        text-align: center;
+        padding: 2rem 1rem;
+        border-top: 1px solid rgba(255, 255, 255, 0.2);
+    }
+
+    .github-link {
+        display: inline-flex;
+        align-items: center;
+        gap: 0.5rem;
+        color: rgba(255, 255, 255, 0.8);
+        text-decoration: none;
+        font-size: 0.9rem;
+        padding: 0.5rem 1rem;
+        border-radius: 6px;
+        background: rgba(255, 255, 255, 0.05);
+        transition: all 0.2s ease;
+    }
+
+    .github-link:hover {
+        color: white;
+        background: rgba(255, 255, 255, 0.1);
+        transform: translateY(-2px);
+    }
+
+    .github-icon {
+        width: 18px;
+        height: 18px;
+        background-image: url("data:image/svg+xml,%3Csvg viewBox='0 0 24 24' fill='white' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M12 0c-6.626 0-12 5.373-12 12 0 5.302 3.438 9.8 8.207 11.387.599.111.793-.261.793-.577v-2.234c-3.338.726-4.033-1.416-4.033-1.416-.546-1.387-1.333-1.756-1.333-1.756-1.089-.745.083-.729.083-.729 1.205.084 1.839 1.237 1.839 1.237 1.07 1.834 2.807 1.304 3.492.997.107-.775.418-1.305.762-1.604-2.665-.305-5.467-1.334-5.467-5.931 0-1.311.469-2.381 1.236-3.221-.124-.303-.535-1.524.117-3.176 0 0 1.008-.322 3.301 1.23.957-.266 1.983-.399 3.003-.404 1.02.005 2.047.138 3.006.404 2.291-1.552 3.297-1.23 3.297-1.23.653 1.653.242 2.874.118 3.176.77.84 1.235 1.911 1.235 3.221 0 4.609-2.807 5.624-5.479 5.921.43.372.823 1.102.823 2.222v3.293c0 .319.192.694.801.576 4.765-1.589 8.199-6.086 8.199-11.386 0-6.627-5.373-12-12-12z'/%3E%3C/svg%3E");
+        background-size: contain;
+        background-repeat: no-repeat;
+        background-position: center;
+    }
 </style>
\ No newline at end of file
diff --git a/src/lib/models/GroupsData.js b/src/lib/models/GroupsData.js
index 98900be0..3a90bae8 100644
--- a/src/lib/models/GroupsData.js
+++ b/src/lib/models/GroupsData.js
@@ -166,5 +166,473 @@ export const GroupsData = [
         img: "fire-community.webp",
         type: "other",
         link: "https://forum.mustachianpost.com/t/meetup-in-bern-for-coffee-beer-and-chat-about-fi-re-plans/8673/"
+    },
+    // Unko-Märkte (Non-commercial Marketplaces)
+    {
+        name: {
+            de: "Bern - Hauptgruppe (Unko-Markt)",
+            en: "Bern - Main Group (Non-commercial Market)"
+        },
+        slug: "unko-bern-main",
+        desc: {
+            de: "Hauptgruppe für den unkommerziellen Marktplatz in Bern.",
+            en: "Main group for the non-commercial marketplace in Bern."
+        },
+        img: "marktplatz.webp",
+        type: "telegram",
+        link: "https://t.me/+j6oiWwlyYiw5MjM0"
+    },
+    {
+        name: {
+            de: "Bümpliz und Bethlehem (Unko-Markt)",
+            en: "Bümpliz and Bethlehem (Non-commercial Market)"
+        },
+        slug: "unko-buempliz-bethlehem",
+        desc: {
+            de: "Unkommerzieller Marktplatz für Bümpliz und Bethlehem.",
+            en: "Non-commercial marketplace for Bümpliz and Bethlehem districts."
+        },
+        img: "telegramgruppen.webp",
+        type: "telegram",
+        link: "https://tiny.cc/unkomarktbernbuempliz"
+    },
+    {
+        name: {
+            de: "Fischermätteli, Mattenhof, Sulgenau & Weissenbühl (Unko-Markt)",
+            en: "Fischermätteli, Mattenhof, Sulgenau & Weissenbühl (Non-commercial Market)"
+        },
+        slug: "unko-fischermatteli-area",
+        desc: {
+            de: "Unkommerzieller Marktplatz für die Quartiere Fischermätteli, Mattenhof, Sulgenau und Weissenbühl.",
+            en: "Non-commercial marketplace for Fischermätteli, Mattenhof, Sulgenau and Weissenbühl districts."
+        },
+        img: "telegramgruppen.webp",
+        type: "telegram",
+        link: "https://t.me/joinchat/V1agD1T8E7ZiOWY0"
+    },
+    {
+        name: {
+            de: "Zollikofen (Unko-Markt)",
+            en: "Zollikofen (Non-commercial Market)"
+        },
+        slug: "unko-zollikofen",
+        desc: {
+            de: "Unkommerzieller Marktplatz für Zollikofen.",
+            en: "Non-commercial marketplace for Zollikofen."
+        },
+        img: "telegramgruppen.webp",
+        type: "telegram",
+        link: "https://tiny.cc/zusammenzollikofentg"
+    },
+    {
+        name: {
+            de: "Konolfingen (Unko-Markt)",
+            en: "Konolfingen (Non-commercial Market)"
+        },
+        slug: "unko-konolfingen",
+        desc: {
+            de: "Unkommerzieller Marktplatz für Konolfingen.",
+            en: "Non-commercial marketplace for Konolfingen."
+        },
+        img: "telegramgruppen.webp",
+        type: "telegram",
+        link: "https://t.me/+0d0e2-SaejQxZTc0"
+    },
+    {
+        name: {
+            de: "Worb (Unko-Markt)",
+            en: "Worb (Non-commercial Market)"
+        },
+        slug: "unko-worb",
+        desc: {
+            de: "Unkommerzieller Marktplatz für Worb.",
+            en: "Non-commercial marketplace for Worb."
+        },
+        img: "marktplatz.webp",
+        type: "telegram",
+        link: "https://t.me/+qRhXsX8PJws1MDk0"
+    },
+    {
+        name: {
+            de: "Gürbetal (Unko-Markt)",
+            en: "Gürbetal (Non-commercial Market)"
+        },
+        slug: "unko-guerbetal",
+        desc: {
+            de: "Unkommerzieller Marktplatz für das Gürbetal.",
+            en: "Non-commercial marketplace for Gürbetal valley."
+        },
+        img: "marktplatz.webp",
+        type: "telegram",
+        link: "https://t.me/+OYMZhEs90tQ1NjU0"
+    },
+    {
+        name: {
+            de: "Region Gantrisch (Unko-Markt)",
+            en: "Gantrisch Region (Non-commercial Market)"
+        },
+        slug: "unko-gantrisch",
+        desc: {
+            de: "Unkommerzieller Marktplatz für die Region Gantrisch.",
+            en: "Non-commercial marketplace for Gantrisch region."
+        },
+        img: "marktplatz.webp",
+        type: "telegram",
+        link: "https://t.me/+JXMdN-Go9UY2NDM0"
+    },
+    {
+        name: {
+            de: "Wittigkofen-Quartier (Unko-Markt)",
+            en: "Wittigkofen District (Non-commercial Market)"
+        },
+        slug: "unko-wittigkofen",
+        desc: {
+            de: "Unkommerzieller Marktplatz für das Wittigkofen-Quartier.",
+            en: "Non-commercial marketplace for Wittigkofen district."
+        },
+        img: "marktplatz.webp",
+        type: "telegram",
+        link: "http://tiny.cc/wittiunko"
+    },
+    // Specialized Trading Groups
+    {
+        name: {
+            de: "Kindersachen Bern",
+            en: "Children's Items Bern"
+        },
+        slug: "kindersachen-bern",
+        desc: {
+            de: "Gruppe zum Tauschen und Verschenken von Kindersachen.",
+            en: "Group for trading and gifting children's items."
+        },
+        img: "telegramgruppen.webp",
+        type: "telegram",
+        link: "https://t.me/BEKindersachen"
+    },
+    {
+        name: {
+            de: "Foodsharing Bern",
+            en: "Foodsharing Bern"
+        },
+        slug: "foodsharing-bern",
+        desc: {
+            de: "Gruppe für das Teilen von Lebensmitteln gegen Verschwendung.",
+            en: "Group for sharing food to prevent waste."
+        },
+        img: "telegramgruppen.webp",
+        type: "telegram",
+        link: "https://t.me/foodsharingbe"
+    },
+    {
+        name: {
+            de: "Kleidertausch Bern",
+            en: "Clothing Exchange Bern"
+        },
+        slug: "kleidertausch-bern",
+        desc: {
+            de: "Gruppe zum Tauschen von Kleidung.",
+            en: "Group for exchanging clothes."
+        },
+        img: "telegramgruppen.webp",
+        type: "telegram",
+        link: "https://t.me/kleidertauschbern"
+    },
+    {
+        name: {
+            de: "Pflanzentausch Bern",
+            en: "Plant Exchange Bern"
+        },
+        slug: "pflanzentausch-bern",
+        desc: {
+            de: "Gruppe zum Tauschen von Pflanzen und Samen.",
+            en: "Group for exchanging plants and seeds."
+        },
+        img: "telegramgruppen.webp",
+        type: "telegram",
+        link: "https://t.me/pflanzentauschen1"
+    },
+    {
+        name: {
+            de: "Musik-Instrumente Tausch Bern",
+            en: "Music Instruments Exchange Bern"
+        },
+        slug: "musik-instrumente-bern",
+        desc: {
+            de: "Gruppe zum Tauschen und Verkaufen von Musikinstrumenten.",
+            en: "Group for exchanging and selling musical instruments."
+        },
+        img: "telegramgruppen.webp",
+        type: "telegram",
+        link: "https://t.me/MusikInstrumente_Tausch_Bern"
+    },
+    {
+        name: {
+            de: "Musiker*innen/Bands Bern",
+            en: "Musicians/Bands Bern"
+        },
+        slug: "musikernetz-bern",
+        desc: {
+            de: "Netzwerk für Musiker*innen und Bands in Bern.",
+            en: "Network for musicians and bands in Bern."
+        },
+        img: "telegramgruppen.webp",
+        type: "telegram",
+        link: "https://t.me/musikernetzbern"
+    },
+    // Events Groups
+    {
+        name: {
+            de: "Bern Unko Agenda (Events)",
+            en: "Bern Unko Agenda (Events)"
+        },
+        slug: "bern-unko-agenda",
+        desc: {
+            de: "Hauptgruppe für Events und Veranstaltungen in Bern.",
+            en: "Main group for events and activities in Bern."
+        },
+        img: "events-and-friends.webp",
+        type: "telegram",
+        link: "https://t.me/bernunkoagenda"
+    },
+    {
+        name: {
+            de: "Event Veranstalter*innen Chat",
+            en: "Event Organizers Chat"
+        },
+        slug: "event-organizers-chat",
+        desc: {
+            de: "Chat-Gruppe für Event-Veranstalter*innen.",
+            en: "Chat group for event organizers."
+        },
+        img: "telegramgruppen.webp",
+        type: "telegram",
+        link: "https://t.me/+UOrn5kOXNfeKYWHX"
+    },
+    {
+        name: {
+            de: "Events in und um Bern",
+            en: "Events in and around Bern"
+        },
+        slug: "events-around-bern",
+        desc: {
+            de: "Gruppe für Events in und um Bern.",
+            en: "Group for events in and around Bern."
+        },
+        img: "events-and-friends.webp",
+        type: "telegram",
+        link: "https://t.me/eventsbern"
+    },
+    // Social and Community Groups
+    {
+        name: {
+            de: "Unko-Care",
+            en: "Unko-Care"
+        },
+        slug: "unko-care",
+        desc: {
+            de: "Gruppe für gegenseitige Unterstützung und Fürsorge.",
+            en: "Group for mutual support and care."
+        },
+        img: "connect-bern.webp",
+        type: "telegram",
+        link: "https://t.me/+Hr1XrvM2JZplZmZk"
+    },
+    {
+        name: {
+            de: "Sippe von Bern",
+            en: "Tribe of Bern"
+        },
+        slug: "sippe-von-bern",
+        desc: {
+            de: "Gemeinschaftsgruppe für Menschen in Bern.",
+            en: "Community group for people in Bern."
+        },
+        img: "deutschkurs.webp",
+        type: "telegram",
+        link: "https://t.me/menschbern"
+    },
+    {
+        name: {
+            de: "Allerlei Menschliches",
+            en: "All Things Human"
+        },
+        slug: "allerlei-menschliches",
+        desc: {
+            de: "Gruppe für allgemeine menschliche Themen und Austausch.",
+            en: "Group for general human topics and exchange."
+        },
+        img: "fire-community.webp",
+        type: "telegram",
+        link: "https://t.me/+kAkkzvPqKidlYWU0"
+    },
+    {
+        name: {
+            de: "Connect Bern (Telegram)",
+            en: "Connect Bern (Telegram)"
+        },
+        slug: "connect-bern-telegram",
+        desc: {
+            de: "Die Telegram-Version der Connect Bern Hauptgruppe.",
+            en: "The Telegram version of the main Connect Bern group."
+        },
+        img: "connect-bern.webp",
+        type: "telegram",
+        link: "https://t.me/connectbern"
+    },
+    {
+        name: {
+            de: "Kritische Männlichkeiten",
+            en: "Critical Masculinities"
+        },
+        slug: "kritische-maennlichkeiten",
+        desc: {
+            de: "Gruppe für Diskussionen über kritische Männlichkeiten.",
+            en: "Group for discussions about critical masculinities."
+        },
+        img: "israelis-jews-friends.webp",
+        type: "telegram",
+        link: "https://t.me/+2lFNnfMSru4wMWY0"
+    },
+    {
+        name: {
+            de: "Vegan Bern & Agglo (Telegram)",
+            en: "Vegan Bern & Surroundings (Telegram)"
+        },
+        slug: "vegan-bern-telegram",
+        desc: {
+            de: "Die Telegram-Version der veganen Gruppe für Bern und Umgebung.",
+            en: "The Telegram version of the vegan group for Bern and surroundings."
+        },
+        img: "vegan.webp",
+        type: "telegram",
+        link: "https://t.me/bernvegan"
+    },
+    // Support and Services
+    {
+        name: {
+            de: "Tipps für Therapie, Beratung, Yoga",
+            en: "Tips for Therapy, Counseling, Yoga"
+        },
+        slug: "therapy-counseling-yoga",
+        desc: {
+            de: "Gruppe für Empfehlungen zu Therapie, Beratung und Yoga.",
+            en: "Group for recommendations on therapy, counseling and yoga."
+        },
+        img: "berndeutsch.webp",
+        type: "telegram",
+        link: "https://t.me/joinchat/fQAk9XDEkiM4NTJk"
+    },
+    {
+        name: {
+            de: "Wohnen - WG Suche",
+            en: "Housing - Shared Apartment Search"
+        },
+        slug: "housing-wg-search",
+        desc: {
+            de: "Gruppe für die Suche nach Wohngemeinschaften und Wohnungen.",
+            en: "Group for searching shared apartments and housing."
+        },
+        img: "deutschkurs.webp",
+        type: "telegram",
+        link: "https://t.me/joinchat/LIezUBJgr4IRDyv8jYTWkg"
+    },
+    {
+        name: {
+            de: "Mitfahrgelegenheit Bern",
+            en: "Ridesharing Bern"
+        },
+        slug: "mitfahrgelegenheit-bern",
+        desc: {
+            de: "Gruppe für Mitfahrgelegenheiten in und um Bern.",
+            en: "Group for ridesharing in and around Bern."
+        },
+        img: "whats-up-bern.webp",
+        type: "telegram",
+        link: "https://tiny.cc/mitfahrenbern"
+    },
+    {
+        name: {
+            de: "Vorwärts links",
+            en: "Forward Left"
+        },
+        slug: "vorwaerts-links",
+        desc: {
+            de: "Politische Gruppe mit linker Ausrichtung.",
+            en: "Political group with left-wing orientation."
+        },
+        img: "fire-community.webp",
+        type: "telegram",
+        link: "https://t.me/joinchat/E2kynkdsZXd1x7lXB6wdJw"
+    },
+    {
+        name: {
+            de: "Kombucha SCOBYs gratis",
+            en: "Kombucha SCOBYs for Free"
+        },
+        slug: "kombucha-scobys",
+        desc: {
+            de: "Gruppe zum kostenlosen Teilen von Kombucha SCOBYs.",
+            en: "Group for sharing Kombucha SCOBYs for free."
+        },
+        img: "vegan.webp",
+        type: "telegram",
+        link: "https://t.me/scobysch"
+    },
+    // Other Cities
+    {
+        name: {
+            de: "Bienne/Biel Unko-Markt",
+            en: "Bienne/Biel Non-commercial Market"
+        },
+        slug: "biel-bienne-unko",
+        desc: {
+            de: "Unkommerzieller Marktplatz für Biel/Bienne.",
+            en: "Non-commercial marketplace for Biel/Bienne."
+        },
+        img: "telegramgruppen.webp",
+        type: "telegram",
+        link: "https://t.me/uncommercial_bielbienne"
+    },
+    {
+        name: {
+            de: "Wohnen Biel/Bienne",
+            en: "Housing Biel/Bienne"
+        },
+        slug: "housing-biel-bienne",
+        desc: {
+            de: "Gruppe für Wohnungssuche in Biel/Bienne.",
+            en: "Group for housing search in Biel/Bienne."
+        },
+        img: "telegramgruppen.webp",
+        type: "telegram",
+        link: "https://t.me/joinchat/n-50O24IUIxmMWY0"
+    },
+    {
+        name: {
+            de: "Mobienne",
+            en: "Mobienne"
+        },
+        slug: "mobienne",
+        desc: {
+            de: "Community-Gruppe für Biel/Bienne.",
+            en: "Community group for Biel/Bienne."
+        },
+        img: "telegramgruppen.webp",
+        type: "telegram",
+        link: "https://t.me/mobienne"
+    },
+    {
+        name: {
+            de: "Thun Unko-Markt",
+            en: "Thun Non-commercial Market"
+        },
+        slug: "thun-unko",
+        desc: {
+            de: "Unkommerzieller Marktplatz für Thun.",
+            en: "Non-commercial marketplace for Thun."
+        },
+        img: "marktplatz.webp",
+        type: "telegram",
+        link: "https://t.me/joinchat/CaUxwxSJYNG2JxN3wpTJgg"
     }
 ]
\ No newline at end of file
diff --git a/src/lib/services/groupsManager.js b/src/lib/services/groupsManager.js
index a8f92dd4..91f6a587 100644
--- a/src/lib/services/groupsManager.js
+++ b/src/lib/services/groupsManager.js
@@ -54,4 +54,46 @@ export function filterByGroupType(type) {
         }
         default: return GroupsData
     }
+}
+
+export function filterByMultiplePlatforms(selectedPlatforms) {
+    // If no platforms selected, return all groups
+    if (selectedPlatforms.length === 0) {
+        return GroupsData;
+    }
+    
+    let results = [];
+    
+    for (let group of GroupsData) {
+        let shouldInclude = false;
+        
+        for (let platform of selectedPlatforms) {
+            switch (platform.toLowerCase()) {
+                case "whatsapp":
+                    if (group.type === "whatsapp") {
+                        shouldInclude = true;
+                    }
+                    break;
+                case "telegram":
+                    if (group.type === "telegram") {
+                        shouldInclude = true;
+                    }
+                    break;
+                case "other":
+                    if (group.type === "other" || group.type === "multiplatform") {
+                        shouldInclude = true;
+                    }
+                    break;
+            }
+            
+            // If we found a match, no need to check other platforms for this group
+            if (shouldInclude) break;
+        }
+        
+        if (shouldInclude) {
+            results.push(group);
+        }
+    }
+    
+    return results;
 }
\ No newline at end of file
diff --git a/src/routes/events/+page.svelte b/src/routes/events/+page.svelte
index 1f5bcda8..43af8168 100644
--- a/src/routes/events/+page.svelte
+++ b/src/routes/events/+page.svelte
@@ -1,14 +1,31 @@
 <svelte:head>
-	<title>Events • Connect Bern </title>
+    <title>Events • Connect Bern</title>
 </svelte:head>
 
-
 <script>
     import { t } from "$lib/locales/translations.js";
     import { currentLanguage } from '$lib/stores/languageStore';
-    import Calendar from "$lib/components/calendar/Calendar.svelte";
 
     $: lang = $currentLanguage;
+
+    // Event submission template
+    const eventTemplate = encodeURIComponent(`🎉 NEW EVENT SUBMISSION
+
+📅 Date: 
+⏰ Time:
+📍 Location: 
+🎯 Event Name: 
+
+📝 Description: 
+
+💰 Cost: 
+🗣️ Language: 
+👥 Target audience:
+
+📞 Contact: 
+🔗 Link:`);
+
+    const whatsappEventUrl = `https://wa.me/41783166727?text=${eventTemplate}`;
 </script>
 
 <section>
@@ -19,128 +36,329 @@
         </p>
     </div>
 
-    <ul>
-        <li>
-            Check for events on Facebook on the 'local' tab:
-            <a href="https://www.facebook.com/events/?date_filter_option=TODAY&discover_tab=LOCAL">
-                Link
-            </a>
-        </li>
-        <li>
-            On <a href="https://meetup.com">Meetup.com</a> and 
-            <a href="https://gemeinsamerleben.com/orte-und-regionen/schweiz/bern">
-                Gemeinsam Erleben
-            </a>
-        </li>
-
-        <li>
-            On <a href="https://www.pusterum.ch/kultur">Pusterum's website</a>.
-        </li>
-
-        <li>
-            On the <a href="https://www.reitschule.ch/reitschule/?programm">Reitschule</a>  
-            and <a href="https://www.dieheiterefahne.ch/menu">Heitere Fahne</a> websites.
-        </li>
-        <li>
-            <a href="https://bern.impacthub.net/events-erleben">Impact Hub Bern</a> 
-        </li>
-        <li>
-            Check the <a href="https://www.reddit.com/r/bern/"> Bern Subreddit</a> to meet people
-        </li>
-
-        <li>
-            Monday:
+    <div class="events-content">
+        <div class="event-sources">
+            <h2>Where to Find Events</h2>
             <ul>
                 <li>
-                    Denk:Mal - Swiss German course, join the <a href="https://tiny.cc/germanbern">WhatsApp Group</a>
-                </li>
-            </ul>
-        </li>
-        
-        <li>
-            Tuesday:
-            <ul>
-                <li>
-                    <b>Every 3rd Tuesday:</b>
-                    <br />
-                    Join fellow hackers and infosec professionals every 3rd Tuesday of 
-                    the month for a relaxed meetup with drinks in various Swiss cities. 
-                    It's free, except for special events.
-                    <a href="https://beerontuesday.ch">
-                        beerontuesday.ch
+                    <strong>Facebook Local Events:</strong>
+                    <a href="https://www.facebook.com/events/?date_filter_option=TODAY&discover_tab=LOCAL" target="_blank" rel="noopener">
+                        Browse local events
                     </a>
-                <li>
-                    International Meetup Blabla language exchange
                 </li>
                 <li>
-                    CCC weekly meeting
+                    <strong>Meetup Platforms:</strong>
+                    <a href="https://meetup.com" target="_blank" rel="noopener">Meetup.com</a> and 
+                    <a href="https://gemeinsamerleben.com/orte-und-regionen/schweiz/bern" target="_blank" rel="noopener">
+                        Gemeinsam Erleben
+                    </a>
                 </li>
-            </ul>
-        </li>
-
-            
-
-        <li>
-            Wednesday:
-            <ul>
                 <li>
-                    Once a month posterum for games night - second Wednesday of the month usually.
+                    <strong>Cultural Venues:</strong>
+                    <a href="https://www.pusterum.ch/kultur" target="_blank" rel="noopener">Pusterum</a>,
+                    <a href="https://www.reitschule.ch/reitschule/?programm" target="_blank" rel="noopener">Reitschule</a>, and
+                    <a href="https://www.dieheiterefahne.ch/menu" target="_blank" rel="noopener">Heitere Fahne</a>
                 </li>
                 <li>
-                    After work - JYoB, every first Wednesday of the month
+                    <strong>Community Spaces:</strong>
+                    <a href="https://bern.impacthub.net/events-erleben" target="_blank" rel="noopener">Impact Hub Bern</a>
                 </li>
                 <li>
-                    Social get together of effective altruism group.
+                    <strong>Reddit Community:</strong>
+                    <a href="https://www.reddit.com/r/bern/" target="_blank" rel="noopener">r/bern subreddit</a>
                 </li>
             </ul>
-        </li>
-            
+        </div>
 
-        <li>
-            Thursday:
-            <ul>
-                <li>
-                    English club (Englishclub.ch)
-                </li>
-                <li>
-                    Once a month Polyamorous meetup on the first Thursday of the month usually.
-                </li>
-                <li>
-                    Chess club
-                </li>
-                <li>
-                    German language exchange meetup (usually gut gelaunt or grosse Schanze check MeetUp)
-                </li>
-                <li>
-                    Erupt games night
-                </li>
-            </ul>
-        </li>
+        <div class="weekly-events">
+            <h2>Weekly Recurring Events</h2>
             
-        <li>
-            Friday:
-            <ul>
-                <li>
-                    English speaking club (Englishclub.ch)
-                </li>
-            </ul>
-        </li>
+            <div class="day-section">
+                <h3>Monday</h3>
+                <ul>
+                    <li>
+                        <strong>Denk:Mal - Swiss German Course</strong><br>
+                        Join the <a href="https://tiny.cc/germanbern" target="_blank" rel="noopener">WhatsApp Group</a>
+                    </li>
+                </ul>
+            </div>
 
-        <li>
-            Saturday:
-            <ul>
-                <li>
-                    Karaoke night at DELFINO
-                </li>
-                <li>
-                    Once a month from 17.00 to 23.00 https://patt.be
-                </li>
-            </ul>
-        </li>
-    </ul>
+            <div class="day-section">
+                <h3>Tuesday</h3>
+                <ul>
+                    <li>
+                        <strong>Beer on Tuesday</strong> (Every 3rd Tuesday)<br>
+                        Hackers and infosec professionals meetup with drinks. Free entry except for special events.<br>
+                        <a href="https://beerontuesday.ch" target="_blank" rel="noopener">beerontuesday.ch</a>
+                    </li>
+                    <li>
+                        <strong>International Meetup</strong> - Blabla language exchange
+                    </li>
+                    <li>
+                        <strong>CCC Weekly Meeting</strong>
+                    </li>
+                </ul>
+            </div>
+
+            <div class="day-section">
+                <h3>Wednesday</h3>
+                <ul>
+                    <li>
+                        <strong>Games Night at Posterum</strong> (2nd Wednesday of the month)
+                    </li>
+                    <li>
+                        <strong>After Work - JYoB</strong> (1st Wednesday of the month)
+                    </li>
+                    <li>
+                        <strong>Effective Altruism</strong> - Social gathering
+                    </li>
+                </ul>
+            </div>
+
+            <div class="day-section">
+                <h3>Thursday</h3>
+                <ul>
+                    <li>
+                        <strong>English Club</strong> - <a href="https://englishclub.ch" target="_blank" rel="noopener">englishclub.ch</a>
+                    </li>
+                    <li>
+                        <strong>Polyamorous Meetup</strong> (1st Thursday of the month)
+                    </li>
+                    <li>
+                        <strong>Chess Club</strong>
+                    </li>
+                    <li>
+                        <strong>German Language Exchange</strong> - Usually at Gut Gelaunt or Grosse Schanze (check Meetup)
+                    </li>
+                    <li>
+                        <strong>Erupt Games Night</strong>
+                    </li>
+                </ul>
+            </div>
+
+            <div class="day-section">
+                <h3>Friday</h3>
+                <ul>
+                    <li>
+                        <strong>English Speaking Club</strong> - <a href="https://englishclub.ch" target="_blank" rel="noopener">englishclub.ch</a>
+                    </li>
+                </ul>
+            </div>
+
+            <div class="day-section">
+                <h3>Saturday</h3>
+                <ul>
+                    <li>
+                        <strong>Karaoke Night at DELFINO</strong>
+                    </li>
+                    <li>
+                        <strong>Monthly Event</strong> - 17:00 to 23:00<br>
+                        <a href="https://patt.be" target="_blank" rel="noopener">patt.be</a>
+                    </li>
+                </ul>
+            </div>
+        </div>
+
+        <div class="google-calendar">
+            <h2>Event Calendar</h2>
+            <iframe 
+                src="https://calendar.google.com/calendar/embed?height=600&wkst=2&ctz=Europe%2FZurich&showPrint=0&showTitle=0&mode=AGENDA&showTz=0&showCalendars=0&showTabs=0&showDate=0&showNav=0&src=c3RheWluZ2luYmVybkBnbWFpbC5jb20&color=%23039be5" 
+                style="border: solid 1px #777; border-radius: 8px; width: 100%; max-width: 100%;" 
+                width="100%" 
+                height="600" 
+                frameborder="0" 
+                scrolling="no"
+                title="Events Calendar">
+            </iframe>
+        </div>
+
+        <!-- Event Submission Section -->
+        <div class="event-submission">
+            <h2>Submit Your Event</h2>
+            <div class="submission-content">
+                <p>Have an event to share with the Bern community? Submit it directly via WhatsApp!</p>
+                <a href={whatsappEventUrl} class="whatsapp-btn" target="_blank" rel="noopener">
+                    <svg class="btn-icon" viewBox="0 0 24 24">
+                        <path d="M17.472 14.382c-.297-.149-1.758-.867-2.03-.967-.273-.099-.471-.148-.67.15-.197.297-.767.966-.94 1.164-.173.199-.347.223-.644.075-.297-.15-1.255-.463-2.39-1.475-.883-.788-1.48-1.761-1.653-2.059-.173-.297-.018-.458.13-.606.134-.133.298-.347.446-.52.149-.174.198-.298.298-.497.099-.198.05-.371-.025-.52-.075-.149-.669-1.612-.916-2.207-.242-.579-.487-.5-.669-.51-.173-.008-.371-.01-.57-.01-.198 0-.52.074-.792.372-.272.297-1.04 1.016-1.04 2.479 0 1.462 1.065 2.875 1.213 3.074.149.198 2.096 3.2 5.077 4.487.709.306 1.262.489 1.694.625.712.227 1.36.195 1.871.118.571-.085 1.758-.719 2.006-1.413.248-.694.248-1.289.173-1.413-.074-.124-.272-.198-.57-.347m-5.421 7.403h-.004a9.87 9.87 0 01-5.031-1.378l-.361-.214-3.741.982.998-3.648-.235-.374a9.86 9.86 0 01-1.51-5.26c.001-5.45 4.436-9.884 9.888-9.884 2.64 0 5.122 1.03 6.988 2.898a9.825 9.825 0 012.893 6.994c-.003 5.45-4.437 9.884-9.885 9.884m8.413-18.297A11.815 11.815 0 0012.05 0C5.495 0 .16 5.335.157 11.892c0 2.096.547 4.142 1.588 5.945L.057 24l6.305-1.654a11.882 11.882 0 005.683 1.448h.005c6.554 0 11.89-5.335 11.893-11.893A11.821 11.821 0 0020.885 3.688"/>
+                    </svg>
+                    Submit Event via WhatsApp
+                </a>
+            </div>
+        </div>
+    </div>
 </section>
 
-<div style="display: none;">
-    <Calendar />
-</div>
+<style>
+    /* Event Submission Styles */
+    .event-submission {
+        margin-top: 2rem;
+        background: var(--color-bg-secondary, #f8f9fa);
+        padding: 1.5rem;
+        border-radius: 8px;
+        border: 1px solid var(--color-border, #e1e5e9);
+    }
+
+    .event-submission h2 {
+        margin-top: 0;
+        margin-bottom: 1rem;
+        color: var(--color-primary, #0066cc);
+        border-bottom: 2px solid var(--color-primary, #0066cc);
+        padding-bottom: 0.5rem;
+    }
+
+    .submission-content {
+        text-align: center;
+    }
+
+    .submission-content p {
+        color: var(--color-text-primary, #333);
+        margin-bottom: 1.5rem;
+        font-size: 1rem;
+        line-height: 1.5;
+    }
+
+    .whatsapp-btn {
+        background: linear-gradient(135deg, #25D366, #128C7E);
+        color: white;
+        border: none;
+        padding: 14px 28px;
+        font-size: 1rem;
+        font-weight: 600;
+        border-radius: 50px;
+        cursor: pointer;
+        text-decoration: none;
+        display: inline-flex;
+        align-items: center;
+        gap: 10px;
+        transition: all 0.3s ease;
+        box-shadow: 0 4px 12px rgba(37, 211, 102, 0.3);
+        position: relative;
+        overflow: hidden;
+    }
+
+    .whatsapp-btn:hover {
+        transform: translateY(-2px);
+        box-shadow: 0 6px 20px rgba(37, 211, 102, 0.4);
+        background: linear-gradient(135deg, #22c55e, #16a085);
+    }
+
+    .whatsapp-btn:active {
+        transform: translateY(0);
+    }
+
+    .whatsapp-btn::before {
+        content: '';
+        position: absolute;
+        top: 0;
+        left: -100%;
+        width: 100%;
+        height: 100%;
+        background: linear-gradient(90deg, transparent, rgba(255,255,255,0.2), transparent);
+        transition: left 0.5s;
+    }
+
+    .whatsapp-btn:hover::before {
+        left: 100%;
+    }
+
+    .btn-icon {
+        width: 20px;
+        height: 20px;
+        fill: currentColor;
+    }
+
+    /* Existing Events Page Styles */
+    .events-content {
+        display: flex;
+        flex-direction: column;
+        gap: 2rem;
+    }
+
+    .event-sources, .weekly-events {
+        background: var(--color-bg-secondary, #f8f9fa);
+        padding: 1.5rem;
+        border-radius: 8px;
+        border: 1px solid var(--color-border, #e1e5e9);
+    }
+
+    .event-sources h2, .weekly-events h2 {
+        margin-top: 0;
+        color: var(--color-primary, #0066cc);
+        border-bottom: 2px solid var(--color-primary, #0066cc);
+        padding-bottom: 0.5rem;
+    }
+
+    .day-section {
+        margin-bottom: 1.5rem;
+    }
+
+    .day-section h3 {
+        color: var(--color-secondary, #666);
+        margin-bottom: 0.5rem;
+        font-size: 1.1rem;
+        border-left: 3px solid var(--color-accent, #ff6b35);
+        padding-left: 0.75rem;
+    }
+
+    .day-section ul {
+        margin-left: 1rem;
+    }
+
+    .day-section li {
+        margin-bottom: 0.75rem;
+        line-height: 1.5;
+    }
+
+    .day-section strong {
+        color: var(--color-text-primary, #333);
+    }
+
+    .event-sources ul li, .day-section ul li {
+        margin-bottom: 0.5rem;
+        color: var(--color-text-primary, #333);
+    }
+
+    .event-sources li strong, .day-section li strong {
+        color: var(--color-text-primary, #333);
+    }
+
+    .google-calendar {
+        margin-top: 2rem;
+    }
+
+    .google-calendar h2 {
+        margin-bottom: 1rem;
+        color: var(--color-primary, #0066cc);
+    }
+
+    .google-calendar iframe {
+        box-shadow: 0 2px 8px rgba(0,0,0,0.1);
+    }
+
+    a {
+        color: var(--color-link, #0066cc);
+        text-decoration: none;
+        transition: color 0.2s ease;
+    }
+
+    a:hover {
+        color: var(--color-link-hover, #0052a3);
+        text-decoration: underline;
+    }
+
+    @media (max-width: 768px) {
+        .google-calendar iframe {
+            height: 400px;
+        }
+        
+        .event-sources, .weekly-events, .event-submission {
+            padding: 1rem;
+        }
+
+        .whatsapp-btn {
+            font-size: 0.9rem;
+            padding: 12px 24px;
+        }
+    }
+</style>