diff --git a/app/Http/Livewire/Meetup/MeetupTable.php b/app/Http/Livewire/Meetup/MeetupTable.php
index 5aded34e..e4dc4427 100644
--- a/app/Http/Livewire/Meetup/MeetupTable.php
+++ b/app/Http/Livewire/Meetup/MeetupTable.php
@@ -39,16 +39,6 @@ class MeetupTable extends Component
                                    'name'   => $meetup->name,
                                    'coords' => [$meetup->city->latitude, $meetup->city->longitude],
                                ]),
-            'allMarkers' => Meetup::query()
-                               ->with([
-                                   'city.country',
-                               ])
-                               ->get()
-                               ->map(fn($meetup) => [
-                                   'id'     => $meetup->id,
-                                   'name'   => $meetup->name,
-                                   'coords' => [$meetup->city->latitude, $meetup->city->longitude],
-                               ]),
         ]);
     }
 }
diff --git a/app/Http/Livewire/Meetup/WorldMap.php b/app/Http/Livewire/Meetup/WorldMap.php
new file mode 100644
index 00000000..2f03abcb
--- /dev/null
+++ b/app/Http/Livewire/Meetup/WorldMap.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Http\Livewire\Meetup;
+
+use App\Models\Country;
+use App\Models\Meetup;
+use Livewire\Component;
+
+class WorldMap extends Component
+{
+    public Country $country;
+
+    public function filterByMarker($id)
+    {
+        $meetup = Meetup::with(['city.country'])
+                        ->find($id);
+
+        return to_route('meetup.table.meetup', [
+            'country' => $meetup->city->country->code,
+            'table'   => [
+                'filters' => [
+                    'byid' => $id,
+                ],
+            ]
+        ]);
+    }
+
+    public function render()
+    {
+        return view('livewire.meetup.world-map', [
+            'allMarkers' => Meetup::query()
+                                  ->with([
+                                      'city.country',
+                                  ])
+                                  ->get()
+                                  ->map(fn($meetup) => [
+                                      'id'     => $meetup->id,
+                                      'name'   => $meetup->name,
+                                      'coords' => [$meetup->city->latitude, $meetup->city->longitude],
+                                  ]),
+        ]);
+    }
+}
diff --git a/resources/views/livewire/frontend/header.blade.php b/resources/views/livewire/frontend/header.blade.php
index fbd5abc3..818c0218 100644
--- a/resources/views/livewire/frontend/header.blade.php
+++ b/resources/views/livewire/frontend/header.blade.php
@@ -61,6 +61,10 @@
                             </a>
                         @endif
                         @if(str(request()->route()->getName())->contains('meetup.'))
+                            <a href="{{ route('meetup.world', ['country' => $c]) }}"
+                               class="{{ request()->routeIs('meetup.world') ? 'text-amber-500 underline' : 'text-gray-400' }} mr-5 font-medium leading-6 hover:text-gray-300">
+                                Welt-Karte
+                            </a>
                             <a href="{{ route('meetup.table.meetup', ['country' => $c]) }}"
                                class="{{ request()->routeIs('meetup.table.meetup') ? 'text-amber-500 underline' : 'text-gray-400' }} mr-5 font-medium leading-6 hover:text-gray-300">
                                 Meetups
diff --git a/resources/views/livewire/meetup/meetup-table.blade.php b/resources/views/livewire/meetup/meetup-table.blade.php
index 53f0afab..aeebdeae 100644
--- a/resources/views/livewire/meetup/meetup-table.blade.php
+++ b/resources/views/livewire/meetup/meetup-table.blade.php
@@ -51,43 +51,6 @@
         </div>
         <div class="max-w-screen-2xl mx-auto px-2 sm:px-10 space-y-4" id="table">
             <livewire:tables.meetup-table :country="$country->code"/>
-
-            <div
-                wire:ignore
-                class="w-full flex justify-center"
-                x-data="{
-                    init() {
-                        let markers = {{ Js::from($allMarkers) }};
-
-                        $('#mapworld').vectorMap({
-                            zoomButtons : false,
-                            zoomOnScroll: true,
-                            map: 'world_mill',
-                            backgroundColor: 'transparent',
-                            markers: markers.map(function(h){ return {name: h.name, latLng: h.coords} }),
-{{--                            onMarkerClick: function(event, index) {--}}
-{{--                                $wire.call('filterByMarker', markers[index].id)--}}
-{{--                            },--}}
-                            markerStyle: {
-                                initial: {
-                                    image: '{{ asset('img/btc.png') }}',
-                                }
-                            },
-                            regionStyle: {
-                                initial: {
-                                    fill: '#151515'
-                                },
-                                hover: {
-                                    'fill-opacity': 1,
-                                    cursor: 'default'
-                                },
-                            }
-                        });
-                    }
-                }"
-            >
-                <div id="mapworld" style="width: 100%; height: 400px"></div>
-            </div>
         </div>
     </section>
     {{-- FOOTER --}}
diff --git a/resources/views/livewire/meetup/world-map.blade.php b/resources/views/livewire/meetup/world-map.blade.php
new file mode 100644
index 00000000..234154de
--- /dev/null
+++ b/resources/views/livewire/meetup/world-map.blade.php
@@ -0,0 +1,57 @@
+<div class="bg-21gray flex flex-col h-screen justify-between">
+    {{-- HEADER --}}
+    <livewire:frontend.header :country="$country"/>
+    {{-- MAIN --}}
+    <section class="w-full mb-12">
+        <div class="max-w-screen-2xl mx-auto px-2 sm:px-10 space-y-4 flex flex-col sm:flex-row">
+            <h1 class="mb-6 text-5xl font-extrabold leading-none tracking-normal text-gray-200 sm:text-6xl md:text-6xl lg:text-7xl md:tracking-tight">
+                Bitcoiner <span
+                    class="w-full text-transparent bg-clip-text bg-gradient-to-r from-amber-400 via-amber-500 to-amber-200 lg:inline">Meetups</span><br
+                    class="lg:block hidden">
+                Plebs together strong 💪
+            </h1>
+            <p class="px-0 mb-6 text-lg text-gray-600 md:text-xl lg:px-24"> Finde Bitcoiner in deiner Stadt und lerne
+                sie auf einem der Meetups kennen. </p>
+        </div>
+        <div class="max-w-screen-2xl mx-auto px-2 sm:px-10 space-y-4" id="table">
+            <div
+                wire:ignore
+                class="w-full flex justify-center"
+                x-data="{
+                    init() {
+                        let markers = {{ Js::from($allMarkers) }};
+
+                        $('#mapworld').vectorMap({
+                            zoomButtons : false,
+                            zoomOnScroll: true,
+                            map: 'world_mill',
+                            backgroundColor: 'transparent',
+                            markers: markers.map(function(h){ return {name: h.name, latLng: h.coords} }),
+                            onMarkerClick: function(event, index) {
+                                $wire.call('filterByMarker', markers[index].id)
+                            },
+                            markerStyle: {
+                                initial: {
+                                    image: '{{ asset('img/btc.png') }}',
+                                }
+                            },
+                            regionStyle: {
+                                initial: {
+                                    fill: '#151515'
+                                },
+                                hover: {
+                                    'fill-opacity': 1,
+                                    cursor: 'default'
+                                },
+                            }
+                        });
+                    }
+                }"
+            >
+                <div id="mapworld" style="width: 100%; height: 800px"></div>
+            </div>
+        </div>
+    </section>
+    {{-- FOOTER --}}
+    <livewire:frontend.footer/>
+</div>
diff --git a/routes/web.php b/routes/web.php
index acd64b25..0a570729 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -82,6 +82,8 @@ Route::middleware([])
      ->as('meetup.')
      ->prefix('/{country:code}/meetup')
      ->group(function () {
+         Route::get('world', \App\Http\Livewire\Meetup\WorldMap::class)
+              ->name('world');
          Route::get('overview', \App\Http\Livewire\Meetup\MeetupTable::class)
               ->name('table.meetup');
          Route::get('/meetup-events', \App\Http\Livewire\Meetup\MeetupEventTable::class)