diff --git a/app/Http/Livewire/Tables/BitcoinEventTable.php b/app/Http/Livewire/Tables/BitcoinEventTable.php
index cd636af9..7459c845 100644
--- a/app/Http/Livewire/Tables/BitcoinEventTable.php
+++ b/app/Http/Livewire/Tables/BitcoinEventTable.php
@@ -21,6 +21,7 @@ class BitcoinEventTable extends DataTableComponent
              ->setAdditionalSelects([
                  'bitcoin_events.id',
                  'bitcoin_events.venue_id',
+                 'bitcoin_events.created_by',
              ])
              ->setThAttributes(function (Column $column) {
                  return [
diff --git a/app/Http/Livewire/Tables/VenueTable.php b/app/Http/Livewire/Tables/VenueTable.php
index c2b211a7..7061b4af 100644
--- a/app/Http/Livewire/Tables/VenueTable.php
+++ b/app/Http/Livewire/Tables/VenueTable.php
@@ -17,7 +17,7 @@ class VenueTable extends DataTableComponent
     public function configure(): void
     {
         $this->setPrimaryKey('id')
-             ->setAdditionalSelects(['id'])
+             ->setAdditionalSelects(['venues.id', 'venues.created_by'])
              ->setThAttributes(function (Column $column) {
                  return [
                      'class' => 'px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider dark:bg-gray-800 dark:text-gray-400',
diff --git a/resources/views/columns/bitcoin_events/link.blade.php b/resources/views/columns/bitcoin_events/link.blade.php
index de6fd36e..6da16926 100644
--- a/resources/views/columns/bitcoin_events/link.blade.php
+++ b/resources/views/columns/bitcoin_events/link.blade.php
@@ -1,5 +1,13 @@
-<div>
+<div class="flex flex-col space-y-1">
     <a href="{{ $row->link }}" target="_blank">
         <x-badge class="whitespace-nowrap">{{ __('Link') }}</x-badge>
     </a>
+    <div>
+        @can('update', $row)
+            <x-button primary xs :href="route('bitcoinEvent.form', ['bitcoinEvent' => $row])">
+                <i class="fa-thin fa-edit"></i>
+                {{ __('Edit') }}
+            </x-button>
+        @endif
+    </div>
 </div>
diff --git a/resources/views/columns/venues/action.blade.php b/resources/views/columns/venues/action.blade.php
index cc3e719f..5b15d9a0 100644
--- a/resources/views/columns/venues/action.blade.php
+++ b/resources/views/columns/venues/action.blade.php
@@ -1,16 +1,24 @@
-<div>
+<div class="flex flex-col space-y-1">
     <div>
         @if($row->course_events_count > 0)
-            <x-button amber wire:click="venueSearch({{ $row->id }})">
+            <x-button xs amber wire:click="venueSearch({{ $row->id }})">
                 {{ __('Show dates') }} ({{ $row->course_events_count }})
             </x-button>
         @endif
     </div>
     <div>
         @if($row->course_events_count < 1)
-            <x-button outlined wire:click="venueSearch({{ $row->id }})">
+            <x-button xs outlined wire:click="venueSearch({{ $row->id }})">
                 {{ __('Show dates') }} ({{ $row->course_events_count }})
             </x-button>
         @endif
     </div>
+    <div>
+        @can('update', $row)
+            <x-button primary xs :href="route('venue.form', ['venue' => $row])">
+                <i class="fa-thin fa-edit"></i>
+                {{ __('Edit') }}
+            </x-button>
+        @endif
+    </div>
 </div>
diff --git a/resources/views/livewire/frontend/header.blade.php b/resources/views/livewire/frontend/header.blade.php
index 6a0560ea..cba510bf 100644
--- a/resources/views/livewire/frontend/header.blade.php
+++ b/resources/views/livewire/frontend/header.blade.php
@@ -53,7 +53,7 @@
         </div>
     </nav>
     <div x-description="Mobile menu, show/hide based on menu open state." class="lg:hidden" x-ref="dialog" x-show="open"
-         aria-modal="true" style="display: none;">
+         aria-modal="true" style="display: none;" x-cloak>
         <div x-description="Background backdrop, show/hide based on slide-over state." class="fixed inset-0 z-10"></div>
         <div
             class="fixed inset-y-0 right-0 z-10 w-full overflow-y-auto bg-white px-6 py-6 sm:max-w-sm sm:ring-1 sm:ring-gray-900/10"
@@ -92,7 +92,7 @@
                             </button>
                             <div class="mt-2 space-y-2"
                                  x-description="'Product' sub-menu, show/hide based on menu state." id="disclosure-1"
-                                 x-show="open" style="display: none;">
+                                 x-show="open" style="display: none;" x-cloak>
                                 <a href="{{ route('article.overview') }}"
                                    class="block rounded-lg py-2 pl-6 pr-3 text-sm font-semibold leading-7 text-gray-900 hover:bg-gray-50">{{ __('News Article') }}</a>
                                 <a href="{{ route('school.table.lecturer', ['country' => $country]) }}"
@@ -117,7 +117,7 @@
                             </button>
                             <div class="mt-2 space-y-2"
                                  x-description="'Product' sub-menu, show/hide based on menu state." id="disclosure-1"
-                                 x-show="open" style="display: none;">
+                                 x-show="open" style="display: none;" x-cloak>
                                 <a href="{{ route('meetup.world', ['country' => $country]) }}"
                                    class="block rounded-lg py-2 pl-6 pr-3 text-sm font-semibold leading-7 text-gray-900 hover:bg-gray-50">{{ __('World map') }}</a>
                                 <a href="{{ route('meetup.table.meetup', ['country' => $country]) }}"
@@ -144,7 +144,7 @@
                             </button>
                             <div class="mt-2 space-y-2"
                                  x-description="'Product' sub-menu, show/hide based on menu state." id="disclosure-1"
-                                 x-show="open" style="display: none;">
+                                 x-show="open" style="display: none;" x-cloak>
                                 <a href="{{ route('bitcoinEvent.table.bitcoinEvent', ['country' => $country]) }}"
                                    class="block rounded-lg py-2 pl-6 pr-3 text-sm font-semibold leading-7 text-gray-900 hover:bg-gray-50">{{ __('Events') }}</a>
                             </div>
@@ -167,7 +167,7 @@
                             </button>
                             <div class="mt-2 space-y-2"
                                  x-description="'Product' sub-menu, show/hide based on menu state." id="disclosure-1"
-                                 x-show="open" style="display: none;">
+                                 x-show="open" style="display: none;" x-cloak>
                                 <a href="{{ route('school.table.city', ['country' => $country]) }}"
                                    class="block rounded-lg py-2 pl-6 pr-3 text-sm font-semibold leading-7 text-gray-900 hover:bg-gray-50">{{ __('City search') }}</a>
                                 <a href="{{ route('school.table.course', ['country' => $country]) }}"
@@ -198,7 +198,7 @@
                             </button>
                             <div class="mt-2 space-y-2"
                                  x-description="'Product' sub-menu, show/hide based on menu state." id="disclosure-1"
-                                 x-show="open" style="display: none;">
+                                 x-show="open" style="display: none;" x-cloak>
                                 <a href="{{ route('library.table.libraryItems', ['country' => $country]) }}"
                                    class="block rounded-lg py-2 pl-6 pr-3 text-sm font-semibold leading-7 text-gray-900 hover:bg-gray-50">{{ __('Search') }}</a>
                                 @auth
@@ -225,7 +225,7 @@
                             </button>
                             <div class="mt-2 space-y-2"
                                  x-description="'Product' sub-menu, show/hide based on menu state." id="disclosure-1"
-                                 x-show="open" style="display: none;">
+                                 x-show="open" style="display: none;" x-cloak>
                                 <a href="{{ route('bookCases.table.city', ['country' => $country]) }}"
                                    class="block rounded-lg py-2 pl-6 pr-3 text-sm font-semibold leading-7 text-gray-900 hover:bg-gray-50">{{ __('City search') }}</a>
                                 <a href="{{ route('bookCases.table.bookcases', ['country' => $country]) }}"
@@ -258,7 +258,7 @@
                                 <div class="mt-2 space-y-2"
                                      x-description="'Product' sub-menu, show/hide based on menu state."
                                      id="disclosure-1"
-                                     x-show="open" style="display: none;">
+                                     x-show="open" style="display: none;" x-cloak>
                                     <a href="{{ route('profile.show') }}"
                                        class="block rounded-lg py-2 pl-6 pr-3 text-sm font-semibold leading-7 text-gray-900 hover:bg-gray-50">{{ __('My profile') }}</a>
                                     <a href="{{ route('profile.wallet') }}"
diff --git a/resources/views/livewire/frontend/navigation/bookcases.blade.php b/resources/views/livewire/frontend/navigation/bookcases.blade.php
index 7e55ccdf..6a222f3c 100644
--- a/resources/views/livewire/frontend/navigation/bookcases.blade.php
+++ b/resources/views/livewire/frontend/navigation/bookcases.blade.php
@@ -19,7 +19,7 @@
          x-transition:leave-end="opacity-0 -translate-y-1"
          x-description="'Product' flyout menu, show/hide based on flyout menu state."
          class="absolute inset-x-0 top-0 -z-10 bg-white pt-16 shadow-lg ring-1 ring-gray-900/5"
-         x-ref="panel" @click.away="open = false">
+         x-ref="panel" @click.away="open = false" x-cloak>
         <div class="mx-auto grid max-w-7xl grid-cols-1 gap-y-10 gap-x-8 py-10 px-6 lg:grid-cols-2 lg:px-8">
             <div class="grid grid-cols-2 gap-x-6 sm:gap-x-8">
                 <div>
diff --git a/resources/views/livewire/frontend/navigation/courses.blade.php b/resources/views/livewire/frontend/navigation/courses.blade.php
index 1fe80885..1bbc3d21 100644
--- a/resources/views/livewire/frontend/navigation/courses.blade.php
+++ b/resources/views/livewire/frontend/navigation/courses.blade.php
@@ -19,7 +19,7 @@
          x-transition:leave-end="opacity-0 -translate-y-1"
          x-description="'Product' flyout menu, show/hide based on flyout menu state."
          class="absolute inset-x-0 top-0 -z-10 bg-white pt-16 shadow-lg ring-1 ring-gray-900/5"
-         x-ref="panel" @click.away="open = false">
+         x-ref="panel" @click.away="open = false" x-cloak>
         <div class="mx-auto grid max-w-7xl grid-cols-1 gap-y-10 gap-x-8 py-10 px-6 lg:grid-cols-2 lg:px-8">
             <div class="grid grid-cols-2 gap-x-6 sm:gap-x-8">
                 <div>
diff --git a/resources/views/livewire/frontend/navigation/events.blade.php b/resources/views/livewire/frontend/navigation/events.blade.php
index b19b8826..1c754a51 100644
--- a/resources/views/livewire/frontend/navigation/events.blade.php
+++ b/resources/views/livewire/frontend/navigation/events.blade.php
@@ -19,7 +19,7 @@
          x-transition:leave-end="opacity-0 -translate-y-1"
          x-description="'Product' flyout menu, show/hide based on flyout menu state."
          class="absolute inset-x-0 top-0 -z-10 bg-white pt-16 shadow-lg ring-1 ring-gray-900/5"
-         x-ref="panel" @click.away="open = false">
+         x-ref="panel" @click.away="open = false" x-cloak>
         <div class="mx-auto grid max-w-7xl grid-cols-1 gap-y-10 gap-x-8 py-10 px-6 lg:grid-cols-2 lg:px-8">
             <div class="grid grid-cols-2 gap-x-6 sm:gap-x-8">
                 <div>
diff --git a/resources/views/livewire/frontend/navigation/library.blade.php b/resources/views/livewire/frontend/navigation/library.blade.php
index e73706a0..a452df0a 100644
--- a/resources/views/livewire/frontend/navigation/library.blade.php
+++ b/resources/views/livewire/frontend/navigation/library.blade.php
@@ -19,7 +19,7 @@
          x-transition:leave-end="opacity-0 -translate-y-1"
          x-description="'Product' flyout menu, show/hide based on flyout menu state."
          class="absolute inset-x-0 top-0 -z-10 bg-white pt-16 shadow-lg ring-1 ring-gray-900/5"
-         x-ref="panel" @click.away="open = false">
+         x-ref="panel" @click.away="open = false" x-cloak>
         <div class="mx-auto grid max-w-7xl grid-cols-1 gap-y-10 gap-x-8 py-10 px-6 lg:grid-cols-2 lg:px-8">
             <div class="grid grid-cols-2 gap-x-6 sm:gap-x-8">
                 <div>
diff --git a/resources/views/livewire/frontend/navigation/meetups.blade.php b/resources/views/livewire/frontend/navigation/meetups.blade.php
index 0efb5f0b..6aa6d686 100644
--- a/resources/views/livewire/frontend/navigation/meetups.blade.php
+++ b/resources/views/livewire/frontend/navigation/meetups.blade.php
@@ -19,7 +19,7 @@
          x-transition:leave-end="opacity-0 -translate-y-1"
          x-description="'Product' flyout menu, show/hide based on flyout menu state."
          class="absolute inset-x-0 top-0 -z-10 bg-white pt-16 shadow-lg ring-1 ring-gray-900/5"
-         x-ref="panel" @click.away="open = false">
+         x-ref="panel" @click.away="open = false" x-cloak>
         <div class="mx-auto grid max-w-7xl grid-cols-1 gap-y-10 gap-x-8 py-10 px-6 lg:grid-cols-2 lg:px-8">
             <div class="grid grid-cols-2 gap-x-6 sm:gap-x-8">
                 <div>
diff --git a/resources/views/livewire/frontend/navigation/news.blade.php b/resources/views/livewire/frontend/navigation/news.blade.php
index 4a3bc434..b2e97a15 100644
--- a/resources/views/livewire/frontend/navigation/news.blade.php
+++ b/resources/views/livewire/frontend/navigation/news.blade.php
@@ -19,7 +19,7 @@
          x-transition:leave-end="opacity-0 -translate-y-1"
          x-description="'Product' flyout menu, show/hide based on flyout menu state."
          class="absolute inset-x-0 top-0 -z-10 bg-white pt-16 shadow-lg ring-1 ring-gray-900/5"
-         x-ref="panel" @click.away="open = false">
+         x-ref="panel" @click.away="open = false" x-cloak>
         <div class="mx-auto grid max-w-7xl grid-cols-1 gap-y-10 gap-x-8 py-10 px-6 lg:grid-cols-2 lg:px-8">
             <div class="grid grid-cols-2 gap-x-6 sm:gap-x-8">
                 <div>
diff --git a/resources/views/livewire/frontend/navigation/profile.blade.php b/resources/views/livewire/frontend/navigation/profile.blade.php
index d3c8a500..58f8772d 100644
--- a/resources/views/livewire/frontend/navigation/profile.blade.php
+++ b/resources/views/livewire/frontend/navigation/profile.blade.php
@@ -21,7 +21,7 @@
          x-transition:leave-end="opacity-0 -translate-y-1"
          x-description="'Product' flyout menu, show/hide based on flyout menu state."
          class="absolute inset-x-0 top-0 -z-10 bg-white pt-16 shadow-lg ring-1 ring-gray-900/5"
-         x-ref="panel" @click.away="open = false">
+         x-ref="panel" @click.away="open = false" x-cloak>
         <div
             class="mx-auto grid max-w-7xl grid-cols-1 gap-y-10 gap-x-8 py-10 px-6 lg:grid-cols-2 lg:px-8">
             <div class="grid grid-cols-2 gap-x-6 sm:gap-x-8">
diff --git a/resources/views/livewire/venue/form/venue-form.blade.php b/resources/views/livewire/venue/form/venue-form.blade.php
index d595ac7c..59459ea7 100644
--- a/resources/views/livewire/venue/form/venue-form.blade.php
+++ b/resources/views/livewire/venue/form/venue-form.blade.php
@@ -6,14 +6,14 @@
         <div class="pb-5 flex flex-row justify-between">
             <h3 class="text-lg font-medium leading-6 text-gray-200">{{ __('Venue') }}</h3>
             <div class="flex flex-row space-x-2 items-center">
-                <div>
+                {{--<div>
                     @if($venue->id)
                         <x-button negative wire:click="deleteMe">
                             <i class="fa fa-thin fa-trash"></i>
                             {{ __('Delete') }}
                         </x-button>
                     @endif
-                </div>
+                </div>--}}
                 <div>
                     <x-button :href="$fromUrl">
                         <i class="fa fa-thin fa-arrow-left"></i>