diff --git a/app/Http/Livewire/Meetup/Form/MeetupForm.php b/app/Http/Livewire/Meetup/Form/MeetupForm.php
index 149426ab..c0d9934d 100644
--- a/app/Http/Livewire/Meetup/Form/MeetupForm.php
+++ b/app/Http/Livewire/Meetup/Form/MeetupForm.php
@@ -39,7 +39,7 @@ class MeetupForm extends Component
             'meetup.intro'            => 'string|nullable',
             'meetup.webpage'          => 'string|url|nullable|required_without_all:meetup.telegram_link,meetup.nostr,meetup.twitter_username,meetup.matrix_group',
             'meetup.nostr'            => 'string|nullable|required_without_all:meetup.webpage,meetup.telegram_link,meetup.twitter_username,meetup.matrix_group',
-            'meetup.twitter_username' => 'string|nullable|required_without_all:meetup.webpage,meetup.telegram_link,meetup.nostr,meetup.matrix_group',
+            'meetup.twitter_username' => 'string|regex:/^[A-z0-9!@]+$/|nullable|required_without_all:meetup.webpage,meetup.telegram_link,meetup.nostr,meetup.matrix_group',
             'meetup.matrix_group'     => 'string|nullable|required_without_all:meetup.webpage,meetup.telegram_link,meetup.nostr,meetup.twitter_username'
         ];
     }
diff --git a/app/Http/Livewire/Tables/MeetupTable.php b/app/Http/Livewire/Tables/MeetupTable.php
index b8ed35a2..1ca656aa 100644
--- a/app/Http/Livewire/Tables/MeetupTable.php
+++ b/app/Http/Livewire/Tables/MeetupTable.php
@@ -31,7 +31,14 @@ class MeetupTable extends DataTableComponent
                  ];
              })
              ->setColumnSelectStatus(false)
-             ->setPerPage(10);
+             ->setPerPage(10)
+             ->setConfigurableAreas([
+                 'toolbar-left-end' => [
+                     'columns.meetups.areas.toolbar-left-end', [
+                         'country' => $this->country,
+                     ],
+                 ],
+             ]);
     }
 
     public function filters(): array
diff --git a/resources/views/columns/meetup_events/areas/toolbar-left-end.blade.php b/resources/views/columns/meetup_events/areas/toolbar-left-end.blade.php
index 3fbaa302..32d95a84 100644
--- a/resources/views/columns/meetup_events/areas/toolbar-left-end.blade.php
+++ b/resources/views/columns/meetup_events/areas/toolbar-left-end.blade.php
@@ -3,4 +3,8 @@
         <i class="fa fa-thin fa-plus"></i>
         {{ __('Register Meetup date') }}
     </x-button>
+    <x-button :href="route('profile.meetups', ['country' => $country])">
+        <i class="fa fa-thin fa-user-group"></i>
+        {{ __('My meetups') }}
+    </x-button>
 </div>
diff --git a/resources/views/columns/meetups/areas/toolbar-left-end.blade.php b/resources/views/columns/meetups/areas/toolbar-left-end.blade.php
new file mode 100644
index 00000000..d87d92bf
--- /dev/null
+++ b/resources/views/columns/meetups/areas/toolbar-left-end.blade.php
@@ -0,0 +1,10 @@
+<div class="w-full mb-4 md:w-auto md:mb-0">
+    <x-button :href="route('meetup.meetup.form', ['country' => $country, 'meetup' => null])">
+        <i class="fa fa-thin fa-plus"></i>
+        {{ __('Submit Meetup') }}
+    </x-button>
+    <x-button :href="route('profile.meetups', ['country' => $country])">
+        <i class="fa fa-thin fa-user-group"></i>
+        {{ __('My meetups') }}
+    </x-button>
+</div>
diff --git a/resources/views/livewire/meetup/world-map.blade.php b/resources/views/livewire/meetup/world-map.blade.php
index efcb13d5..7977a16b 100644
--- a/resources/views/livewire/meetup/world-map.blade.php
+++ b/resources/views/livewire/meetup/world-map.blade.php
@@ -56,7 +56,7 @@
 
     <div class="w-full py-24">
         <div class="max-w-screen-2xl mx-auto px-2 sm:px-10 space-y-4" id="table">
-            <livewire:tables.meetup-table :country="null"/>
+            <livewire:tables.meetup-table :country="$country->code"/>
         </div>
     </div>
     {{-- FOOTER --}}
diff --git a/resources/views/navigation-menu.blade.php b/resources/views/navigation-menu.blade.php
index d76d6ec7..1cddca29 100644
--- a/resources/views/navigation-menu.blade.php
+++ b/resources/views/navigation-menu.blade.php
@@ -13,23 +13,6 @@
                 <!-- Navigation Links -->
                 <div class="hidden space-x-8 sm:-my-px sm:ml-10 sm:flex sm:items-center">
 
-                    @if(str(request()->route()->getName())->contains('meetup.'))
-                        <div x-data="{currentUrl: window.location.href}">
-                            <a x-bind:href="'/{{ $country->code ?? 'de' }}/meetup/meetup/form?fromUrl='+currentUrl">
-                            <x-button xs amber>
-                                <i class="fa fa-thin fa-plus"></i>
-                                {{ __('Submit Meetup') }}
-                            </x-button>
-                            </a>
-                        </div>
-                        <div>
-                            <x-button xs amber :href="route('meetup.event.form', ['country' => $country ?? 'de'])">
-                                <i class="fa fa-thin fa-plus"></i>
-                                {{ __('Register Meetup date') }}
-                            </x-button>
-                        </div>
-                    @endif
-
                     @if(str(request()->route()->getName())->contains('school.'))
                         <div>
                             <x-button xs amber href="/nova/resources/lecturers" target="_blank">
@@ -67,14 +50,6 @@
                             {{ __('My profile') }}
                         </x-button>
                     </div>
-
-                    <div>
-                        <x-button xs amber href="{{ route('profile.meetups') }}"
-                                  :active="request()->routeIs('profile.meetups')">
-                            <i class="fa fa-thin fa-users"></i>
-                            {{ __('My meetups') }}
-                        </x-button>
-                    </div>
                 </div>
             </div>