diff --git a/app/Http/Controllers/Api/VenueController.php b/app/Http/Controllers/Api/VenueController.php
index 72cb720f..8995445e 100644
--- a/app/Http/Controllers/Api/VenueController.php
+++ b/app/Http/Controllers/Api/VenueController.php
@@ -17,26 +17,27 @@ class VenueController extends Controller
     public function index(Request $request)
     {
         return Venue::query()
-                    ->with(['city:id,name,country_id', 'city.country:id,name,code'])
-                    ->select('id', 'name', 'city_id')
-                    ->orderBy('name')
-                    ->when(
-                        $request->search,
-                        fn(Builder $query) => $query
-                            ->where('name', 'ilike', "%{$request->search}%")
-                    )
-                    ->when(
-                        $request->exists('selected'),
-                        fn(Builder $query) => $query->whereIn('id',
-                            $request->input('selected', [])),
-                        fn(Builder $query) => $query->limit(10)
-                    )
-                    ->get()
-                    ->map(function (Venue $venue) {
-                        $venue->flag = asset('vendor/blade-country-flags/4x3-'.$venue->city->country->code.'.svg');
+            ->with(['city:id,name,country_id', 'city.country:id,name,code'])
+            ->select('id', 'name', 'city_id')
+            ->orderBy('name')
+            ->when(
+                $request->search,
+                fn(Builder $query) => $query
+                    ->where('name', 'ilike', "%{$request->search}%")
+            )
+            ->when(
+                $request->exists('selected'),
+                fn(Builder $query) => $query->whereIn('id',
+                    $request->input('selected', [])),
+                fn(Builder $query) => $query->limit(10)
+            )
+            ->get()
+            ->map(function (Venue $venue) {
+                $venue->flag = asset('vendor/blade-country-flags/4x3-' . $venue->city->country->code . '.svg');
+                $venue->description = $venue->city->name . ', ' . $venue->street;
 
-                        return $venue;
-                    });
+                return $venue;
+            });
     }
 
     /**
diff --git a/app/Http/Livewire/Profile/Meetups.php b/app/Http/Livewire/Profile/Meetups.php
index 428c0047..bb4a5478 100644
--- a/app/Http/Livewire/Profile/Meetups.php
+++ b/app/Http/Livewire/Profile/Meetups.php
@@ -61,6 +61,7 @@ class Meetups extends Component
             ->map(fn($meetup) => [
                 'id' => $meetup->id,
                 'name' => $meetup->name,
+                'country' => $meetup->city->country->code,
                 'link' => route('meetup.landing', [
                     'country' => $meetup->city->country->code,
                     'meetup' => $meetup,
@@ -122,6 +123,7 @@ class Meetups extends Component
             ->map(fn($meetup) => [
                 'id' => $meetup->id,
                 'name' => $meetup->name,
+                'country' => $meetup->city->country->code,
                 'link' => route('meetup.landing', [
                     'country' => $meetup->city->country->code,
                     'meetup' => $meetup,
diff --git a/app/Http/Livewire/Tables/VenueTable.php b/app/Http/Livewire/Tables/VenueTable.php
index a9a7f599..bc4dd7d3 100644
--- a/app/Http/Livewire/Tables/VenueTable.php
+++ b/app/Http/Livewire/Tables/VenueTable.php
@@ -79,7 +79,6 @@ class VenueTable extends DataTableComponent
                     ->withCount([
                         'courseEvents',
                     ])
-                    ->whereHas('city.country', fn ($query) => $query->where('code', $this->country))
                     ->orderByDesc('course_events_count')
                     ->orderBy('venues.id');
     }
diff --git a/resources/views/livewire/bitcoin-event/form/bitcoin-event-form.blade.php b/resources/views/livewire/bitcoin-event/form/bitcoin-event-form.blade.php
index 8160c39a..6e486b0e 100644
--- a/resources/views/livewire/bitcoin-event/form/bitcoin-event-form.blade.php
+++ b/resources/views/livewire/bitcoin-event/form/bitcoin-event-form.blade.php
@@ -79,7 +79,7 @@
                         ]"
                             option-label="name"
                             option-value="id"
-                            option-description="city.name"
+                            option-description="description"
                         />
                     </x-input.group>
 
diff --git a/resources/views/livewire/meetup/landing-page-event.blade.php b/resources/views/livewire/meetup/landing-page-event.blade.php
index 71531ebe..56fd3e51 100644
--- a/resources/views/livewire/meetup/landing-page-event.blade.php
+++ b/resources/views/livewire/meetup/landing-page-event.blade.php
@@ -2,6 +2,18 @@
     <livewire:frontend.header :country="null"/>
     {{-- MAIN --}}
     <section class="w-full mb-12 mt-2">
+
+        @can('update', $meetupEvent)
+            <div class="max-w-screen-2xl mx-auto px-2 sm:px-10 space-y-4 flex flex-col sm:flex-row justify-end">
+                <x-button
+                    :href="route('meetup.event.form', ['country' => $meetup->city->country, 'meetupEvent' => $meetupEvent])"
+                    primary lg class="whitespace-nowrap cursor-pointer">
+                    <i class="fa fa-thin fa-edit mr-2"></i>
+                    {{ __('Edit') }}
+                </x-button>
+            </div>
+        @endcan
+
         <div class="max-w-screen-2xl mx-auto px-2 sm:px-10 space-y-4 flex flex-col sm:flex-row">
 
             <div class="relative py-4 sm:py-4">
diff --git a/resources/views/livewire/meetup/landing-page.blade.php b/resources/views/livewire/meetup/landing-page.blade.php
index 5ede093a..1bad37f5 100644
--- a/resources/views/livewire/meetup/landing-page.blade.php
+++ b/resources/views/livewire/meetup/landing-page.blade.php
@@ -2,8 +2,22 @@
     <livewire:frontend.header :country="null"/>
     {{-- MAIN --}}
     <section class="w-full mb-12 mt-8">
+
+        @can('update', $meetup)
+            <div class="max-w-screen-2xl mx-auto px-2 sm:px-10 space-y-4 flex flex-col sm:flex-row justify-end">
+                <x-button
+                    :href="route('meetup.meetup.form', ['meetup' => $meetup->id, 'country' =>  $meetup->city->country->code])"
+                    primary lg class="whitespace-nowrap cursor-pointer">
+                    <i class="fa fa-thin fa-edit mr-2"></i>
+                    {{ __('Edit') }}
+                </x-button>
+            </div>
+        @endcan
+
         <div class="max-w-screen-2xl mx-auto px-2 sm:px-10 space-y-4 flex flex-col sm:flex-row">
+
             <div class="flex flex-col sm:flex-row">
+
                 <div class="sm:w-10/12 flex flex-col">
                     <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">
                         <span
diff --git a/resources/views/livewire/profile/meetups.blade.php b/resources/views/livewire/profile/meetups.blade.php
index b69b5090..00636786 100644
--- a/resources/views/livewire/profile/meetups.blade.php
+++ b/resources/views/livewire/profile/meetups.blade.php
@@ -37,7 +37,7 @@
             </p>
             <div class="grid grid-cols-1 gap-2">
                 @foreach($myMeetupNames as $myMeetup)
-                    <div class="flex items-center space-x-2">
+                    <div class="flex flex-col sm:flex-row items-center space-x-2 space-y-1 sm:space-y-0">
                         <div>
                             <a href="{{ $myMeetup['link'] }}">
                                 <x-badge
@@ -45,7 +45,7 @@
                                     label="{{ $myMeetup['name'] }}"/>
                             </a>
                         </div>
-                        <div>
+                        <div class="flex flex-col sm:flex-row space-y-1 sm:space-y-0 sm:space-x-1 justify-center">
                             <x-badge
                                 x-data="{}"
                                 @click.prevent="window.navigator.clipboard.writeText('{{ $myMeetup['ics'] }}');window.$wireui.notify({title:'{{ __('Calendar Stream Url copied!') }}',description:'{{ __('Paste the calendar stream link into a compatible calendar app.') }}',icon:'success'});"
@@ -53,6 +53,22 @@
                                 <i class="fa fa-thin fa-calendar-circle-exclamation mr-2"></i>
                                 {{ __('Calendar') }}
                             </x-badge>
+                            <a
+                                href="{{ route('meetup.meetup.form', ['meetup' => $myMeetup['id'], 'country' =>  $myMeetup['country']]) }}">
+                                <x-badge
+                                    primary lg class="whitespace-nowrap cursor-pointer">
+                                    <i class="fa fa-thin fa-edit mr-2"></i>
+                                    {{ __('Edit') }}
+                                </x-badge>
+                            </a>
+                            <a
+                                href="{{ route('meetup.table.meetupEvent', ['country' =>  $myMeetup['country']]) }}">
+                                <x-badge
+                                    primary lg class="whitespace-nowrap cursor-pointer">
+                                    <i class="fa fa-thin fa-list mr-2"></i>
+                                    {{ __('Events') }}
+                                </x-badge>
+                            </a>
                         </div>
                     </div>
                 @endforeach