diff --git a/README.md b/README.md
index fb4bae8a..b6b8106d 100644
--- a/README.md
+++ b/README.md
@@ -37,8 +37,8 @@ docker run --rm \
 ```
 4. Install the NPM packages - `npm install`
 5. Set up the environment variables - `cp .env.example .env`
-6. Add the app key - `./vendor/bin/sail artisan key:generate` 
-7. After the dependencies are installed run `./vendor/bin/sail up -d`
+6. After the dependencies are installed run `./vendor/bin/sail up -d`
+7. Add the app key - `./vendor/bin/sail artisan key:generate`
 8. After the creation of the containers run `./vendor/bin/sail artisan migrate`
 9. Run `npm run dev`
 
diff --git a/app/Actions/Users/AddParticipantToCompanyHandler.php b/app/Actions/Users/AddParticipantToCompanyHandler.php
new file mode 100644
index 00000000..b03b0c2c
--- /dev/null
+++ b/app/Actions/Users/AddParticipantToCompanyHandler.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Actions\Users;
+
+use App\Models\Company;
+use App\Models\User;
+use Illuminate\Support\Facades\DB;
+use Mockery\Exception;
+use Spatie\Permission\Models\Role;
+
+class AddParticipantToCompanyHandler
+{
+    /**
+     * Handles the adding of a user who registered as a participant to
+     * their company. The default role is company member, which is going to be assigned unless
+     * the user has a presentation or another role is passed
+     *
+     * @param User $user
+     * @param Company $company
+     * @param string $role
+     * @return void
+     */
+    public function execute(User $user, Company $company, string $role = 'company member'): void
+    {
+        // Making sure, if something fails, everything will roll back
+        DB::transaction(function () use ($user, $company, $role) {
+            if ($user->company) {
+                throw new Exception('The user is already a member of a company. Are you sure this is the right user?');
+            }
+
+            $user->update([
+                'company_id' => $company->id
+            ]);
+
+            if ($user->presenter_of) {
+                if (!$company->has_presentations_left) {
+                    throw new Exception('The company has reached their presentation limit. Contact them to resolve this.');
+                }
+
+                $presentation = $user->presenter_of;
+                $presentation->update([
+                    'company_id' => $company->id
+                ]);
+            } else {
+                if (!Role::findByName($role, 'web')) {
+                    throw new Exception('The role cannot be found');
+                }
+
+                $role = Role::findByName($role, 'web');
+                $user->assignRole($role);
+            }
+        });
+    }
+}
diff --git a/app/Console/Commands/AddParticipantToCompany.php b/app/Console/Commands/AddParticipantToCompany.php
new file mode 100644
index 00000000..8446cc5b
--- /dev/null
+++ b/app/Console/Commands/AddParticipantToCompany.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Actions\Users\AddParticipantToCompanyHandler;
+use App\Models\Company;
+use App\Models\User;
+use Illuminate\Console\Command;
+
+class AddParticipantToCompany extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'app:add-participant-to-company {email} {company_id} {role=company member}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Adds a participant as a part of a company in case the user registered as stand alone
+        even though they are attending with a company.';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        activity()->withoutLogs(function () {
+            try {
+                $user = User::where('email', $this->argument('email'))->firstOrFail();
+                $company = Company::findOrFail($this->argument('company_id'));
+
+                (new AddParticipantToCompanyHandler())->execute($user, $company, $this->argument('role'));
+
+                $user->refresh();
+                $this->info("You successfully added {$user->email} as part of the {$user->company->name}");
+            } catch (\Exception $e) {
+                $this->error($e);
+            }
+        });
+    }
+}
diff --git a/app/Http/Controllers/Crew/BoothController.php b/app/Http/Controllers/Crew/BoothController.php
index 1060a6b9..32f5c48d 100644
--- a/app/Http/Controllers/Crew/BoothController.php
+++ b/app/Http/Controllers/Crew/BoothController.php
@@ -43,6 +43,9 @@ public function create()
      */
     public function store(Request $request)
     {
+        // CURRENTLY NOT IN USE
+        abort(404);
+
         if ($request->user()->cannot('create', Booth::class)) {
             abort(403);
         }
@@ -77,17 +80,13 @@ public function show(Booth $booth)
     /**
      * Approve or reject the specified resource in storage.
      */
-    public function approve(Request $request, Booth $booth)
+    public function approve(Booth $booth, bool $isApproved)
     {
         if (Auth::user()->cannot('approveRequest', $booth)) {
             abort(403);
         }
 
-        $validated = $request->validate([
-            'approved' => 'required|boolean'
-        ]);
-
-        $isApproved = $validated['approved'];
+        $isApproved = filter_var($isApproved, FILTER_VALIDATE_BOOLEAN);
         $booth->handleApproval($isApproved);
 
         $template = $isApproved ? 'You approved the booth of :company!'
diff --git a/app/Http/Controllers/Crew/CompanyController.php b/app/Http/Controllers/Crew/CompanyController.php
index 8ec69b4c..d61c157f 100644
--- a/app/Http/Controllers/Crew/CompanyController.php
+++ b/app/Http/Controllers/Crew/CompanyController.php
@@ -92,17 +92,14 @@ public function show(Company $company): View
     /**
      * Approve or reject the specified resource in storage.
      */
-    public function approve(Request $request, Company $company)
+    public function approve(Company $company, bool $isApproved)
     {
         if (Auth::user()->cannot('approveRequest', $company)) {
             abort(403);
         }
 
-        $validated = $request->validate([
-            'approved' => 'required|boolean'
-        ]);
 
-        $isApproved = $validated['approved'];
+        $isApproved = filter_var($isApproved, FILTER_VALIDATE_BOOLEAN);
         if (!$isApproved) {
             if ($company->representative->receive_emails) {
                 Mail::to($company->representative->email)->send(new CompanyDisapprovedMailable($company));
@@ -203,7 +200,7 @@ private function createCompanyWithNewUser($input)
             'email' => $input['rep_new_email'],
             'role' => 'company representative',
         ]);
-        
+
         Mail::to($input['rep_new_email'])->send(new CompanyRepInvitation($invitation));
 
         return $company;
diff --git a/app/Http/Controllers/Crew/CrewController.php b/app/Http/Controllers/Crew/CrewController.php
index ce2c0d46..7b59faa1 100644
--- a/app/Http/Controllers/Crew/CrewController.php
+++ b/app/Http/Controllers/Crew/CrewController.php
@@ -17,7 +17,7 @@ class CrewController extends Controller
      * Returns the main page of the crew page
      * @return View
      */
-    public function index() : View
+    public function index(): View
     {
         if (!Gate::authorize('view-crew')) {
             abort(403);
@@ -25,7 +25,14 @@ public function index() : View
 
         $roles = Role::whereNotIn(
             'name',
-            ['participant', 'company representative', 'company member', 'booth owner']
+            [
+                'participant',
+                'company representative',
+                'company member',
+                'booth owner',
+                'pending booth owner',
+                'pending speaker'
+            ]
         )->get();
 
         return view('crew.crew.index', compact('roles'));
diff --git a/app/Http/Controllers/Crew/PresentationController.php b/app/Http/Controllers/Crew/PresentationController.php
index c9bfa079..33dfe0a1 100644
--- a/app/Http/Controllers/Crew/PresentationController.php
+++ b/app/Http/Controllers/Crew/PresentationController.php
@@ -96,17 +96,13 @@ public function show(Presentation $presentation): View
     /**
      * Approve or reject the specified resource in storage.
      */
-    public function approve(Request $request, Presentation $presentation)
+    public function approve(Presentation $presentation, bool $isApproved)
     {
         if (Auth::user()->cannot('approve', $presentation)) {
             abort(403);
         }
 
-        $validated = $request->validate([
-            'approved' => 'required|boolean'
-        ]);
-
-        $isApproved = $validated['approved'];
+        $isApproved = filter_var($isApproved, FILTER_VALIDATE_BOOLEAN);
         if (!$isApproved) {
             foreach ($presentation->speakers as $speaker) {
                 if ($speaker->receive_emails) {
diff --git a/app/Http/Controllers/Crew/RoomController.php b/app/Http/Controllers/Crew/RoomController.php
index 9e3c0eab..87695f43 100644
--- a/app/Http/Controllers/Crew/RoomController.php
+++ b/app/Http/Controllers/Crew/RoomController.php
@@ -81,7 +81,7 @@ public function show(Room $room)
      */
     public function destroy(Room $room): RedirectResponse // TODO: Refactor the FK constraints in the db
     {
-        if (Auth::user()->cannot('delete', Room::class)) {
+        if (Auth::user()->cannot('delete', $room)) {
             abort(403);
         }
 
diff --git a/app/Http/Controllers/Crew/SponsorshipController.php b/app/Http/Controllers/Crew/SponsorshipController.php
index de23daec..2860e113 100644
--- a/app/Http/Controllers/Crew/SponsorshipController.php
+++ b/app/Http/Controllers/Crew/SponsorshipController.php
@@ -98,17 +98,13 @@ public function show(Company $company): View
      * @param Company $company
      * @return mixed
      */
-    public function approve(Request $request, Company $company)
+    public function approve(Company $company, bool $isApproved)
     {
         if (Auth::user()->cannot('approve', Sponsorship::class)) {
             abort(403);
         }
 
-        $validated = $request->validate([
-            'approved' => 'required|boolean'
-        ]);
-
-        $isApproved = $validated['approved'];
+        $isApproved = filter_var($isApproved, FILTER_VALIDATE_BOOLEAN);
         $company->handleSponsorshipApproval($isApproved);
 
         $template = $isApproved ? 'You approved the sponsorship of :company!'
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 4d0810a1..5e9e6701 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -4,6 +4,7 @@
 
 use App\Models\Edition;
 use App\Models\Company;
+use App\Models\Sponsorship;
 use Illuminate\Http\Request;
 use Illuminate\View\View;
 
@@ -16,11 +17,12 @@ class HomeController extends Controller
     public function index() : View
     {
         $edition = Edition::current();
+        $anySponsorships = Sponsorship::doesntHave('companies')->count() === Sponsorship::count();
         $goldSponsorCompany = Company::where('is_approved', 1)
             ->where('sponsorship_id', 1)
             ->where('is_sponsorship_approved', 1)
             ->first();
 
-        return view('welcome', compact(['edition', 'goldSponsorCompany']));
+        return view('welcome', compact(['edition', 'goldSponsorCompany', 'anySponsorships']));
     }
 }
diff --git a/app/Http/Controllers/ProgrammeController.php b/app/Http/Controllers/ProgrammeController.php
index bc1eff81..ff9c852b 100644
--- a/app/Http/Controllers/ProgrammeController.php
+++ b/app/Http/Controllers/ProgrammeController.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers;
 
+use App\Models\Edition;
 use App\Models\Presentation;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
@@ -16,6 +17,10 @@ class ProgrammeController extends Controller
      */
     public function index(): View
     {
+        if (!optional(Edition::current())->is_programme_released) {
+            abort(404);
+        }
+
         $lectures = Presentation::where('type', 'lecture')
             ->whereNotNull('room_id')
             ->whereNotNull('timeslot_id')
@@ -47,6 +52,10 @@ public function index(): View
      */
     public function show(Presentation $presentation): View
     {
+        if (!$presentation->is_approved) {
+            abort(404);
+        }
+
         $styles = [
             1 => [
                 'borderColor' => 'bg-gradient-to-r from-yellow-300 to-yellow-600', // Gold
diff --git a/app/Http/Controllers/SpeakerController.php b/app/Http/Controllers/SpeakerController.php
index 5f7494a7..ad688bb8 100644
--- a/app/Http/Controllers/SpeakerController.php
+++ b/app/Http/Controllers/SpeakerController.php
@@ -12,29 +12,34 @@ class SpeakerController extends Controller
      */
     public function index()
     {
-        $speakers = collect();
         $edition = Edition::current();
+        $query = UserPresentation::where('role', 'speaker');
 
         if (!$edition) {
             return redirect(route('welcome'))
                 ->dangerBanner("Speakers are not available yet.");
         }
 
+        // If the final program is released, filter by room_id and timeslot_id
         if (optional(Edition::current())->is_final_programme_released) {
-            $speakers = UserPresentation::where('role', 'speaker')
-                ->whereHas('presentation', function ($query) {
-                    $query->whereNotNull('room_id')
-                        ->whereNotNull('timeslot_id');
-                })
-                ->get()
-                ->sortBy(function ($speaker) {
-                    if ($speaker->user->company && $speaker->user->company->is_sponsorship_approved) {
-                        return $speaker->user->company->sponsorship_id;
-                    }
-                    return 999; // Assign a high value to non-sponsored speakers
-                });
+            $query->whereHas('presentation', function ($query) {
+                $query->whereNotNull('room_id')
+                    ->whereNotNull('timeslot_id');
+            });
+        } else {
+            // Otherwise, filter by is_approved
+            $query->whereHas('presentation', function ($query) {
+                $query->where('is_approved', true);
+            });
         }
 
+        $speakers = $query->get()->sortBy(function ($speaker) {
+            if ($speaker->user->company && $speaker->user->company->is_sponsorship_approved) {
+                return $speaker->user->company->sponsorship_id;
+            }
+            return 999; // Assign a high value to non-sponsored speakers
+        });
+
         return view('speakers.index', compact('speakers', 'edition'));
     }
 }
diff --git a/app/Livewire/Booth/CreateBooth.php b/app/Livewire/Booth/CreateBooth.php
new file mode 100644
index 00000000..5e7ee566
--- /dev/null
+++ b/app/Livewire/Booth/CreateBooth.php
@@ -0,0 +1,142 @@
+<?php
+
+namespace App\Livewire\Booth;
+
+use App\Livewire\Forms\BoothForm;
+use App\Models\Booth;
+use App\Models\Company;
+use App\Models\User;
+use Illuminate\View\View;
+use Livewire\Attributes\Validate;
+use Livewire\Component;
+
+class CreateBooth extends Component
+{
+    #[Validate(['required', 'numeric', 'min:1', 'max:10'])]
+    public $width;
+
+    #[Validate(['required', 'numeric', 'min:1', 'max:10'])]
+    public $length;
+
+    #[Validate(['nullable', 'max:255'])]
+    public $additionalInformation;
+
+    public $company;
+    public $companies;
+    public $companyId;
+
+    public $searchValue;
+    public $isDropdownVisible;
+    public $users;
+    public $selectedUser;
+
+    /**
+     * Initializes the component
+     * @return void
+     */
+    public function mount()
+    {
+        $this->companies = Company::whereDoesntHave('booth')->where('is_approved', '=', '1')->get();
+        $this->company = $this->companies->first();
+        $this->isDropdownVisible = false;
+        $this->users = optional($this->company)->users;
+        $this->searchValue = '';
+    }
+
+    /**
+     * Creates the entity
+     * @return void
+     */
+    public function save()
+    {
+        $this->validate();
+
+        $this->validate([
+            'company' => 'required',
+            'selectedUser' => 'required'
+        ]);
+
+        $boothData = [
+            'width' => $this->width,
+            'length' => $this->length,
+            'additional_information' => $this->additionalInformation,
+            'company_id' => $this->company->id,
+            'is_approved' => true
+        ];
+
+        Booth::create($boothData);
+
+        $this->selectedUser->assignRole('booth owner');
+
+        if ($this->selectedUser->hasRole('pending booth owner')) {
+            $this->selectedUser->removeRole('pending booth owner');
+        }
+
+        $this->redirect(route('moderator.booths.index'));
+    }
+
+    /**
+     * Triggers the filtering function if the email/name is being changed
+     *
+     * @return void
+     */
+    public function updatedSearchValue() : void
+    {
+        $this->users = $this->company->users;
+        if (!empty($this->searchValue)) {
+            $this->users = $this->users->filter(function ($user) {
+                $nameMatch = stripos($user->name, $this->searchValue) !== false;
+                $emailMatch = stripos($user->email, $this->searchValue) !== false;
+
+                return $nameMatch || $emailMatch;
+            });
+        }
+    }
+
+    /**
+     * Handles the update of the company id
+     * @return void
+     */
+    public function updatedCompanyId() : void
+    {
+        $this->company = Company::find($this->companyId);
+        $this->users = $this->company->users;
+        $this->searchValue = '';
+        $this->updatedSearchValue();
+        $this->selectedUser = null;
+        $this->isDropdownVisible = false;
+    }
+
+    /**
+     * Triggered when the user chooses the assignee
+     *
+     * @param $id
+     * @return void
+     */
+    public function selectUser($id) : void
+    {
+        $this->selectedUser = User::find($id);
+        $this->searchValue = $this->selectedUser->name;
+        $this->updatedSearchValue();
+        $this->isDropdownVisible = false;
+    }
+
+    /**
+     * Responsible for the visibility status of the dropdown
+     *
+     * @return void
+     */
+    public function toggleDropdown() : void
+    {
+        $this->isDropdownVisible = !$this->isDropdownVisible;
+    }
+
+    /**
+     * Renders the component
+     * @return View
+     */
+    public function render() : View
+    {
+        return view('livewire.booth.create-booth');
+    }
+}
diff --git a/app/Livewire/Company/AddMember.php b/app/Livewire/Company/AddMember.php
index 0acbbf57..6adb7fb9 100644
--- a/app/Livewire/Company/AddMember.php
+++ b/app/Livewire/Company/AddMember.php
@@ -59,7 +59,7 @@ public function invite(): void
         $this->validate();
         if ($this->currentRole == 'speaker') {
             $this->currentRole = 'pending speaker';
-        } else if ($this->currentRole == 'booth owner') {
+        } elseif ($this->currentRole == 'booth owner') {
             $this->currentRole = 'pending booth owner';
         }
 
diff --git a/app/Livewire/Company/AddParticipant.php b/app/Livewire/Company/AddParticipant.php
new file mode 100644
index 00000000..e464e697
--- /dev/null
+++ b/app/Livewire/Company/AddParticipant.php
@@ -0,0 +1,111 @@
+<?php
+
+namespace App\Livewire\Company;
+
+use App\Actions\Users\AddParticipantToCompanyHandler;
+use App\Models\Company;
+use App\Models\User;
+use Exception;
+use Illuminate\View\View;
+use Livewire\Component;
+use LivewireUI\Modal\ModalComponent;
+use Masmerise\Toaster\Toaster;
+
+class AddParticipant extends ModalComponent
+{
+    public $company;
+    public $searchValue;
+    public $isDropdownVisible;
+    public $users;
+    public $defaultUsers;
+    public $selectedUser;
+    public $canAssignRole;
+    public $assignedRole;
+
+    /**
+     * Initializes the component
+     * @return void
+     */
+    public function mount($companyId)
+    {
+        $this->company = Company::find($companyId);
+        $this->searchValue = '';
+        $this->defaultUsers = User::role('participant')
+            ->whereNull('company_id')
+            ->get()
+            ->filter(function ($user) {
+                return $user->hasExactRoles('participant');
+            });
+        $this->users = $this->defaultUsers;
+        $this->isDropdownVisible = false;
+        $this->canAssignRole = false;
+        $this->assignedRole = 'company member';
+    }
+
+    /**
+     * Triggers the filtering function if the email/name is being changed
+     *
+     * @return void
+     */
+    public function updatedSearchValue(): void
+    {
+        $this->users = $this->defaultUsers;
+        if (!empty($this->searchValue)) {
+            $this->users = $this->users->filter(function ($user) {
+                $nameMatch = stripos($user->name, $this->searchValue) !== false;
+                $emailMatch = stripos($user->email, $this->searchValue) !== false;
+
+                return $nameMatch || $emailMatch;
+            });
+        }
+    }
+
+    /**
+     * Assigns the participant to a company or handles the failure of assigning
+     * @return \Illuminate\Http\RedirectResponse|void
+     */
+    public function save()
+    {
+        try {
+            (new AddParticipantToCompanyHandler())->execute($this->selectedUser, $this->company, $this->assignedRole);
+            return redirect()->to(route('moderator.companies.show', $this->company));
+        } catch (Exception $exception) {
+            Toaster::error($exception->getMessage());
+        }
+    }
+
+    /**
+     * Triggered when the user chooses the assignee
+     *
+     * @param $id
+     * @return void
+     */
+    public function selectUser($id): void
+    {
+        $this->selectedUser = User::find($id);
+        $this->searchValue = $this->selectedUser->name;
+        $this->updatedSearchValue();
+        $this->isDropdownVisible = false;
+
+        $this->canAssignRole = is_null($this->selectedUser->presenter_of);
+    }
+
+    /**
+     * Responsible for the visibility status of the dropdown
+     *
+     * @return void
+     */
+    public function toggleDropdown(): void
+    {
+        $this->isDropdownVisible = !$this->isDropdownVisible;
+    }
+
+    /**
+     * Renders the component
+     * @return View
+     */
+    public function render(): View
+    {
+        return view('livewire.company.add-participant');
+    }
+}
diff --git a/app/Livewire/ConfirmationModal.php b/app/Livewire/ConfirmationModal.php
new file mode 100644
index 00000000..c835c5ca
--- /dev/null
+++ b/app/Livewire/ConfirmationModal.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Livewire;
+
+use Illuminate\View\View;
+use Livewire\Component;
+use LivewireUI\Modal\ModalComponent;
+
+class ConfirmationModal extends ModalComponent
+{
+    public $title;
+    public $method;
+    public $route;
+    public $isApproved;
+    public ?string $callToAction;
+
+    /**
+     * Renders the component
+     *
+     * @return View
+     */
+    public function render() : View
+    {
+        return view('livewire.confirmation-modal');
+    }
+}
diff --git a/app/Mail/BoothDisapprovedMailable.php b/app/Mail/BoothDisapprovedMailable.php
index e8932cba..7ef91dda 100644
--- a/app/Mail/BoothDisapprovedMailable.php
+++ b/app/Mail/BoothDisapprovedMailable.php
@@ -30,7 +30,7 @@ public function __construct(Company $company)
     public function envelope(): Envelope
     {
         return new Envelope(
-            subject: 'Booth Disapproved',
+            subject: 'Booth Refused',
         );
     }
 
diff --git a/app/Mail/PresentationDisapprovedMailable.php b/app/Mail/PresentationDisapprovedMailable.php
index ff9af765..3d8053c4 100644
--- a/app/Mail/PresentationDisapprovedMailable.php
+++ b/app/Mail/PresentationDisapprovedMailable.php
@@ -27,7 +27,7 @@ public function __construct()
     public function envelope(): Envelope
     {
         return new Envelope(
-            subject: 'Presentation Disapproved',
+            subject: 'Presentation Refused',
         );
     }
 
diff --git a/app/Mail/SponsorshipDisapprovedMailable.php b/app/Mail/SponsorshipDisapprovedMailable.php
index decd3b08..269aeb96 100644
--- a/app/Mail/SponsorshipDisapprovedMailable.php
+++ b/app/Mail/SponsorshipDisapprovedMailable.php
@@ -30,7 +30,7 @@ public function __construct(Company $company)
     public function envelope(): Envelope
     {
         return new Envelope(
-            subject: 'Sponsorship Disapproved',
+            subject: 'Sponsorship Refused',
         );
     }
 
diff --git a/app/Models/Presentation.php b/app/Models/Presentation.php
index d66a9945..27870dfe 100644
--- a/app/Models/Presentation.php
+++ b/app/Models/Presentation.php
@@ -116,7 +116,7 @@ public function getActivitylogOptions(): LogOptions
     {
         return LogOptions::defaults()
             ->logAll()
-            ->setDescriptionForEvent(fn(string $eventName) => "{$this->name} booth has been {$eventName} by " . Auth::user()->name)
+            ->setDescriptionForEvent(fn(string $eventName) => "Presentation {$this->name} has been {$eventName} by " . Auth::user()->name)
             ->logOnlyDirty()
             ->dontLogIfAttributesChangedOnly(['is_approved']);
     }
diff --git a/app/Policies/CompanyPolicy.php b/app/Policies/CompanyPolicy.php
index 5058f67d..f8dec845 100644
--- a/app/Policies/CompanyPolicy.php
+++ b/app/Policies/CompanyPolicy.php
@@ -111,6 +111,18 @@ public function viewAnyMember(User $user, Company $company): bool
             && $user->hasPermissionTo('viewAny company member');
     }
 
+    /**
+     * Determine if the user can add company members.
+     *
+     * @param User $user The user instance.
+     * @param Company $company The company instance.
+     * @return bool
+     */
+    public function addMember(User $user, Company $company): bool
+    {
+        return $user->hasPermissionTo('add company member');
+    }
+
     /**
      * Determine if the user can edit company members.
      *
diff --git a/app/Policies/RoomPolicy.php b/app/Policies/RoomPolicy.php
index fa23aeae..1c8952fb 100644
--- a/app/Policies/RoomPolicy.php
+++ b/app/Policies/RoomPolicy.php
@@ -2,6 +2,7 @@
 
 namespace App\Policies;
 
+use App\Models\Room;
 use App\Models\User;
 
 class RoomPolicy
@@ -56,8 +57,12 @@ public function update(User $user): bool
      * @param User $user
      * @return bool
      */
-    public function delete(User $user)
+    public function delete(User $user, Room $room)
     {
-        return $user->can('delete room');
+        if (!$user->can('delete room')) {
+            return false;
+        }
+
+        return $room->presentations->count() == 0 && $room->defaultPresentations->count() == 0;
     }
 }
diff --git a/database/factories/CompanyFactory.php b/database/factories/CompanyFactory.php
index de547d02..f56efe72 100644
--- a/database/factories/CompanyFactory.php
+++ b/database/factories/CompanyFactory.php
@@ -21,7 +21,7 @@ public function definition(): array
     {
         return [
             'name' => $this->faker->unique()->company(),
-            'website' => 'www.example.com',
+            'website' => 'https://www.example.com',
             'description' => $this->faker->paragraph(),
             'motivation' => $this->faker->paragraph(),
             'phone_number' => $this->faker->phoneNumber,
diff --git a/public/js/registration-validation.js b/public/js/registration-validation.js
index ed5cf3f5..972c30b6 100644
--- a/public/js/registration-validation.js
+++ b/public/js/registration-validation.js
@@ -3,10 +3,6 @@ document.addEventListener("DOMContentLoaded", function() {
     const passwordRulesDiv = document.getElementById('password-rules');
     const passwordInput = document.getElementById('password');
 
-    if(document.getElementById('company_postcode')) {
-        postcodeValidation();
-    }
-
     //show password rules when user clicks on password field
     passwordInput.addEventListener('click', function () {
         passwordRulesDiv.classList.remove('hidden');
@@ -31,31 +27,6 @@ document.addEventListener("DOMContentLoaded", function() {
         passwordRulesDiv.classList.add('hidden');
     });
 
-    function postcodeValidation() {
-        document.getElementById('company_postcode').addEventListener('keydown', function(event) {
-            const position = document.getElementById('company_postcode').selectionStart;
-            const userInput = document.getElementById('company_postcode').value;
-
-            if (
-                event.key === 'Backspace' ||
-                event.key === 'ArrowLeft' ||
-                event.key === 'ArrowRight' ||
-                event.key === 'ArrowUp' ||
-                event.key === 'ArrowDown' ||
-                event.key === 'Tab'
-            ) {
-                return;
-            }
-
-            if (
-                !((position < 4 && /[0-9]/.test(event.key)) ||
-                    (position >= 4 && position <= 5 && /[A-Za-z]/.test(event.key)))
-            ) {
-                event.preventDefault();
-            }
-        });
-    }
-
     const emailInput = document.getElementById('email');
 
     emailInput.addEventListener('blur', function() {
diff --git a/resources/views/components/countdown.blade.php b/resources/views/components/countdown.blade.php
index f9f54305..a7d05b7a 100644
--- a/resources/views/components/countdown.blade.php
+++ b/resources/views/components/countdown.blade.php
@@ -4,13 +4,18 @@
 @push('scripts')
         <script>
             document.addEventListener('livewire:navigated', () => {
+                // Livewire seems to be messing up with the clearing of the DOM
+                const parent = document.getElementById('parent');
+                while (parent.firstChild) {
+                    parent.removeChild(parent.firstChild);
+                }
+
                 const countDownDate = new Date(@json($time->toIso8601String())).getTime();
                 const timeUnits = ['months', 'days', 'hours', 'minutes', 'seconds'];
                 let valueElements = [];
                 let labelElements = [];
                 let value = [0, 0, 0, 0, 0];
 
-                const parent = document.getElementById('parent');
                 timeUnits.forEach((unit) => {
                     let div = document.createElement('div');
                     div.className = 'flex flex-col items-center justify-center mr-5';
diff --git a/resources/views/components/livewire-modal.blade.php b/resources/views/components/livewire-modal.blade.php
index 4e8e5f35..3cafea67 100644
--- a/resources/views/components/livewire-modal.blade.php
+++ b/resources/views/components/livewire-modal.blade.php
@@ -6,7 +6,7 @@
             @endif
 
             @if(isset($title))
-                <div {{ $title->attributes->class(['bg-white p-4 sm:px-6 sm:py-4 border-b border-gray-150']) }}>
+                <div {{ $title->attributes->class(['bg-white dark:bg-gray-900 p-4 sm:px-6 sm:py-4 border-b border-gray-150 dark:border-gray-800']) }}>
                     <h3 class="text-lg leading-6 font-medium text-gray-900 dark:text-white">
                         {{ $title }}
                     </h3>
@@ -14,7 +14,7 @@
             @endif
 
             @if(isset($content))
-                <div {{ $content->attributes->class(['bg-white px-4 sm:p-6']) }}>
+                <div {{ $content->attributes->class(['bg-white dark:bg-gray-900 px-4 sm:p-6']) }}>
                     <div class="space-y-6">
                         {{ $content }}
                     </div>
@@ -22,7 +22,7 @@
             @endif
 
             @if(isset($buttons))
-                <div {{ $buttons->attributes->class(['bg-gray-100 px-4 py-5 sm:px-4 sm:flex sm:items-end sm:justify-end']) }}>
+                <div {{ $buttons->attributes->class(['bg-gray-100 dark:bg-gray-900 px-4 py-5 sm:px-4 sm:flex sm:items-end sm:justify-end']) }}>
                     {{ $buttons }}
                 </div>
 
diff --git a/resources/views/crew/booths/create.blade.php b/resources/views/crew/booths/create.blade.php
index 162dba4e..062695a8 100644
--- a/resources/views/crew/booths/create.blade.php
+++ b/resources/views/crew/booths/create.blade.php
@@ -5,94 +5,7 @@
             {{ __('Create a booth') }}
         </h2>
         <div class="pt-5">
-            <form method="POST" action="{{route('moderator.booths.store')}}">
-                @csrf
-                <x-action-section>
-                    <x-slot name="title">
-                        {{ __('Booth details') }}
-                    </x-slot>
-                    <x-slot name="description">
-                        <div class="space-y-4 text-gray-800 dark:text-gray-200 text-sm">
-                            <p>Add manually the booth for an already registered company.</p>
-                            <p class="mt-4">Total area sized mentioned in the sponsor packages:</p>
-                            <ul class="list-disc ml-6">
-                                <li>Bronze & Silver - 8 m<sup>2</sup></li>
-                                <li>Golden - 12 m<sup>2</sup></li>
-                            </ul>
-                        </div>
-                    </x-slot>
-                    <x-slot name="content">
-                        <div class="pr-5">
-                            <div class="col-span-6 sm:col-span-4 ">
-                                <x-label for="company_id" class="after:content-['*'] after:text-red-500"
-                                         value="{{ __('Company name') }}"></x-label>
-                                <x-select name="company_id" class="mt-1 block w-full">
-                                    @foreach(Company::whereDoesntHave('booth')
-                                                ->where('is_approved', '=', '1')->get() as $company)
-                                        <option value="{{ $company->id }}">
-                                            {{$company->name}}
-                                            @if($company->sponsorship)
-                                                ({{ucfirst($company->sponsorship->name)}} sponsor)
-                                            @endif
-                                        </option>
-                                    @endforeach
-                                </x-select>
-                                <x-input-error for="company_id" class="mt-2"></x-input-error>
-                            </div>
-                            <div class="col-span-6 sm:col-span-4 pt-3">
-                                <x-label for="width" class="after:content-['*'] after:text-red-500"
-                                         value="{{ __('Width') }}"></x-label>
-                                <x-input name="width" type="number" step="0.1" min="1" class="mt-1 block w-full"
-                                         value="{{ old('width') }}"></x-input>
-                                <x-input-error for="width" class="mt-2"></x-input-error>
-                            </div>
-                            <div class="col-span-6 sm:col-span-4 pt-3">
-                                <x-label for="length" class="after:content-['*'] after:text-red-500"
-                                         value="{{ __('Length') }}"></x-label>
-                                <x-input name="length" step="0.1" min="1" type="number" class="mt-1 block w-full"
-                                         value="{{ old('length') }}"></x-input>
-                                <x-input-error for="length" class="mt-2"></x-input-error>
-                            </div>
-                            <div class="col-span-6 sm:col-span-4 pt-3">
-                                <x-label for="description" value="{{ __('Additional information') }}"></x-label>
-                                <textarea name="additional_information" maxlength="255"
-                                          class="border-gray-300 dark:border-gray-700 dark:bg-gray-900 dark:text-gray-300 focus:border-indigo-500 dark:focus:border-indigo-600 focus:ring-indigo-500 dark:focus:ring-indigo-600 rounded-md shadow-sm block mt-1 w-full"
-                                          name="description"
-                                >{{old('additional_information')}}</textarea>
-                            </div>
-                            <div id="calculatedArea" class="mt-2 text-sm text-gray-600 dark:text-gray-400"></div>
-                        </div>
-                    </x-slot>
-                    <x-slot name="actions">
-                        <x-button
-                            type="submit"
-                            class="dark:bg-green-500 bg-green-500 hover:bg-green-600 hover:dark:bg-green-600 active:bg-green-600 active:dark:bg-green-600">
-                            Save
-                        </x-button>
-                    </x-slot>
-                </x-action-section>
-            </form>
-
+            <livewire:booth.create-booth/>
         </div>
     </div>
-    <script>
-        document.addEventListener('DOMContentLoaded', function () {
-            const widthInput = document.querySelector('input[name="width"]');
-            const heightInput = document.querySelector('input[name="height"]');
-
-            const calculatedAreaElement = document.getElementById('calculatedArea');
-
-            widthInput.addEventListener('input', calculateArea);
-            heightInput.addEventListener('input', calculateArea);
-
-            function calculateArea() {
-                const width = parseFloat(widthInput.value) || 0;
-                const height = parseFloat(heightInput.value) || 0;
-                const area = width * height;
-
-                calculatedAreaElement.textContent = `Calculated Area: ${area} m²`;
-            }
-        });
-    </script>
-
 </x-hub-layout>
diff --git a/resources/views/crew/booths/index.blade.php b/resources/views/crew/booths/index.blade.php
index 056c6339..c2ebbde9 100644
--- a/resources/views/crew/booths/index.blade.php
+++ b/resources/views/crew/booths/index.blade.php
@@ -11,41 +11,59 @@
                     </x-button-link>
                 </x-slot>
                 <x-slot name="content">
-                    @forelse($booths as $index => $booth)
-                        <x-list-section-item class="{{ $booth->is_approved ? 'border-transparent hover:bg-gray-100 ' : 'bg-apricot-peach-400 bg-opacity-30 dark:bg-opacity-20 border-apricot-peach-300 dark:border-apricot-peach-600 hover:bg-apricot-peach-200 ' }} border-l-4"
-                                             :url="route('moderator.booths.show', $booth)">
-                            <div class="justify-between flex mt-2">
-                                <div class="flex">
-                                    <div class="text-gray-700 dark:text-white text-m items-center flex">
+                    <table class="min-w-full divide-gray-200 dark:divide-gray-700">
+                        <thead>
+                        <tr>
+                            <th class="px-4 py-2 text-left text-xs font-medium text-gray-500 uppercase tracking-wider dark:text-gray-400">
+                                Company Name
+                            </th>
+                            <th class="px-4 py-2 text-left text-xs font-medium text-gray-500 uppercase tracking-wider dark:text-gray-400 right-0 sticky w-16">
+                                Created At
+                            </th>
+                        </tr>
+                        </thead>
+                        <tbody class="bg-white dark:bg-gray-800 divide-y-4 divide-white dark:divide-gray-700">
+                        @forelse($booths as $index => $booth)
+                            <tr class="{{ $booth->is_approved ? 'hover:bg-gray-100 dark:hover:bg-gray-700' : 'bg-apricot-peach-400 bg-opacity-30 dark:bg-opacity-20 hover:bg-apricot-peach-200' }} cursor-pointer"
+                                onclick="window.location='{{ route('moderator.booths.show', $booth) }}'">
+                                <td class="px-4 py-4 whitespace-nowrap text-gray-700 dark:text-white">
+                                    <div class="flex">
+                                        <div class="text-gray-700 dark:text-white text-m items-center flex">
+                                            <svg
+                                                class="shrink-0 w-6 h-6 mr-1.5 block stroke-apricot-peach-400 {{ !$booth->is_approved ? 'stroke-gray-900 dark:stroke-gray-100 hover:stroke-gray-500' : '' }}"
+                                                xlmns="http://www.w3.org/2000/svg" viewbox="0 0 23 23" fill="none"
+                                                aria-hidden="true">
+                                                <path
+                                                    d="M13.5 21v-7.5a.75.75 0 01.75-.75h3a.75.75 0 01.75.75V21m-4.5 0H2.36m11.14 0H18m0 0h3.64m-1.39 0V9.349m-16.5 11.65V9.35m0 0a3.001 3.001 0 003.75-.615A2.993 2.993 0 009.75 9.75c.896 0 1.7-.393 2.25-1.016a2.993 2.993 0 002.25 1.016c.896 0 1.7-.393 2.25-1.016a3.001 3.001 0 003.75.614m-16.5 0a3.004 3.004 0 01-.621-4.72L4.318 3.44A1.5 1.5 0 015.378 3h13.243a1.5 1.5 0 011.06.44l1.19 1.189a3 3 0 01-.621 4.72m-13.5 8.65h3.75a.75.75 0 00.75-.75V13.5a.75.75 0 00-.75-.75H6.75a.75.75 0 00-.75.75v3.75c0 .415.336.75.75.75z"></path>
+                                            </svg>
+                                            <div class="ml-2 flex-grow">
+                                                <strong>{{$booth->company->name}}</strong>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </td>
+                                <td class="px-4 py-2 whitespace-nowrap text-sm text-gray-700 dark:text-white">
+                                    <div class="flex items-center">
                                         <svg
-                                            class="shrink-0 w-6 h-6 mr-1.5 block stroke-apricot-peach-400 {{ !$booth->is_approved ? 'stroke-gray-900 dark:stroke-gray-100 hover:stroke-gray-500' : '' }}"
-                                            xlmns="http://www.w3.org/2000/svg" viewbox="0 0 23 23" fill="none"
+                                            class="shrink-0 w-6 h-6 mr-1.5 block stroke-apricot-peach-400 {{ !$booth->is_approved ? 'stroke-gray-900 dark:stroke-white' : '' }}"
+                                            xmlns="http://www.w3.org/2000/svg" viewBox="0 0 23 23" fill="none"
                                             aria-hidden="true">
-                                            <path
-                                                d="M13.5 21v-7.5a.75.75 0 01.75-.75h3a.75.75 0 01.75.75V21m-4.5 0H2.36m11.14 0H18m0 0h3.64m-1.39 0V9.349m-16.5 11.65V9.35m0 0a3.001 3.001 0 003.75-.615A2.993 2.993 0 009.75 9.75c.896 0 1.7-.393 2.25-1.016a2.993 2.993 0 002.25 1.016c.896 0 1.7-.393 2.25-1.016a3.001 3.001 0 003.75.614m-16.5 0a3.004 3.004 0 01-.621-4.72L4.318 3.44A1.5 1.5 0 015.378 3h13.243a1.5 1.5 0 011.06.44l1.19 1.189a3 3 0 01-.621 4.72m-13.5 8.65h3.75a.75.75 0 00.75-.75V13.5a.75.75 0 00-.75-.75H6.75a.75.75 0 00-.75.75v3.75c0 .415.336.75.75.75z"></path>
+                                            <path stroke-linecap="round" stroke-linejoin="round"
+                                                  d="M12 6v6h4.5m4.5 0a9 9 0 11-18 0 9 9 0 0118 0z"></path>
                                         </svg>
-                                        <div class="ml-2 flex-grow">
-                                            <strong>{{$booth->company->name}}</strong>
-                                        </div>
+                                        {{ $booth->created_at->format('d/m/Y') }}
                                     </div>
-                                </div>
-                                <div class="text-sm items-center flex ml-2 dark:text-white">
-                                    <svg
-                                        class="shrink-0 w-6 h-6 mr-1.5 block stroke-apricot-peach-400 {{ !$booth->is_approved ? 'stroke-gray-900 dark:stroke-gray-100 hover:stroke-gray-500' : '' }}"
-                                        xlmns="http://www.w3.org/2000/svg" viewbox="0 0 23 23" fill="none"
-                                        aria-hidden="true">
-                                        <path stroke-linecap="round" stroke-linejoin="round"
-                                              d="M12 6v6h4.5m4.5 0a9 9 0 11-18 0 9 9 0 0118 0z"></path>
-                                    </svg>
-                                    {{$booth->created_at->format('d/m/Y')}}
-                                </div>
-                            </div>
-                        </x-list-section-item>
-                    @empty
-                        <p class="text-crew-400 text-lg justify-center flex m-12">There are currently no new
-                                                                                  booths waiting on approval.</p>
-                    @endforelse
-
+                                </td>
+                            </tr>
+                        @empty
+                            <tr>
+                                <td colspan="3" class="px-4 py-2 text-center text-gray-500 dark:text-gray-300">
+                                    There are currently no booths.
+                                </td>
+                            </tr>
+                        @endforelse
+                        </tbody>
+                    </table>
                     <div class="pt-2">
                         {{ $booths->links() }}
                     </div>
diff --git a/resources/views/crew/booths/show.blade.php b/resources/views/crew/booths/show.blade.php
index fa7018cd..c464e77e 100644
--- a/resources/views/crew/booths/show.blade.php
+++ b/resources/views/crew/booths/show.blade.php
@@ -133,24 +133,36 @@ class="mt-1 text-sm leading-6 text-{{ $booth->is_approved ? 'green-500' : 'yello
                     @if(!$booth->is_approved)
                         @can('approveRequest', $booth)
                             <x-slot name="actions">
-                                <form method="POST" action="{{ route('moderator.booths.approve', $booth) }}"
-                                      class="mr-2">
-                                    @csrf
-                                    <input type="hidden" name="approved" value="1"/>
+                                <div class="flex space-x-2">
                                     <x-button
+                                        onclick="
+                                    Livewire.dispatch('openModal', {
+                                    component: 'confirmation-modal',
+                                        arguments: {
+                                            title: 'Approve booth',
+                                            method: 'POST',
+                                            route: '{{ route('moderator.booths.approve', ['booth' => $booth, 'isApproved' => 1]) }}',
+                                            isApproved: 1,
+                                        }
+                                    })"
                                         class="dark:bg-green-500 bg-green-500 hover:bg-green-600 hover:dark:bg-green-600 active:bg-green-600 active:dark:bg-green-600">
                                         {{ __('Approve') }}
                                     </x-button>
-                                </form>
-                                <form method="POST" action="{{ route('moderator.booths.approve', $booth) }}"
-                                      class="mr-2">
-                                    @csrf
-                                    <input type="hidden" name="approved" value="0"/>
-                                    <x-button
-                                        class="dark:bg-red-500 bg-red-500 hover:bg-red-600 hover:dark:bg-red-600 active:bg-red-600 active:dark:bg-red-600">
+
+                                    <x-danger-button
+                                        onclick="
+                                    Livewire.dispatch('openModal', {
+                                        component: 'confirmation-modal',
+                                        arguments: {
+                                            title: 'Reject booth',
+                                            method: 'POST',
+                                            route: '{{ route('moderator.booths.approve', ['booth' => $booth, 'isApproved' => 0]) }}',
+                                            isApproved: 0,
+                                        }
+                                    })">
                                         {{ __('Reject') }}
-                                    </x-button>
-                                </form>
+                                    </x-danger-button>
+                                </div>
                             </x-slot>
                         @endcan
                     @endif
diff --git a/resources/views/crew/companies/create.blade.php b/resources/views/crew/companies/create.blade.php
index f7d22b13..6a97fd7a 100644
--- a/resources/views/crew/companies/create.blade.php
+++ b/resources/views/crew/companies/create.blade.php
@@ -82,21 +82,27 @@ class="after:content-['*'] after:text-red-500 border-gray-300 dark:border-gray-7
                                 </div>
                                 <x-input-error for="website" class="mt-2"></x-input-error>
                             </div>
+                            <x-section-border/>
                             <div class="col-span-6 sm:col-span-4">
                                 <x-label class="after:content-['*'] after:text-red-500" for="rep_email"
                                          value="{{ __('Company Representative') }}"></x-label>
-                                <x-select name="rep_email" class="mt-1 block w-full">
-                                    <option selected>Select user...</option>
-                                    @foreach(User::forCompanyRep()->get() as $user)
-                                        <option value="{{ $user->email }}">
-                                            {{ $user->name }} | {{ $user->email }}
-                                        </option>
-                                    @endforeach
-                                </x-select>
-                                <span class="text-sm text-gray-600 dark:text-gray-300 py-1">or if they do not have an account yet</span>
-                                <x-input name="rep_new_email" type="email" class="mt-1 block w-full"
-                                         value="{{ old('rep_new_email') }}"></x-input>
-                                <x-input-error for="rep_new_email" class="mt-2"></x-input-error>
+                                <div class="py-2">
+                                    <span class="text-sm text-gray-600 dark:text-gray-300 pt-3 pb-1">If they <b>have registered</b> already: </span>
+                                    <x-select name="rep_email" class="mt-1 block w-full">
+                                        <option selected>Select user...</option>
+                                        @foreach(User::forCompanyRep()->get() as $user)
+                                            <option value="{{ $user->email }}">
+                                                {{ $user->name }} | {{ $user->email }}
+                                            </option>
+                                        @endforeach
+                                    </x-select>
+                                </div>
+                                <div>
+                                    <span class="text-sm text-gray-600 dark:text-gray-300 pt-3 pb-1">or if they <b>do not have an account</b> yet:</span>
+                                    <x-input name="rep_new_email" type="email" class="mt-1 block w-full"
+                                             value="{{ old('rep_new_email') }}" placeholder="john.doe@example.com" ></x-input>
+                                    <x-input-error for="rep_new_email" class="mt-2"></x-input-error>
+                                </div>
                             </div>
                         </div>
                     </x-slot>
diff --git a/resources/views/crew/companies/index.blade.php b/resources/views/crew/companies/index.blade.php
index fd43b0e0..258fcd23 100644
--- a/resources/views/crew/companies/index.blade.php
+++ b/resources/views/crew/companies/index.blade.php
@@ -10,26 +10,39 @@
                     <x-button-link href="{{route('moderator.companies.create')}}">
                         {{ __('Invite a company') }}
                     </x-button-link>
-
-                    {{--<x-button-link href="{{route('teams.create')}}" class="ml-2">
-                        {{__('Create a company')}}
-                    </x-button-link>--}}
                 </x-slot>
 
                 <x-slot name="content">
+                    <table class="min-w-full divide-gray-200 dark:divide-gray-700">
+                        <thead>
+                        <tr>
+                            <th class="px-4 py-2 text-left text-xs font-medium text-gray-500 uppercase tracking-wider dark:text-gray-400">
+                                Company Name
+                            </th>
+                            <th class="px-4 py-2 text-left text-xs font-medium text-gray-500 uppercase tracking-wider dark:text-gray-400">
+                                Company Representative
+                            </th>
+                            <th class="px-4 py-2 text-left text-xs font-medium text-gray-500 uppercase tracking-wider dark:text-gray-400 right-0 sticky w-16">
+                                Created At
+                            </th>
+                        </tr>
+                        </thead>
+                        <tbody class="bg-white dark:bg-gray-800 divide-y-4 divide-white dark:divide-gray-700">
                         @forelse($companies as $index => $company)
-                        <x-list-section-item class="{{ $company->is_approved ? 'border-transparent hover:bg-gray-100 ' : 'bg-apricot-peach-400 bg-opacity-30 dark:bg-opacity-20 border-apricot-peach-300 dark:border-apricot-peach-600 hover:bg-apricot-peach-200 ' }} border-l-4"
-                                :url="route('moderator.companies.show', $company)">
-                                <div class="justify-between flex my-0.5">
+                            <tr class="{{ $company->is_approved ? 'hover:bg-gray-100 dark:hover:bg-gray-700' : 'bg-apricot-peach-400 bg-opacity-30 dark:bg-opacity-20 hover:bg-apricot-peach-200' }} cursor-pointer"
+                                onclick="window.location='{{ route('moderator.companies.show', $company) }}'">
+                                <td class="px-4 py-4 whitespace-nowrap text-gray-700 dark:text-white">
                                     <div class="flex">
                                         <div class="text-gray-700 dark:text-white text-m items-center flex">
                                             @if($company->logo_path)
                                                 <img class="w-6 h-6 mx-auto my-auto max-w-full block dark:text-white"
-                                                     src="{{ url('storage/'. $company->logo_path) }}" alt="Logo of {{$company->name}}">
+                                                     src="{{ url('storage/'. $company->logo_path) }}"
+                                                     alt="Logo of {{$company->name}}">
                                             @else
                                                 <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
                                                      stroke-width="1"
-                                                     stroke="gray" aria-hidden="true" class="w-6 h-6 {{ !$company->is_approved ? 'stroke-gray-900 dark:stroke-white' : 'stroke-apricot-peach-300' }}">
+                                                     stroke="gray" aria-hidden="true"
+                                                     class="w-6 h-6 {{ !$company->is_approved ? 'stroke-gray-900 dark:stroke-white' : 'stroke-apricot-peach-300' }}">
                                                     <path stroke-linecap="round" stroke-linejoin="round"
                                                           d="M2.25 21h19.5m-18-18v18m10.5-18v18m6-13.5V21M6.75 6.75h.75m-.75 3h.75m-.75 3h.75m3-6h.75m-.75 3h.75m-.75 3h.75M6.75 21v-3.375c0-.621.504-1.125 1.125-1.125h2.25c.621 0 1.125.504 1.125 1.125V21M3 3h12m-.75 4.5H21m-3.75 3.75h.008v.008h-.008v-.008zm0 3h.008v.008h-.008v-.008zm0 3h.008v.008h-.008v-.008z"/>
                                                 </svg>
@@ -41,24 +54,36 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="text-sm items-center flex ml-2 dark:text-white">
-                                        <svg class="shrink-0 w-6 h-6 mr-1.5 block stroke-apricot-peach-400 {{ !$company->is_approved ? 'stroke-gray-900 dark:stroke-white' : '' }}" xlmns="http://www.w3.org/2000/svg" viewbox="0 0 23 23" fill="none" aria-hidden="true">
-                                            <path stroke-linecap="round" stroke-linejoin="round" d="M12 6v6h4.5m4.5 0a9 9 0 11-18 0 9 9 0 0118 0z"></path>
+                                </td>
+                                <td class="px-4 py-2 whitespace-nowrap text-sm text-gray-500 dark:text-gray-300">
+                                    {{ optional($company->representative)->name }}
+                                </td>
+                                <td class="px-4 py-2 whitespace-nowrap text-sm text-gray-700 dark:text-white">
+                                    <div class="flex items-center">
+                                        <svg
+                                            class="shrink-0 w-6 h-6 mr-1.5 block stroke-apricot-peach-400 {{ !$company->is_approved ? 'stroke-gray-900 dark:stroke-white' : '' }}"
+                                            xmlns="http://www.w3.org/2000/svg" viewBox="0 0 23 23" fill="none"
+                                            aria-hidden="true">
+                                            <path stroke-linecap="round" stroke-linejoin="round"
+                                                  d="M12 6v6h4.5m4.5 0a9 9 0 11-18 0 9 9 0 0118 0z"></path>
                                         </svg>
-                                        {{$company->created_at->format('d/m/Y')}}
+                                        {{ $company->created_at->format('d/m/Y') }}
                                     </div>
-                                </div>
-                            </x-list-section-item>
+                                </td>
+                            </tr>
                         @empty
-                            <p class="text-crew-400 text-lg justify-center flex m-12">There are currently no new presentations waiting on approval.</p>
+                            <tr>
+                                <td colspan="3" class="px-4 py-2 text-center text-gray-500 dark:text-gray-300">
+                                    There are currently no companies.
+                                </td>
+                            </tr>
                         @endforelse
-
+                        </tbody>
+                    </table>
                     <div class="pt-2">
                         {{ $companies->links() }}
                     </div>
-
                 </x-slot>
-
             </x-list-section>
         </div>
     </div>
diff --git a/resources/views/crew/companies/show.blade.php b/resources/views/crew/companies/show.blade.php
index 65393b78..939bc27b 100644
--- a/resources/views/crew/companies/show.blade.php
+++ b/resources/views/crew/companies/show.blade.php
@@ -38,8 +38,9 @@
                         </div>
                     </div>
                     <div class="text-gray-800 pt-3 dark:text-gray-200">
-                        <span class="font-semibold">Website:</span> <a class="underline text-apricot-peach-400 hover:text-apricot-peach-500"
-                            href="http://{{$company->website}}">{{ $company->website }}</a>
+                        <span class="font-semibold">Website:</span> <a
+                            class="underline text-apricot-peach-400 hover:text-apricot-peach-500"
+                            href="{{$company->website}}">{{ $company->website }}</a>
                     </div>
                     <div class="text-gray-800 pt-3 dark:text-gray-200">
                         <span class="font-semibold">Description:</span> {{ $company->description }}
@@ -115,17 +116,58 @@
 
                 <x-slot name="content">
                     <div class="text-gray-800 dark:text-gray-200">
-                        @forelse($company->users as $user)
-                            {{ $user->name }} | {{ $user->email }}
-                            @if($company->representative->id == $user->id)
-                                              (Company representative)
-                            @endif
-                            <br>
-                        @empty
-                            {{ __('There are currently no users in this company') }}
-                        @endforelse
+                        <ul class="space-y-3">
+                            @forelse($company->users as $user)
+                                <li class="flex items-center p-3 bg-gray-50 dark:bg-gray-800 rounded-md shadow-sm">
+                                    <!-- Profile Image -->
+                                    <img src="{{ $user->profile_photo_url }}" alt="{{ $user->name }}"
+                                         class="w-10 h-10 rounded-full object-cover mr-3">
+
+                                    <!-- User Information -->
+                                    <div class="flex-1">
+                                        <div class="font-semibold text-base">
+                                            {{ $user->name }}
+                                        </div>
+                                        <div class="text-xs text-gray-500 dark:text-gray-400">
+                                            {{ $user->email }}
+                                        </div>
+                                        <!-- User Roles -->
+                                        @if($user->roles->isNotEmpty())
+                                            <div class="text-xs text-gray-400 dark:text-gray-500 mt-1">
+                                                {{ __('Roles: ') }}{{ optional($user->mainRoles())->join(', ') }}
+                                            </div>
+                                        @endif
+                                    </div>
+
+                                    <!-- Company Representative Badge -->
+                                    @if($company->representative->id == $user->id)
+                                        <span
+                                            class="ml-3 px-2 py-0.5 bg-green-500 text-white text-xs font-bold rounded-md">
+                                {{ __('Company Representative') }}
+                            </span>
+                                    @endif
+                                </li>
+                            @empty
+                                <li class="text-sm text-gray-500 dark:text-gray-400">
+                                    {{ __('There are currently no users in this company.') }}
+                                </li>
+                            @endforelse
+                        </ul>
                     </div>
                 </x-slot>
+                @can('addMember', $company)
+                    <x-slot name="actions">
+                        @if ($company->is_approved)
+                            <x-button onclick="Livewire.dispatch('openModal', { component: 'company.add-participant', arguments: {companyId: {{$company->id}}} })">
+                                {{ __('Add Participant') }}
+                            </x-button>
+                        @else
+                            <div>
+                                <p class="text-sm text-gray-700 dark:text-gray-100">The company must be approved before adding participants.</p>
+                            </div>
+                        @endif
+                    </x-slot>
+                @endcan
             </x-action-section>
 
             <x-section-border/>
@@ -150,24 +192,36 @@ class="mt-1 text-sm leading-6 text-{{ $company->is_approved ? 'green-500' : 'yel
                     @can('approveRequest', $company)
                         @if(!$company->is_approved)
                             <x-slot name="actions">
-                                <form method="POST" action="{{ route('moderator.companies.approve', $company) }}"
-                                      class="mr-2">
-                                    @csrf
-                                    <input type="hidden" name="approved" value="1"/>
+                                <div class="flex space-x-2">
                                     <x-button
+                                        onclick="
+                                    Livewire.dispatch('openModal', {
+                                    component: 'confirmation-modal',
+                                        arguments: {
+                                            title: 'Approve company',
+                                            method: 'POST',
+                                            route: '{{ route('moderator.companies.approve', ['company' => $company, 'isApproved' => 1]) }}',
+                                            isApproved: 1,
+                                        }
+                                    })"
                                         class="dark:bg-green-500 bg-green-500 hover:bg-green-600 hover:dark:bg-green-600 active:bg-green-600 active:dark:bg-green-600">
                                         {{ __('Approve') }}
                                     </x-button>
-                                </form>
-                                <form method="POST" action="{{ route('moderator.companies.approve', $company) }}"
-                                      class="mr-2">
-                                    @csrf
-                                    <input type="hidden" name="approved" value="0"/>
-                                    <x-button
-                                        class="dark:bg-red-500 bg-red-500 hover:bg-red-600 hover:dark:bg-red-600 active:bg-red-600 active:dark:bg-red-600">
+
+                                    <x-danger-button
+                                        onclick="
+                                    Livewire.dispatch('openModal', {
+                                        component: 'confirmation-modal',
+                                        arguments: {
+                                            title: 'Reject company',
+                                            method: 'POST',
+                                            route: '{{ route('moderator.companies.approve', ['company' => $company, 'isApproved' => 0]) }}',
+                                            isApproved: 0,
+                                        }
+                                    })">
                                         {{ __('Reject') }}
-                                    </x-button>
-                                </form>
+                                    </x-danger-button>
+                                </div>
                             </x-slot>
                         @endif
                     @endcan
@@ -209,6 +263,45 @@ class="underline" href="{{route('moderator.booths.show', $company->booth)}}">See
                 <x-section-border/>
             @endcan
 
+            <x-action-section>
+                <x-slot name="title">
+                    Company Presentations
+                </x-slot>
+
+                <x-slot name="description">
+                    View all presentations related to the company
+                </x-slot>
+
+                <x-slot name="content">
+                        <div class="space-y-2">
+                            @forelse($company->presentations as $presentation)
+                                <a href="{{route('moderator.presentations.show', $presentation)}}"
+                                   class="block bg-white dark:bg-gray-700 p-4 borde rounded-lg shadow-sm hover:bg-gray-50 dark:hover:bg-gray-600 transition duration-300">
+                                    <div class="flex items-center">
+                                        <div class="flex-shrink-0">
+                                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                                                 stroke-width="1.5" stroke="#E77A50"
+                                                 aria-hidden="true" class="w-6 h-6">
+                                                <path stroke-linecap="round" stroke-linejoin="round"
+                                                      d="M3.75 3v11.25A2.25 2.25 0 006 16.5h2.25M3.75 3h-1.5m1.5 0h16.5m0 0h1.5m-1.5 0v11.25A2.25 2.25 0 0118 16.5h-2.25m-7.5 0h7.5m-7.5 0l-1 3m8.5-3l1 3m0 0l.5 1.5m-.5-1.5h-9.5m0 0l-.5 1.5M9 11.25v1.5M12 9v3.75m3-6v6"/>
+                                            </svg>
+                                        </div>
+                                        <div class="ml-4">
+                                            <h4 class="text-sm font-semibold">{{ $presentation->name }}</h4>
+                                            <p class="text-xs text-gray-600 dark:text-gray-400">Hosted
+                                                                                                by: {{ $presentation->speakers_name }}</p>
+                                        </div>
+                                    </div>
+                                </a>
+                            @empty
+                                <p>The company has no presentations currently.</p>
+                            @endforelse
+                        </div>
+                </x-slot>
+            </x-action-section>
+
+            <x-section-border/>
+
             <x-action-section>
                 <x-slot name="title">
                     {{ __('Company Sponsorship Status') }}
diff --git a/resources/views/crew/editions/index.blade.php b/resources/views/crew/editions/index.blade.php
index 28e88157..b2e0dacd 100644
--- a/resources/views/crew/editions/index.blade.php
+++ b/resources/views/crew/editions/index.blade.php
@@ -15,64 +15,77 @@
                     </x-button-link>
                 </x-slot>
                 <x-slot name="content">
-                    @forelse($editions as $edition)
-                        <x-list-section-item
-                            class="border-transparent hover:bg-gray-100 border-l-4">
-                            <a href="{{ route('moderator.editions.show', $edition) }}" class="block w-full">
-                                <div class="flex justify-between mt-2">
-                                    <div class="flex">
-                                        <div class="text-gray-700 dark:text-white text-m items-center flex">
-                                            <svg
-                                                class="shrink-0 w-6 h-6 mr-1.5 block stroke-apricot-peach-400"
-                                                xlmns="http://www.w3.org/2000/svg" viewbox="0 0 23 23" fill="none"
-                                                aria-hidden="true">
-                                                <path
-                                                    d="M3.75 9.776c.112-.017.227-.026.344-.026h15.812c.117 0 .232.009.344.026m-16.5 0a2.25 2.25 0 0 0-1.883 2.542l.857 6a2.25 2.25 0 0 0 2.227 1.932H19.05a2.25 2.25 0 0 0 2.227-1.932l.857-6a2.25 2.25 0 0 0-1.883-2.542m-16.5 0V6A2.25 2.25 0 0 1 6 3.75h3.879a1.5 1.5 0 0 1 1.06.44l2.122 2.12a1.5 1.5 0 0 0 1.06.44H18A2.25 2.25 0 0 1 20.25 9v.776" />                                                </svg>
-                                            <div class="ml-2 flex-grow">
-                                                <div class="flex gap-4 items-center">
-                                                    <strong>{{ $edition->name }}</strong>
-                                                    @if (Edition::current() && Edition::current()->id == $edition->id)
-                                                        <div
-                                                            class="px-3 py-1 border rounded-full border-emerald-400 border-dashed text-xs font-montserrat text-emerald-400 tracking-wider">
-                                                            ACTIVE
-                                                        </div>
-                                                    @endif
-                                                </div>
-                                                <span
-                                                    class="text-sm text-gray-500">
-                                                        {{ $edition->displayed_state }}
-                                                    </span>
+                    <table class="table-fixed min-w-full divide-gray-200 dark:divide-gray-700">
+                        <thead>
+                        <tr>
+                            <th class="px-4 py-2 text-left text-xs font-medium text-gray-500 uppercase tracking-wider dark:text-gray-400">
+                                Edition
+                            </th>
+                            <th class="px-4 py-2 text-left text-xs font-medium text-gray-500 uppercase tracking-wider dark:text-gray-400">
+                                Date
+                            </th>
+                        </tr>
+                        </thead>
+                        <tbody class="bg-white dark:bg-gray-800 divide-y-4 divide-white dark:divide-gray-700">
+                        @forelse($editions as $edition)
+                            <tr class="hover:bg-gray-100 dark:hover:bg-gray-700 cursor-pointer"
+                                onclick="window.location='{{ route('moderator.editions.show', $edition) }}'">
+                                <td class="px-4 py-4 whitespace-nowrap text-gray-700 dark:text-white">
+                                    <div class="text-gray-700 dark:text-white text-m items-center flex">
+                                        <svg
+                                            class="shrink-0 w-6 h-6 mr-1.5 block stroke-apricot-peach-400"
+                                            xlmns="http://www.w3.org/2000/svg" viewbox="0 0 23 23" fill="none"
+                                            aria-hidden="true">
+                                            <path
+                                                d="M3.75 9.776c.112-.017.227-.026.344-.026h15.812c.117 0 .232.009.344.026m-16.5 0a2.25 2.25 0 0 0-1.883 2.542l.857 6a2.25 2.25 0 0 0 2.227 1.932H19.05a2.25 2.25 0 0 0 2.227-1.932l.857-6a2.25 2.25 0 0 0-1.883-2.542m-16.5 0V6A2.25 2.25 0 0 1 6 3.75h3.879a1.5 1.5 0 0 1 1.06.44l2.122 2.12a1.5 1.5 0 0 0 1.06.44H18A2.25 2.25 0 0 1 20.25 9v.776"/>
+                                        </svg>
+                                        <div class="ml-2 flex-grow">
+                                            <div class="flex gap-4 items-center">
+                                                <strong>{{ $edition->name }}</strong>
+                                                @if (Edition::current() && Edition::current()->id == $edition->id)
+                                                    <div
+                                                        class="px-3 py-1 border rounded-full border-emerald-400 border-dashed text-xs font-montserrat text-emerald-400 tracking-wider">
+                                                        ACTIVE
+                                                    </div>
+                                                @endif
                                             </div>
+                                            <span
+                                                class="text-sm text-gray-500">
+                                                        {{ $edition->displayed_state }}
+                                            </span>
                                         </div>
                                     </div>
-                                    <div class="text-sm items-center flex gap-8 ml-2 dark:text-white">
-                                        <div class="flex items-center min-w-max">
-                                            <svg
-                                                class="shrink-0 w-6 h-6 mr-1.5 block stroke-apricot-peach-400"
-                                                xlmns="http://www.w3.org/2000/svg" viewbox="0 0 23 23" fill="none"
-                                                aria-hidden="true">
-                                                <path stroke-linecap="round" stroke-linejoin="round"
-                                                      d="M12 6v6h4.5m4.5 0a9 9 0 11-18 0 9 9 0 0118 0z"></path>
-                                            </svg>
-                                            <div class="flex">
-                                                @if (!$edition->start_at || !$edition->end_at)
-                                                    TBD
-                                                @else
-                                                    {{ $edition->start_at->format('d-m-Y H:i') }}
-                                                    —
-                                                    {{ $edition->end_at->format('d-m-Y H:i') }}
-                                                @endif
-                                            </div>
+                                </td>
+                                <td class="px-4 py-2 whitespace-nowrap text-sm text-gray-700 dark:text-white">
+                                    <div class="flex items-center min-w-max">
+                                        <svg
+                                            class="shrink-0 w-6 h-6 mr-1.5 block stroke-apricot-peach-400"
+                                            xlmns="http://www.w3.org/2000/svg" viewbox="0 0 23 23" fill="none"
+                                            aria-hidden="true">
+                                            <path stroke-linecap="round" stroke-linejoin="round"
+                                                  d="M12 6v6h4.5m4.5 0a9 9 0 11-18 0 9 9 0 0118 0z"></path>
+                                        </svg>
+                                        <div class="flex">
+                                            @if (!$edition->start_at || !$edition->end_at)
+                                                TBD
+                                            @else
+                                                {{ $edition->start_at->format('d-m-Y H:i') }}
+                                                —
+                                                {{ $edition->end_at->format('d-m-Y H:i') }}
+                                            @endif
                                         </div>
                                     </div>
-                                </div>
-                            </a>
-                        </x-list-section-item>
-                    @empty
-                        <p class="text-apricot-peach-400 text-lg justify-center flex m-12">
-                            There are currently no editions
-                        </p>
-                    @endforelse
+                                </td>
+                            </tr>
+                        @empty
+                            <tr>
+                                <td colspan="3" class="px-4 py-2 text-center text-gray-500 dark:text-gray-300">
+                                    There are currently no editions.
+                                </td>
+                            </tr>
+                        @endforelse
+                        </tbody>
+                    </table>
                 </x-slot>
             </x-list-section>
         </div>
diff --git a/resources/views/crew/faqs/index.blade.php b/resources/views/crew/faqs/index.blade.php
index 978db00f..da0674b5 100644
--- a/resources/views/crew/faqs/index.blade.php
+++ b/resources/views/crew/faqs/index.blade.php
@@ -13,36 +13,57 @@
                     </x-slot>
                 @endcan
                 <x-slot name="content">
-                    @forelse($faqs as $index => $faq)
-                        <x-list-section-item
-                            class="border-transparent hover:bg-gray-100 border-l-4"
-                            :url="route('moderator.faqs.show', $faq)">
-                            <div class="justify-between flex mt-2">
-                                <div class="flex">
-                                    <div class="text-gray-700 dark:text-white text-m items-center flex">
-                                        <svg class="shrink-0 w-6 h-6 mr-1.5 block stroke-apricot-peach-400" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-6">
-                                            <path stroke-linecap="round" stroke-linejoin="round" d="M9.879 7.519c1.171-1.025 3.071-1.025 4.242 0 1.172 1.025 1.172 2.687 0 3.712-.203.179-.43.326-.67.442-.745.361-1.45.999-1.45 1.827v.75M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Zm-9 5.25h.008v.008H12v-.008Z" />
-                                        </svg>
-                                        <div class="ml-2 flex-grow">
-                                            <strong>{{$faq->question}}</strong>
+                    <table class="table-fixed min-w-full divide-gray-200 dark:divide-gray-700">
+                        <thead>
+                        <tr>
+                            <th class="px-4 py-2 text-left text-xs font-medium text-gray-500 uppercase tracking-wider dark:text-gray-400">
+                                Frequently Asked Question
+                            </th>
+                            <th class="px-4 py-2 text-left text-xs font-medium text-gray-500 uppercase tracking-wider dark:text-gray-400 right-0 sticky w-16">
+                                Created At
+                            </th>
+                        </tr>
+                        </thead>
+                        <tbody class="bg-white dark:bg-gray-800 divide-y-4 divide-white dark:divide-gray-700">
+                        @forelse($faqs as $index => $faq)
+                            <tr class="hover:bg-gray-100 dark:hover:bg-gray-700 cursor-pointer"
+                                onclick="window.location='{{ route('moderator.faqs.show', $faq) }}'">
+                                <td class="px-4 py-4 whitespace-nowrap text-gray-700 dark:text-white">
+                                    <div class="flex">
+                                        <div class="flex">
+                                            <div class="text-gray-700 dark:text-white text-m items-center flex">
+                                                <svg class="shrink-0 w-6 h-6 mr-1.5 block stroke-apricot-peach-400" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
+                                                    <path stroke-linecap="round" stroke-linejoin="round" d="M9.879 7.519c1.171-1.025 3.071-1.025 4.242 0 1.172 1.025 1.172 2.687 0 3.712-.203.179-.43.326-.67.442-.745.361-1.45.999-1.45 1.827v.75M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Zm-9 5.25h.008v.008H12v-.008Z" />
+                                                </svg>
+                                                <div class="ml-2 flex-grow">
+                                                    <strong>{{$faq->question}}</strong>
+                                                </div>
+                                            </div>
                                         </div>
                                     </div>
-                                </div>
-                                <div class="text-sm items-center flex ml-2 dark:text-white">
-                                    <svg
-                                        class="shrink-0 w-6 h-6 mr-1.5 block stroke-apricot-peach-400"
-                                        xlmns="http://www.w3.org/2000/svg" viewbox="0 0 23 23" fill="none"
-                                        aria-hidden="true">
-                                        <path stroke-linecap="round" stroke-linejoin="round"
-                                              d="M12 6v6h4.5m4.5 0a9 9 0 11-18 0 9 9 0 0118 0z"></path>
-                                    </svg>
-                                    {{$faq->created_at->format('d/m/Y')}}
-                                </div>
-                            </div>
-                        </x-list-section-item>
-                    @empty
-                        <p class="text-crew-400 text-lg justify-center flex m-12">There are currently no FAQs</p>
-                    @endforelse
+                                </td>
+                                <td class="px-4 py-2 whitespace-nowrap text-sm text-gray-700 dark:text-white">
+                                    <div class="flex items-center">
+                                        <svg
+                                            class="shrink-0 w-6 h-6 mr-1.5 block stroke-apricot-peach-400"
+                                            xmlns="http://www.w3.org/2000/svg" viewBox="0 0 23 23" fill="none"
+                                            aria-hidden="true">
+                                            <path stroke-linecap="round" stroke-linejoin="round"
+                                                  d="M12 6v6h4.5m4.5 0a9 9 0 11-18 0 9 9 0 0118 0z"></path>
+                                        </svg>
+                                        {{ $faq->created_at->format('d/m/Y') }}
+                                    </div>
+                                </td>
+                            </tr>
+                        @empty
+                            <tr>
+                                <td colspan="3" class="px-4 py-2 text-center text-gray-500 dark:text-gray-300">
+                                    There are currently no FAQs.
+                                </td>
+                            </tr>
+                        @endforelse
+                        </tbody>
+                    </table>
                 </x-slot>
             </x-list-section>
         </div>
diff --git a/resources/views/crew/presentations/index.blade.php b/resources/views/crew/presentations/index.blade.php
index c6fd0eda..ca504df7 100644
--- a/resources/views/crew/presentations/index.blade.php
+++ b/resources/views/crew/presentations/index.blade.php
@@ -11,47 +11,63 @@
                     </x-button-link>
                 </x-slot>
                 <x-slot name="content">
-                    <ul role="list">
+                    <table class="min-w-full divide-gray-200 dark:divide-gray-700">
+                        <thead>
+                        <tr>
+                            <th class="px-4 py-2 text-left text-xs font-medium text-gray-500 uppercase tracking-wider dark:text-gray-400">
+                                Presentation Name
+                            </th>
+                            <th class="px-4 py-2 text-left text-xs font-medium text-gray-500 uppercase tracking-wider dark:text-gray-400">
+                                Company
+                            </th>
+                            <th class="px-4 py-2 text-left text-xs font-medium text-gray-500 uppercase tracking-wider dark:text-gray-400 right-0 sticky w-16">
+                                Created At
+                            </th>
+                        </tr>
+                        </thead>
+                        <tbody class="bg-white dark:bg-gray-800 divide-y-4 divide-white dark:divide-gray-700">
                         @forelse($presentations as $index => $presentation)
-                            <x-list-section-item class="{{ $presentation->is_approved ? 'border-transparent hover:bg-gray-100 ' : 'bg-apricot-peach-400 bg-opacity-30 dark:bg-opacity-20 border-apricot-peach-300 dark:border-apricot-peach-600 hover:bg-apricot-peach-200 ' }} border-l-4">
-                            <a href="{{route('moderator.presentations.show', $presentation)}}" class="block">
-                                    <div class="justify-between flex mt-2">
-                                        <div class="flex">
-                                            <div class="text-gray-700 dark:text-white text-m items-center flex">
-                                                <svg
-                                                    class="shrink-0 w-6 h-6 mr-1.5 block stroke-apricot-peach-300 {{ !$presentation->is_approved ? 'stroke-gray-900 dark:stroke-white' : 'stroke-apricot-peach-300' }}"
-                                                    xlmns="http://www.w3.org/2000/svg" viewbox="0 0 23 23" fill="none"
-                                                    aria-hidden="true">
-                                                    <path
-                                                        d="M3.75 3v11.25A2.25 2.25 0 006 16.5h2.25M3.75 3h-1.5m1.5 0h16.5m0 0h1.5m-1.5 0v11.25A2.25 2.25 0 0118 16.5h-2.25m-7.5 0h7.5m-7.5 0l-1 3m8.5-3l1 3m0 0l.5 1.5m-.5-1.5h-9.5m0 0l-.5 1.5M9 11.25v1.5M12 9v3.75m3-6v6"></path>
-                                                </svg>
-                                                <div class="ml-2 flex-grow">
-                                                    <strong>{{$presentation->name}}</strong>
-                                                    <br/>
-                                                    <span
-                                                        class="text-sm text-gray-500">{{ $presentation->speakernames }}</span>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div class="text-sm items-center flex ml-2 dark:text-white">
-                                            <svg
-                                                class="shrink-0 w-6 h-6 mr-1.5 block stroke-apricot-peach-400 {{ !$presentation->is_approved ? 'stroke-gray-900 dark:stroke-white' : '' }}"
-                                                xlmns="http://www.w3.org/2000/svg" viewbox="0 0 23 23" fill="none"
-                                                aria-hidden="true">
-                                                <path stroke-linecap="round" stroke-linejoin="round"
-                                                      d="M12 6v6h4.5m4.5 0a9 9 0 11-18 0 9 9 0 0118 0z"></path>
-                                            </svg>
-                                            {{$presentation->created_at->format('d/m/Y')}}
+                            <tr class="{{ $presentation->is_approved ? 'hover:bg-gray-100 dark:hover:bg-gray-700' : 'bg-apricot-peach-400 bg-opacity-30 dark:bg-opacity-20 hover:bg-apricot-peach-200' }} cursor-pointer"
+                                onclick="window.location='{{ route('moderator.presentations.show', $presentation) }}'">
+                                <td class="px-4 py-4 whitespace-nowrap text-gray-700 dark:text-white">
+                                    <div class="flex items-center">
+                                        <svg
+                                            class="shrink-0 w-6 h-6 mr-1.5 block stroke-apricot-peach-300 {{ !$presentation->is_approved ? 'stroke-gray-900 dark:stroke-white' : 'stroke-apricot-peach-300' }}"
+                                            xmlns="http://www.w3.org/2000/svg" viewBox="0 0 23 23" fill="none"
+                                            aria-hidden="true">
+                                            <path
+                                                d="M3.75 3v11.25A2.25 2.25 0 006 16.5h2.25M3.75 3h-1.5m1.5 0h16.5m0 0h1.5m-1.5 0v11.25A2.25 2.25 0 0118 16.5h-2.25m-7.5 0h7.5m-7.5 0l-1 3m8.5-3l1 3m0 0l.5 1.5m-.5-1.5h-9.5m0 0l-.5 1.5M9 11.25v1.5M12 9v3.75m3-6v6"></path>
+                                        </svg>
+                                        <div class="ml-2">
+                                            <strong>{{ $presentation->name }}</strong>
                                         </div>
                                     </div>
-                                </a>
-                            </x-list-section-item>
+                                </td>
+                                <td class="px-4 py-2 whitespace-nowrap text-sm text-gray-500 dark:text-gray-300">
+                                    {{ optional($presentation->company)->name }}
+                                </td>
+                                <td class="px-4 py-2 whitespace-nowrap text-sm text-gray-700 dark:text-white">
+                                    <div class="flex items-center">
+                                        <svg
+                                            class="shrink-0 w-6 h-6 mr-1.5 block stroke-apricot-peach-400 {{ !$presentation->is_approved ? 'stroke-gray-900 dark:stroke-white' : '' }}"
+                                            xmlns="http://www.w3.org/2000/svg" viewBox="0 0 23 23" fill="none"
+                                            aria-hidden="true">
+                                            <path stroke-linecap="round" stroke-linejoin="round"
+                                                  d="M12 6v6h4.5m4.5 0a9 9 0 11-18 0 9 9 0 0118 0z"></path>
+                                        </svg>
+                                        {{ $presentation->created_at->format('d/m/Y') }}
+                                    </div>
+                                </td>
+                            </tr>
                         @empty
-                            <p class="text-crew-400 text-lg justify-center flex m-12">There are currently no new
-                                                                                      presentations waiting on
-                                                                                      approval.</p>
+                            <tr>
+                                <td colspan="3" class="px-4 py-2 text-center text-gray-500 dark:text-gray-300">
+                                    There are currently no new presentations waiting on approval.
+                                </td>
+                            </tr>
                         @endforelse
-                    </ul>
+                        </tbody>
+                    </table>
                     <div class="pt-2">
                         {{ $presentations->links() }}
                     </div>
diff --git a/resources/views/crew/presentations/show.blade.php b/resources/views/crew/presentations/show.blade.php
index 875e8423..dded495c 100644
--- a/resources/views/crew/presentations/show.blade.php
+++ b/resources/views/crew/presentations/show.blade.php
@@ -121,26 +121,36 @@ class="mt-1 text-sm leading-6 text-{{ $presentation->is_approved ? 'green-500' :
                     @can('approve', $presentation)
                         @if(!$presentation->is_approved)
                             <x-slot name="actions">
-                                <form method="POST"
-                                      action="{{ route('moderator.presentations.approve', $presentation) }}"
-                                      class="mr-2">
-                                    @csrf
-                                    <input type="hidden" name="approved" value="1"/>
+                                <div class="flex space-x-2">
                                     <x-button
+                                        onclick="
+                                    Livewire.dispatch('openModal', {
+                                    component: 'confirmation-modal',
+                                        arguments: {
+                                            title: 'Approve presentation',
+                                            method: 'POST',
+                                            route: '{{ route('moderator.presentations.approve', ['presentation' => $presentation, 'isApproved' => 1]) }}',
+                                            isApproved: 1,
+                                        }
+                                    })"
                                         class="dark:bg-green-500 bg-green-500 hover:bg-green-600 hover:dark:bg-green-600 active:bg-green-600 active:dark:bg-green-600">
                                         {{ __('Approve') }}
                                     </x-button>
-                                </form>
-                                <form method="POST"
-                                      action="{{ route('moderator.presentations.approve', $presentation) }}"
-                                      class="mr-2">
-                                    @csrf
-                                    <input type="hidden" name="approved" value="0"/>
-                                    <x-button
-                                        class="dark:bg-red-500 bg-red-500 hover:bg-red-600 hover:dark:bg-red-600 active:bg-red-600 active:dark:bg-red-600">
+
+                                    <x-danger-button
+                                        onclick="
+                                    Livewire.dispatch('openModal', {
+                                        component: 'confirmation-modal',
+                                        arguments: {
+                                            title: 'Reject presentation',
+                                            method: 'POST',
+                                            route: '{{ route('moderator.presentations.approve', ['presentation' => $presentation, 'isApproved' => 0]) }}',
+                                            isApproved: 0,
+                                        }
+                                    })">
                                         {{ __('Reject') }}
-                                    </x-button>
-                                </form>
+                                    </x-danger-button>
+                                </div>
                             </x-slot>
                         @endif
                     @endcan
diff --git a/resources/views/crew/rooms/index.blade.php b/resources/views/crew/rooms/index.blade.php
index aabb9496..dbda695b 100644
--- a/resources/views/crew/rooms/index.blade.php
+++ b/resources/views/crew/rooms/index.blade.php
@@ -13,43 +13,63 @@
                     </x-slot>
                 @endcan
                 <x-slot name="content">
-                    @forelse($rooms as $index => $room)
-                        <x-list-section-item
-                            class="border-transparent hover:bg-gray-100 border-l-4"
-                            :url="route('moderator.rooms.show', $room)">
-                            <div class="justify-between flex mt-2">
-                                <div class="flex">
-                                    <div class="text-gray-700 dark:text-white text-m items-center flex">
+                    <table class="table-fixed min-w-full divide-gray-200 dark:divide-gray-700">
+                        <thead>
+                        <tr>
+                            <th class="px-4 py-2 text-left text-xs font-medium text-gray-500 uppercase tracking-wider dark:text-gray-400">
+                                Room Name
+                            </th>
+                            <th class="px-4 py-2 text-left text-xs font-medium text-gray-500 uppercase tracking-wider right-0 sticky w-16 dark:text-gray-400">
+                                Created At
+                            </th>
+                        </tr>
+                        </thead>
+                        <tbody class="bg-white dark:bg-gray-800 divide-y-4 divide-white dark:divide-gray-700">
+                        @forelse($rooms as $index => $room)
+                            <tr class="hover:bg-gray-100 dark:hover:bg-gray-700 cursor-pointer"
+                                onclick="window.location='{{ route('moderator.rooms.show', $room) }}'">
+                                <td class="px-4 py-4 whitespace-nowrap text-gray-700 dark:text-white">
+                                    <div class="flex">
+                                        <div class="flex">
+                                            <div class="text-gray-700 dark:text-white text-m items-center flex">
+                                                <svg
+                                                    class="shrink-0 w-6 h-6 mr-1.5 block stroke-apricot-peach-400"
+                                                    xlmns="http://www.w3.org/2000/svg" viewbox="0 0 23 23" fill="none"
+                                                    aria-hidden="true">
+                                                    <path stroke-linecap="round" stroke-linejoin="round"
+                                                          d="M19.5 10.5c0 7.142-7.5 11.25-7.5 11.25S4.5 17.642 4.5 10.5a7.5 7.5 0 1115 0z"/>
+                                                    <path
+                                                        d="M15 10.5a3 3 0 11-6 0 3 3 0 016 0z"></path>
+                                                </svg>
+                                                <div class="ml-2 flex-grow">
+                                                    <strong>{{$room->name}}</strong>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </td>
+                                <td class="px-4 py-2 whitespace-nowrap text-sm text-gray-700 dark:text-white right-0 sticky ">
+                                    <div class="flex items-center">
                                         <svg
                                             class="shrink-0 w-6 h-6 mr-1.5 block stroke-apricot-peach-400"
-                                            xlmns="http://www.w3.org/2000/svg" viewbox="0 0 23 23" fill="none"
+                                            xmlns="http://www.w3.org/2000/svg" viewBox="0 0 23 23" fill="none"
                                             aria-hidden="true">
                                             <path stroke-linecap="round" stroke-linejoin="round"
-                                                  d="M19.5 10.5c0 7.142-7.5 11.25-7.5 11.25S4.5 17.642 4.5 10.5a7.5 7.5 0 1115 0z"/>
-                                            <path
-                                                d="M15 10.5a3 3 0 11-6 0 3 3 0 016 0z"></path>
+                                                  d="M12 6v6h4.5m4.5 0a9 9 0 11-18 0 9 9 0 0118 0z"></path>
                                         </svg>
-                                        <div class="ml-2 flex-grow">
-                                            <strong>{{$room->name}}</strong>
-                                        </div>
+                                        {{ $room->created_at->format('d/m/Y') }}
                                     </div>
-                                </div>
-                                <div class="text-sm items-center flex ml-2 dark:text-white">
-                                    <svg
-                                        class="shrink-0 w-6 h-6 mr-1.5 block stroke-apricot-peach-400"
-                                        xlmns="http://www.w3.org/2000/svg" viewbox="0 0 23 23" fill="none"
-                                        aria-hidden="true">
-                                        <path stroke-linecap="round" stroke-linejoin="round"
-                                              d="M12 6v6h4.5m4.5 0a9 9 0 11-18 0 9 9 0 0118 0z"></path>
-                                    </svg>
-                                    {{$room->created_at->format('d/m/Y')}}
-                                </div>
-                            </div>
-                        </x-list-section-item>
-                    @empty
-                        <p class="text-crew-400 text-lg justify-center flex m-12">There are currently no rooms</p>
-                    @endforelse
-
+                                </td>
+                            </tr>
+                        @empty
+                            <tr>
+                                <td colspan="3" class="px-4 py-2 text-center text-gray-500 dark:text-gray-300">
+                                    There are currently no rooms.
+                                </td>
+                            </tr>
+                        @endforelse
+                        </tbody>
+                    </table>
                 </x-slot>
             </x-list-section>
         </div>
diff --git a/resources/views/crew/rooms/show.blade.php b/resources/views/crew/rooms/show.blade.php
index db220c32..35522f7d 100644
--- a/resources/views/crew/rooms/show.blade.php
+++ b/resources/views/crew/rooms/show.blade.php
@@ -36,7 +36,7 @@
 
         <x-section-border/>
 
-        @can('delete', \App\Models\Room::class)
+        @can('delete', $room)
             <x-action-section>
                 <x-slot name="title">
                     {{ __('Delete Room') }}
diff --git a/resources/views/crew/sponsorships/index.blade.php b/resources/views/crew/sponsorships/index.blade.php
index 2deba821..ad2038f3 100644
--- a/resources/views/crew/sponsorships/index.blade.php
+++ b/resources/views/crew/sponsorships/index.blade.php
@@ -18,47 +18,64 @@
                     @endcan
                 @endif
                 <x-slot name="content">
-                    @forelse($companies as $index => $company)
-                        <x-list-section-item class="{{ $company->is_sponsorship_approved ? 'border-transparent hover:bg-gray-100 ' : 'bg-apricot-peach-400 bg-opacity-30 dark:bg-opacity-20 border-apricot-peach-300 dark:border-apricot-peach-600 hover:bg-apricot-peach-200 ' }} border-l-4"
-                            :url="route('moderator.sponsorships.show', $company)">
-                            <div class="justify-between flex mt-2">
-                                <div class="flex">
-                                    <div class="text-gray-700 dark:text-white text-m items-center flex">
-                                        @if($company->logo_path)
-                                            <img class="w-6 h-6 mx-auto my-auto max-w-full block dark:text-white"
-                                                 src="{{ url('storage/'. $company->logo_path) }}"
-                                                 alt="Logo of {{$company->name}}">
-                                        @else
-                                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
-                                                 stroke-width="1"
-                                                 stroke="gray" aria-hidden="true" class="w-6 h-6 {{$company->is_sponsorship_approved ? 'stroke-apricot-peach-300' : 'stroke-gray-800'}}">
-                                                <path stroke-linecap="round" stroke-linejoin="round"
-                                                      d="M2.25 21h19.5m-18-18v18m10.5-18v18m6-13.5V21M6.75 6.75h.75m-.75 3h.75m-.75 3h.75m3-6h.75m-.75 3h.75m-.75 3h.75M6.75 21v-3.375c0-.621.504-1.125 1.125-1.125h2.25c.621 0 1.125.504 1.125 1.125V21M3 3h12m-.75 4.5H21m-3.75 3.75h.008v.008h-.008v-.008zm0 3h.008v.008h-.008v-.008zm0 3h.008v.008h-.008v-.008z"/>
-                                            </svg>
-
-                                        @endif
-                                        <div class="ml-2 flex-grow">
-                                            <strong>{{$company->name}}</strong>
+                    <table class="min-w-full divide-gray-200 dark:divide-gray-700">
+                        <thead>
+                        <tr>
+                            <th class="px-4 py-2 text-left text-xs font-medium text-gray-500 uppercase tracking-wider dark:text-gray-400">
+                                Company Name
+                            </th>
+                            <th class="px-4 py-2 text-left text-xs font-medium text-gray-500 uppercase tracking-wider dark:text-gray-400 right-0 sticky w-16">
+                                Created At
+                            </th>
+                        </tr>
+                        </thead>
+                        <tbody class="bg-white dark:bg-gray-800 divide-y-4 divide-white dark:divide-gray-700">
+                        @forelse($companies as $index => $company)
+                            <tr class="{{ $company->is_sponsorship_approved ? 'hover:bg-gray-100 dark:hover:bg-gray-700' : 'bg-apricot-peach-400 bg-opacity-30 dark:bg-opacity-20 hover:bg-apricot-peach-200' }} cursor-pointer"
+                                onclick="window.location='{{ route('moderator.sponsorships.show', $company) }}'">
+                                <td class="px-4 py-4 whitespace-nowrap text-gray-700 dark:text-white">
+                                    <div class="flex">
+                                        <div class="text-gray-700 dark:text-white text-m items-center flex">
+                                            @if($company->logo_path)
+                                                <img class="w-6 h-6 mx-auto my-auto max-w-full block dark:text-white"
+                                                     src="{{ url('storage/'. $company->logo_path) }}"
+                                                     alt="Logo of {{$company->name}}">
+                                            @else
+                                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                                                     stroke-width="1"
+                                                     stroke="gray" aria-hidden="true" class="w-6 h-6 {{$company->is_sponsorship_approved ? 'stroke-apricot-peach-300' : 'stroke-gray-800'}}">
+                                                    <path stroke-linecap="round" stroke-linejoin="round"
+                                                          d="M2.25 21h19.5m-18-18v18m10.5-18v18m6-13.5V21M6.75 6.75h.75m-.75 3h.75m-.75 3h.75m3-6h.75m-.75 3h.75m-.75 3h.75M6.75 21v-3.375c0-.621.504-1.125 1.125-1.125h2.25c.621 0 1.125.504 1.125 1.125V21M3 3h12m-.75 4.5H21m-3.75 3.75h.008v.008h-.008v-.008zm0 3h.008v.008h-.008v-.008zm0 3h.008v.008h-.008v-.008z"/>
+                                                </svg>
+                                            @endif
+                                            <div class="ml-2 flex-grow">
+                                                <strong>{{$company->name}}</strong>
+                                            </div>
                                         </div>
                                     </div>
-                                </div>
-                                <div class="text-sm items-center flex ml-2 dark:text-white">
-                                    <svg
-                                        class="shrink-0 w-6 h-6 mr-1.5 block stroke-apricot-peach-400 {{ !$company->is_sponsorship_approved ? 'stroke-gray-900 dark:stroke-white' : ''  }}"
-                                        xlmns="http://www.w3.org/2000/svg" viewbox="0 0 23 23" fill="none"
-                                        aria-hidden="true">
-                                        <path stroke-linecap="round" stroke-linejoin="round"
-                                              d="M12 6v6h4.5m4.5 0a9 9 0 11-18 0 9 9 0 0118 0z"></path>
-                                    </svg>
-                                    {{$company->created_at->format('d/m/Y')}}
-                                </div>
-                            </div>
-                        </x-list-section-item>
-                    @empty
-                        <p class="text-crew-400 text-lg justify-center flex m-12">There are currently no new
-                                                                                  presentations waiting on approval.</p>
-                    @endforelse
-
+                                </td>
+                                <td class="px-4 py-2 whitespace-nowrap text-sm text-gray-700 dark:text-white">
+                                    <div class="flex items-center">
+                                        <svg
+                                            class="shrink-0 w-6 h-6 mr-1.5 block stroke-apricot-peach-400 {{ !$company->is_sponsorship_approved ? 'stroke-gray-900 dark:stroke-white' : '' }}"
+                                            xmlns="http://www.w3.org/2000/svg" viewBox="0 0 23 23" fill="none"
+                                            aria-hidden="true">
+                                            <path stroke-linecap="round" stroke-linejoin="round"
+                                                  d="M12 6v6h4.5m4.5 0a9 9 0 11-18 0 9 9 0 0118 0z"></path>
+                                        </svg>
+                                        {{ $company->created_at->format('d/m/Y') }}
+                                    </div>
+                                </td>
+                            </tr>
+                        @empty
+                            <tr>
+                                <td colspan="3" class="px-4 py-2 text-center text-gray-500 dark:text-gray-300">
+                                    There are currently no sponsorships.
+                                </td>
+                            </tr>
+                        @endforelse
+                        </tbody>
+                    </table>
                     <div class="pt-2">
                         {{ $companies->links() }}
                     </div>
diff --git a/resources/views/crew/sponsorships/show.blade.php b/resources/views/crew/sponsorships/show.blade.php
index 1de4f82f..609d8303 100644
--- a/resources/views/crew/sponsorships/show.blade.php
+++ b/resources/views/crew/sponsorships/show.blade.php
@@ -83,24 +83,36 @@ class="mt-1 text-sm leading-6 text-{{ $company->is_sponsorship_approved ? 'green
 
                     @if(!$company->is_sponsorship_approved)
                         <x-slot name="actions">
-                            <form method="POST" action="{{ route('moderator.sponsorships.approve', $company) }}"
-                                  class="mr-2">
-                                @csrf
-                                <input type="hidden" name="approved" value="1"/>
+                            <div class="flex space-x-2">
                                 <x-button
+                                    onclick="
+                                    Livewire.dispatch('openModal', {
+                                    component: 'confirmation-modal',
+                                        arguments: {
+                                            title: 'Approve sponsorship',
+                                            method: 'POST',
+                                            route: '{{ route('moderator.sponsorships.approve', ['company' => $company, 'isApproved' => 1]) }}',
+                                            isApproved: 1,
+                                        }
+                                    })"
                                     class="dark:bg-green-500 bg-green-500 hover:bg-green-600 hover:dark:bg-green-600 active:bg-green-600 active:dark:bg-green-600">
                                     {{ __('Approve') }}
                                 </x-button>
-                            </form>
-                            <form method="POST" action="{{ route('moderator.sponsorships.approve', $company) }}"
-                                  class="mr-2">
-                                @csrf
-                                <input type="hidden" name="approved" value="0"/>
-                                <x-button
-                                    class="dark:bg-red-500 bg-red-500 hover:bg-red-600 hover:dark:bg-red-600 active:bg-red-600 active:dark:bg-red-600">
+
+                                <x-danger-button
+                                    onclick="
+                                    Livewire.dispatch('openModal', {
+                                    component: 'confirmation-modal',
+                                        arguments: {
+                                            title: 'Reject sponsorship',
+                                            method: 'POST',
+                                            route: '{{ route('moderator.sponsorships.approve', ['company' => $company, 'isApproved' => 0]) }}',
+                                            isApproved: 0,
+                                        }
+                                    })">
                                     {{ __('Reject') }}
-                                </x-button>
-                            </form>
+                                </x-danger-button>
+                            </div>
                         </x-slot>
                     @endif
                 </x-action-section>
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 24f9ca2d..6766f17a 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -125,6 +125,7 @@ class="bg-gradient-to-br from-gradient-light-blue via-gradient-light-pink to-gra
             </div>
         </footer>
     @endif
+    <x-toaster-hub />
 
     @stack('modals')
     @stack('scripts')
diff --git a/resources/views/livewire/booth/create-booth.blade.php b/resources/views/livewire/booth/create-booth.blade.php
new file mode 100644
index 00000000..93b9b25c
--- /dev/null
+++ b/resources/views/livewire/booth/create-booth.blade.php
@@ -0,0 +1,111 @@
+@php
+    use App\Models\Company;
+@endphp
+
+<form wire:submit="save">
+    @csrf
+    <x-action-section>
+        <x-slot name="title">
+            {{ __('Booth details') }}
+        </x-slot>
+        <x-slot name="description">
+            <div class="space-y-4 text-gray-800 dark:text-gray-200 text-sm">
+                <p>Add manually the booth for an already registered company.</p>
+                <p class="mt-4">Total area sized mentioned in the sponsor packages:</p>
+                <ul class="list-disc ml-6">
+                    <li>Bronze & Silver - 8 m<sup>2</sup></li>
+                    <li>Golden - 12 m<sup>2</sup></li>
+                </ul>
+            </div>
+        </x-slot>
+        <x-slot name="content">
+            <div class="pr-5">
+                <div class="col-span-6 sm:col-span-4 ">
+                    <x-label for="company_id" class="after:content-['*'] after:text-red-500"
+                             value="{{ __('Company name') }}"></x-label>
+                    <x-select wire:model="companyId" name="company_id" class="mt-1 block w-full">
+                        @foreach(Company::whereDoesntHave('booth')
+                                    ->where('is_approved', '=', '1')->get() as $company)
+                            <option value="{{ $company->id }}">
+                                {{$company->name}}
+                                @if($company->sponsorship)
+                                    ({{ucfirst($company->sponsorship->name)}} sponsor)
+                                @endif
+                            </option>
+                        @endforeach
+                    </x-select>
+                    @error('company')  <p class="mt-2 text-red-500"> {{$message}} </p> @enderror
+                </div>
+                <div class="col-span-6 sm:col-span-4 pt-3">
+                    <x-label for="width" class="after:content-['*'] after:text-red-500"
+                             value="{{ __('Width') }}"></x-label>
+                    <x-input wire:model="width" name="width" type="number" step="0.1" min="1" class="mt-1 block w-full"></x-input>
+                    @error('width')  <p class="mt-2 text-red-500"> {{$message}} </p> @enderror
+                </div>
+                <div class="col-span-6 sm:col-span-4 pt-3">
+                    <x-label for="length" class="after:content-['*'] after:text-red-500"
+                             value="{{ __('Length') }}"></x-label>
+                    <x-input wire:model="length" name="length" step="0.1" min="1" type="number" class="mt-1 block w-full"></x-input>
+                    @error('length')  <p class="mt-2 text-red-500"> {{$message}} </p> @enderror
+                </div>
+                <div class="col-span-6 sm:col-span-4 pt-3">
+                    <x-label for="additionalInformation" value="{{ __('Additional information') }}"></x-label>
+                    <textarea wire:model="additionalInformation" maxlength="255"
+                              class="border-gray-300 dark:border-gray-700 dark:bg-gray-900 dark:text-gray-300 focus:border-indigo-500 dark:focus:border-indigo-600 focus:ring-indigo-500 dark:focus:ring-indigo-600 rounded-md shadow-sm block mt-1 w-full"
+                              name="description"
+                    ></textarea>
+                    @error('additionalInformation')  <p class="mt-2 text-red-500"> {{$message}} </p> @enderror
+                </div>
+                <div class="mt-4">
+                    <div>
+                        <x-label for="booth_owner" class="after:content-['*'] after:text-red-500"
+                                 value="{{ __('Choose company member to become the booth owner') }}"></x-label>
+                        <div>
+                            <input
+                                class="w-full border-gray-300 dark:border-gray-700 dark:bg-gray-900 dark:text-gray-300 focus:border-apricot-peach-500 dark:focus:border-apricot-peach-600 focus:ring-apricot-peach-500 dark:focus:ring-apricot-peach-600 rounded-md shadow-sm mt-1 block"
+                                type="text" maxlength="255" wire:focus="toggleDropdown"
+                                wire:model.live="searchValue">
+                            <div class="{{$isDropdownVisible ? 'block' : 'hidden'}} max-h-48 rounded overflow-auto bg-white dark:bg-gray-900">
+                                <ul>
+                                    @if($users)
+                                        @forelse($users as $user)
+                                            <li wire:click="selectUser({{$user->id}})" wire:key="{{$user->id}}"
+                                                class="hover:cursor-pointer w-full" onclick="event.stopPropagation()">
+                                                <div
+                                                    class="bg-white hover:bg-gray-100 dark:bg-gray-800 shadow rounded-md p-2 flex items-center space-x-3">
+                                                    <img class="h-8 w-8 rounded-full flex-shrink-0" src="{{ $user->profile_photo_url }}"
+                                                         alt="{{ $user->name }}">
+                                                    <div class="flex-1 min-w-0">
+                                                        <p class="text-sm font-medium text-gray-900 dark:text-gray-100 truncate">{{ $user->name }}</p>
+                                                        <p class="text-xs text-gray-500 dark:text-gray-400 truncate">{{ $user->email }}</p>
+                                                    </div>
+                                                </div>
+                                            </li>
+                                        @empty
+                                            <li class="py-2">
+                                                <p class="text-sm font-medium text-gray-700 dark:text-gray-100 truncate">No results
+                                                                                                                         found.</p>
+                                            </li>
+                                        @endforelse
+                                    @endif
+                                </ul>
+                            </div>
+                        </div>
+                        @if($selectedUser && !$isDropdownVisible)
+                            <span
+                                class="text-xs text-crew-400 dark:text-crew-200">The user already has the following roles: {{ $selectedUser->allRoles->implode(',') }}</span>
+                        @endif
+                        @error('selectedUser')  <p class="mt-2 text-red-500"> {{$message}} </p> @enderror
+                    </div>
+                </div>
+            </div>
+        </x-slot>
+        <x-slot name="actions">
+            <x-button
+                type="submit"
+                class="dark:bg-green-500 bg-green-500 hover:bg-green-600 hover:dark:bg-green-600 active:bg-green-600 active:dark:bg-green-600">
+                Save
+            </x-button>
+        </x-slot>
+    </x-action-section>
+</form>
diff --git a/resources/views/livewire/company/add-participant.blade.php b/resources/views/livewire/company/add-participant.blade.php
new file mode 100644
index 00000000..7bcea0cb
--- /dev/null
+++ b/resources/views/livewire/company/add-participant.blade.php
@@ -0,0 +1,67 @@
+<x-livewire-modal form-action="save">
+    <x-slot name="title" class="dark:bg-gray-900 border-gray-800">
+        Add already registered participant to {{$company->name}}
+    </x-slot>
+
+    <x-slot name="description" class="dark:bg-gray-800">
+        {{ __('Here you can add the participant to the company.') }}
+    </x-slot>
+
+    <x-slot name="content" class="w-full dark:bg-gray-800">
+        <div>
+            <x-label for="name" class="after:content-['*'] after:text-red-500"
+                     value="{{ __('Choose user') }}"></x-label>
+            <div>
+                <input
+                    class="w-full border-apricot-peach-300 dark:border-apricot-peach-700 dark:bg-gray-900 dark:text-gray-300 focus:border-apricot-peach-500 dark:focus:border-apricot-peach-600 focus:ring-apricot-peach-500 dark:focus:ring-apricot-peach-600 rounded-md shadow-sm mt-1 block"
+                    type="text" maxlength="255" wire:focus="toggleDropdown"
+                    wire:model.live="searchValue">
+                <div class="{{$isDropdownVisible ? 'block' : 'hidden'}} max-h-48 overflow-auto bg-white">
+                    <ul>
+                        @forelse($users as $user)
+                            <li wire:click="selectUser({{$user->id}})" wire:key="{{$user->id}}"
+                                class="hover:cursor-pointer w-full" onclick="event.stopPropagation()">
+                                <div
+                                    class="bg-white hover:bg-gray-100 dark:bg-gray-800 shadow rounded-md p-2 flex items-center space-x-3">
+                                    <img class="h-8 w-8 rounded-full flex-shrink-0" src="{{ $user->profile_photo_url }}"
+                                         alt="{{ $user->name }}">
+                                    <div class="flex-1 min-w-0">
+                                        <p class="text-sm font-medium text-gray-900 dark:text-gray-100 truncate">{{ $user->name }}</p>
+                                        <p class="text-xs text-gray-500 dark:text-gray-400 truncate">{{ $user->email }}</p>
+                                    </div>
+                                </div>
+                            </li>
+                        @empty
+                            <li class="py-2">
+                                <p class="text-sm font-medium text-gray-700 dark:text-gray-100 truncate">No results
+                                                                                                         found.</p>
+                            </li>
+                        @endforelse
+                    </ul>
+                </div>
+            </div>
+        </div>
+        <div>
+            @if($canAssignRole)
+                <x-label for="company_role" class="after:content-['*'] after:text-red-500"
+                         value="{{ __('Select company role') }}"></x-label>
+                <x-select wire:model="assignedRole" name="company_role" class="mt-1 block w-full">
+                    <option selected value="company member">Company member</option>
+                    <option value="pending speaker">Speaker</option>
+                    <option value="pending booth owner">Booth owner</option>
+                </x-select>
+            @elseif($selectedUser)
+                <p class="text-sm font-medium text-apricot-peach-500 dark:text-apricot-peach-200 text-wrap truncate">The user already has presentation associated with them, therefore their role is automatically determined as <b>speaker</b></p>
+            @endif
+        </div>
+    </x-slot>
+    <x-slot name="buttons" class="dark:bg-gray-900">
+        <x-secondary-button type="button" wire:click="$dispatch('closeModal')" class="mr-3">
+            {{ __('Cancel') }}
+        </x-secondary-button>
+        <button type="submit" {{$selectedUser ?? 'disabled'}}
+                class="inline-flex items-center px-4 py-2 bg-gray-800 dark:bg-gray-200 border border-transparent rounded-md font-semibold text-xs text-white dark:text-gray-800 uppercase tracking-widest hover:bg-gray-700 dark:hover:bg-white focus:bg-gray-700 dark:focus:bg-white active:bg-gray-900 dark:active:bg-gray-300 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 dark:focus:ring-offset-gray-800 transition ease-in-out duration-150">
+            Save
+        </button>
+    </x-slot>
+</x-livewire-modal>
diff --git a/resources/views/livewire/confirmation-modal.blade.php b/resources/views/livewire/confirmation-modal.blade.php
new file mode 100644
index 00000000..731322c9
--- /dev/null
+++ b/resources/views/livewire/confirmation-modal.blade.php
@@ -0,0 +1,29 @@
+<x-livewire-modal>
+    <x-slot name="title">
+        {{$title}}?
+    </x-slot>
+
+    <x-slot name="content">
+        <h3 class="font-bold text-red-600">{{ __('WARNING: this action cannot be undone') }}</h3>
+    </x-slot>
+
+    <x-slot name="buttons">
+        <x-secondary-button wire:click="$dispatch('closeModal')">
+            {{ __('Cancel') }}
+        </x-secondary-button>
+
+        <form method="POST" action="{{ $route }}" class="pl-2">
+            @csrf
+            @method($method)
+            @if($isApproved)
+                <x-button class="dark:bg-green-500 bg-green-500 hover:bg-green-600 hover:dark:bg-green-600 active:bg-green-600 active:dark:bg-green-600 ml-3" type="submit">
+                    {{ $callToAction ?? $title }}
+                </x-button>
+            @else
+                <x-danger-button class="ml-3" type="submit">
+                    {{ $callToAction ?? $title }}
+                </x-danger-button>
+            @endif
+        </form>
+    </x-slot>
+</x-livewire-modal>
diff --git a/resources/views/livewire/registration/select-country-code.blade.php b/resources/views/livewire/registration/select-country-code.blade.php
index 98c71a45..435d3922 100644
--- a/resources/views/livewire/registration/select-country-code.blade.php
+++ b/resources/views/livewire/registration/select-country-code.blade.php
@@ -1,10 +1,10 @@
-<div class="relative font-[sans-serif] flex items-center">
+<div class="relative font-[sans-serif] flex items-center pt-1">
     <div class="relative"> <!-- Add this wrapper for the dropdown-related elements -->
         <button type="button" id="dropdownToggle" wire:click="toggleDropdown"
-                class="px-5 py-2.5 rounded text-[#333] text-sm border bg-white dark:bg-gray-900 dark:text-gray-50 border-gray-300 border-gray-800 outline-none hover:bg-indigo-50 flex items-center">
+                class="px-5 py-2.5 rounded-md text-[#333] text-sm border bg-white dark:bg-gray-900 dark:text-gray-50 border-gray-300 dark:border-gray-700 outline-none hover:bg-indigo-50 flex items-center">
             <span class="flag-icon {{current($selected)}} mr-3"></span>
             {{key($selected)}}
-            <svg xmlns="http://www.w3.org/2000/svg" class="w-3 fill-[#333] ml-3" viewBox="0 0 24 24">
+            <svg xmlns="http://www.w3.org/2000/svg" class="w-3 fill-[#333] dark:fill-gray-300 ml-3" viewBox="0 0 24 24">
                 <path fill-rule="evenodd"
                       d="M11.99997 18.1669a2.38 2.38 0 0 1-1.68266-.69733l-9.52-9.52a2.38 2.38 0 1 1 3.36532-3.36532l7.83734 7.83734 7.83734-7.83734a2.38 2.38 0 1 1 3.36532 3.36532l-9.52 9.52a2.38 2.38 0 0 1-1.68266.69734z"
                       clip-rule="evenodd" data-original="#000000" />
diff --git a/resources/views/livewire/schedule/grid-parent-component.blade.php b/resources/views/livewire/schedule/grid-parent-component.blade.php
index af890f92..636d93ec 100644
--- a/resources/views/livewire/schedule/grid-parent-component.blade.php
+++ b/resources/views/livewire/schedule/grid-parent-component.blade.php
@@ -15,7 +15,8 @@ class="flex overflow-x-auto overflow-y-hidden py-2.5">
                                     @dragstart="dragStart"
                                     data-id="{{ $presentation->id }}"
                                     data-room="0"
-                                    class="p-2 h-20 bg-crew-100 rounded shadow hover:bg-crew-200 cursor-pointer dark:bg-crew-400/50 dark:hover:bg-crew-400/70">
+                                    class="p-2 h-20 rounded shadow cursor-pointer
+                                    {{!optional(App\Models\Edition::current())->is_final_programme_released ? "bg-crew-200 hover:bg-crew-200 dark:bg-crew-400/50 dark:hover:bg-crew-400/70" : "bg-red-400 hover:bg-red-400 dark:bg-red-800/50 dark:hover:bg-red-800/50"}}">
                                     <div class="grid grid-cols-1">
                                     <span class="col-span-1">
                                         {{ $presentation->displayName(20) }}
@@ -53,8 +54,9 @@ class="p-2 text-center text-sm rounded dark:text-gray-100">
                                     @dragstart="dragStart"
                                     data-id="{{ $presentation->id }}"
                                     data-room="0"
-                                    class="p-2 h-20 bg-apricot-peach-200 rounded shadow hover:bg-apricot-peach-300 cursor-pointer dark:bg-apricot-peach-700/50 dark:hover:bg-apricot-peach-600/75">
-                                    <div class="grid grid-cols-1">
+                                    class="p-2 h-20 rounded shadow cursor-pointer
+                                    {{!optional(App\Models\Edition::current())->is_final_programme_released ? "bg-apricot-peach-200 hover:bg-apricot-peach-300 dark:bg-apricot-peach-700/50 dark:hover:bg-apricot-peach-600/75" : "bg-red-400 hover:bg-red-400 dark:bg-red-800/50 dark:hover:bg-red-800/50"}}">
+                                <div class="grid grid-cols-1">
                                     <span class="col-span-1">
                                         {{ $presentation->displayName(20) }}
                                     </span>
diff --git a/resources/views/programme/show.blade.php b/resources/views/programme/show.blade.php
index 304ddacb..f8099724 100644
--- a/resources/views/programme/show.blade.php
+++ b/resources/views/programme/show.blade.php
@@ -1,5 +1,6 @@
 @php
     use Carbon\Carbon;
+    use App\Models\Edition;
 @endphp
 
 <x-app-layout>
@@ -70,48 +71,50 @@ class="text-yellow-500 flex transititext-primary text-primary transition duratio
                                 - {{ucfirst($presentation->difficulty->level)}}</p>
                         </div>
                     </div>
-                    <div class="mt-5">
-                        <h2 class="text-2xl font-bold">
-                            Place and time
-                        </h2>
-                        <p>Room: {{$presentation->room->name}}</p>
-                        <p>Time: {{Carbon::parse($presentation->timeslot->start)->format('H:i')}}
-                           - {{(Carbon::parse($presentation->timeslot->start)->addMinutes($presentation->timeslot->duration))->format('H:i')}}</p>
-                    </div>
-                    @if(Auth::user())
-                        @can('enroll', $presentation)
-                            <div class="pt-5">
-                                <form action="{{route('my.programme.enroll', $presentation)}}"
-                                      method="POST">
-                                    @csrf
-                                    <button
-                                        class="bg-violet-500 hover:bg-violet-700 transition-all text-lg px-48 py-1 rounded-lg text-white">
-                                        Sign up
-                                    </button>
-                                </form>
-                            </div>
-                        @else
-                            @if(Auth::user()->participating_in->contains($presentation))
+                    @if(optional(Edition::current())->is_final_programme_released)
+                        <div class="mt-5">
+                            <h2 class="text-2xl font-bold">
+                                Place and time
+                            </h2>
+                            <p>Room: {{$presentation->room->name}}</p>
+                            <p>Time: {{Carbon::parse($presentation->timeslot->start)->format('H:i')}}
+                               - {{(Carbon::parse($presentation->timeslot->start)->addMinutes($presentation->timeslot->duration))->format('H:i')}}</p>
+                        </div>
+                        @if(Auth::user())
+                            @can('enroll', $presentation)
                                 <div class="pt-5">
-                                    <form action="{{route('my.programme.disenroll', $presentation)}}"
+                                    <form action="{{route('my.programme.enroll', $presentation)}}"
                                           method="POST">
                                         @csrf
                                         <button
-                                            class="bg-red-500 hover:bg-red-700 transition-all text-lg px-24 py-1 rounded-lg text-white">
-                                            Deregister from presentation
+                                            class="bg-violet-500 hover:bg-violet-700 transition-all text-lg px-48 py-1 rounded-lg text-white">
+                                            Sign up
                                         </button>
                                     </form>
                                 </div>
-                            @elseif(!Auth::user()->presenter_of || (Auth::user()->presenter_of && !Auth::user()->isPresenterOf($presentation)))
-                                <div class="pt-5" data-te-toggle="tooltip"
-                                     title="You cannot sign up because you are already busy during this time.">
-                                    <button
-                                        class="bg-gray-500 cursor-default transition-all text-lg px-48 py-1 rounded-lg text-white">
-                                        Sign up
-                                    </button>
-                                </div>
-                            @endif
-                        @endcan
+                            @else
+                                @if(Auth::user()->participating_in->contains($presentation))
+                                    <div class="pt-5">
+                                        <form action="{{route('my.programme.disenroll', $presentation)}}"
+                                              method="POST">
+                                            @csrf
+                                            <button
+                                                class="bg-red-500 hover:bg-red-700 transition-all text-lg px-24 py-1 rounded-lg text-white">
+                                                Deregister from presentation
+                                            </button>
+                                        </form>
+                                    </div>
+                                @elseif(!Auth::user()->presenter_of || (Auth::user()->presenter_of && !Auth::user()->isPresenterOf($presentation)))
+                                    <div class="pt-5" data-te-toggle="tooltip"
+                                         title="You cannot sign up because you are already busy during this time.">
+                                        <button
+                                            class="bg-gray-500 cursor-default transition-all text-lg px-48 py-1 rounded-lg text-white">
+                                            Sign up
+                                        </button>
+                                    </div>
+                                @endif
+                            @endcan
+                        @endif
                     @endif
                 </div>
             </div>
diff --git a/resources/views/teams/public/index.blade.php b/resources/views/teams/public/index.blade.php
index 44facaca..9845d940 100644
--- a/resources/views/teams/public/index.blade.php
+++ b/resources/views/teams/public/index.blade.php
@@ -72,7 +72,7 @@ class="relative min-h-full bg-white dark:bg-gray-800 rounded-xl shadow-xl overfl
                 @endforeach
             </div>
         @else
-            <div class="bg-white rounded py-2">
+            <div class="bg-white dark:bg-gray-800 rounded py-2">
                 <p class="text-center text-2xl font-bold">
                     There are no companies available right now.
                 </p>
diff --git a/resources/views/teams/public/show.blade.php b/resources/views/teams/public/show.blade.php
index 5f2bc0d0..6e6aa4ee 100644
--- a/resources/views/teams/public/show.blade.php
+++ b/resources/views/teams/public/show.blade.php
@@ -78,7 +78,7 @@ class="bg-white dark:bg-gray-800 rounded-xl shadow-xl overflow-hidden transform
 
                     <div class="mt-5">
                         <h3 class="text-2xl font-semibold">Visit Our Website</h3>
-                        <a href="http://{{ $company->website }}" class="{{$linkColor}} hover:underline">
+                        <a href="{{ $company->website }}" class="{{$linkColor}} hover:underline">
                             {{ $company->website }}
                         </a>
                     </div>
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php
index ccccab56..85b95b4d 100644
--- a/resources/views/welcome.blade.php
+++ b/resources/views/welcome.blade.php
@@ -1,5 +1,6 @@
 @php
     $pageRefreshed = isset($_SERVER['HTTP_CACHE_CONTROL']) &&($_SERVER['HTTP_CACHE_CONTROL'] === 'max-age=0' ||  $_SERVER['HTTP_CACHE_CONTROL'] == 'no-cache');
+    use App\Models\Sponsorship;
 @endphp
 
 @push('scripts')
@@ -46,43 +47,50 @@ class="text-white w-full lg:ml-16 md:w-3/5 font-extrabold text-5xl lg:text-7xl m
                             <h2 class="flex flex-wrap mt-8 uppercase font-bold text-sm gap-12">
                                 <a href="{{ route('companies.index') }}">
                                     View companies
-                                    <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 inline-block ml-1" fill="none"
+                                    <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 inline-block ml-1"
+                                         fill="none"
                                          viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
-                                        <path stroke-linecap="round" stroke-linejoin="round" d="M13 7l5 5m0 0l-5 5m5-5H6"/>
+                                        <path stroke-linecap="round" stroke-linejoin="round"
+                                              d="M13 7l5 5m0 0l-5 5m5-5H6"/>
                                     </svg>
                                 </a>
                                 <a href="{{ route('speakers.index') }}">
                                     View speakers
-                                    <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 inline-block ml-1" fill="none"
+                                    <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 inline-block ml-1"
+                                         fill="none"
                                          viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
-                                        <path stroke-linecap="round" stroke-linejoin="round" d="M13 7l5 5m0 0l-5 5m5-5H6"/>
+                                        <path stroke-linecap="round" stroke-linejoin="round"
+                                              d="M13 7l5 5m0 0l-5 5m5-5H6"/>
                                     </svg>
                                 </a>
                             </h2>
                         @else
-                            <h2 class="flex flex-wrap mt-8 uppercase font-medium text-2xl gap-12">Check back later for updates</h2>
+                            <h2 class="flex flex-wrap mt-8 uppercase font-medium text-2xl gap-12">Check back later for
+                                                                                                  updates</h2>
                         @endif
                         <br>
                         @guest()
                             @if(optional($edition)->is_participant_registration_opened)
-                                <x-button class="mt-4 mr-5">
-                                    <a href="{{route('register.participant')}}">Register as a participant</a>
-                                </x-button>
+                                <x-button-link href="{{route('register.participant')}}" class="mt-4 mr-5">
+                                    Register as a participant
+                                </x-button-link>
                             @endif
                             @if(optional($edition)->is_company_registration_opened)
-                                <x-button class="mt-4">
-                                    <a href="{{route('register.company')}}">Register my company</a>
-                                </x-button>
+                                <x-button-link href="{{route('register.company')}}" class="mt-4 mr-5">
+                                    Register my company
+                                </x-button-link>
                             @endif
                         @endguest
                     </div>
                 </div>
                 <!-- Countdown Timer -->
-                <div class="w-full flex justify-center @if(optional($edition)->is_in_progress) mt-16 @else mt-24 @endif">
+                <div
+                    class="w-full flex justify-center @if(optional($edition)->is_in_progress) mt-16 @else mt-24 @endif">
                     @if ($edition)
                         @if ($edition->is_in_progress)
                             <div class="flex flex-col justify-center items-center">
-                                <p class="font-montserrat uppercase font-medium text-3xl">The conference has officially began!</p>
+                                <p class="font-montserrat uppercase font-medium text-3xl">The conference has officially
+                                                                                          began!</p>
                                 @if(!url()->previous() || $pageRefreshed)
                                     <lottie-player
                                         id="animation"
@@ -174,8 +182,8 @@ class="absolute inset-0 bg-gradient-to-br from-crew-500 to-crew-800 mix-blend-so
                             <div class="relative">
                                 <h2 class="text-2xl font-bold">SPEAKERS</h2>
                                 <p class="mt-4">During the conference you will have the chance to meet and speak to
-                                    our
-                                    speakers.</p>
+                                                our
+                                                speakers.</p>
                             </div>
                         </div>
                     </div>
@@ -200,7 +208,7 @@ class="absolute inset-0 bg-gradient-to-br from-gradient-blue to-participant-500
                             <div class="relative">
                                 <h2 class="text-2xl font-bold">PRESENTATIONS & WORKSHOPS</h2>
                                 <p class="mt-4">During the conference you can visit a lot of different workshops and
-                                    lectures.</p>
+                                                lectures.</p>
                             </div>
                         </div>
                     </div>
@@ -225,93 +233,104 @@ class="absolute inset-0 bg-gradient-to-br from-gradient-purple to-gradient-pink
                             <div class="relative">
                                 <h2 class="text-2xl font-bold">COMPANIES</h2>
                                 <p class="mt-4">During the conference you will have the chance to meet different
-                                    companies.</p>
+                                                companies.</p>
                             </div>
                         </div>
                     </div>
                 </div>
             </div>
-            <div class="relative bg-white dark:bg-gray-900 w-full min-h-32 px-4 py-4">
-
-                <!-- Third banner-->
-                <div>
-                    <h2 class="flex justify-center mt-8 mb-5 uppercase text-3xl font-montserrat font-bold pl-4">A big
-                        thank
-                        you to
-                        our
-                        sponsors</h2>
-                    <div class="flex flex-col mb-4 text-left pl-4">
-                        <div class="text-xl font-montserrat">
-                            <div class="py-10">
-                                <h2 class="text-3xl mb-5 font-semibold">Gold sponsor</h2>
-                                <div class="flex flex-wrap">
-                                    @if(\App\Models\Sponsorship::find(1))
-                                        @foreach(\App\Models\Sponsorship::find(1)->companies as $company)
-                                            <div class="flex items-center justify-start mr-4 mb-4 w-1/2">
-                                                <a href="{{'https://' . $company->website}}"
-                                                   class="bg-gray-50 border h-56 p-5 w-full rounded">
-                                                    @if($company->logo_path)
-                                                        <img
-                                                            class="object-contain h-full w-full block dark:text-white transition ease-in-out hover:saturate-[1.25]"
-                                                            src="{{ url('storage/'. $company->logo_path) }}"
-                                                            alt="Logo of {{$company->name}}">
-                                                    @else
-                                                        <h2 class="text-4xl">{{$company->name}}</h2>
-                                                    @endif
-                                                </a>
-                                            </div>
-                                        @endforeach
-                                    @endif
-                                </div>
-                            </div>
-                            <div class="pb-10">
-                                <h2 class="text-2xl font-semibold mb-5">Silver sponsor</h2>
-                                <div class="flex flex-wrap">
-                                    @if(\App\Models\Sponsorship::find(2))
-                                        @foreach(\App\Models\Sponsorship::find(2)->companies as $company)
-                                            <div class="flex items-center justify-start mr-4 mb-4 w-1/3">
-                                                <a href="{{'https://' . $company->website}}"
-                                                   class="bg-gray-50 border h-44 p-5 w-full rounded">
-                                                    @if($company->logo_path)
-                                                        <img
-                                                            class="object-contain h-full w-full block dark:text-white transition ease-in-out hover:saturate-[1.25]"
-                                                            src="{{ url('storage/'. $company->logo_path) }}"
-                                                            alt="Logo of {{$company->name}}">
-                                                    @else
-                                                        <h2 class="text-4xl">{{$company->name}}</h2>
-                                                    @endif
-                                                </a>
-                                            </div>
-                                        @endforeach
-                                    @endif
-                                </div>
-                            </div>
-                            <div class="pb-10">
-                                <h2 class="text-xl mb-5 font-semibold">Bronze sponsor</h2>
-                                <div class="flex flex-wrap">
-                                    @if(\App\Models\Sponsorship::find(3))
-                                        @foreach(\App\Models\Sponsorship::find(3)->companies as $company)
-                                            <div class="flex items-center justify-start mr-4 mb-4 w-1/4">
-                                                <a href="{{'https://' . $company->website}}"
-                                                   class="bg-gray-50 border h-36 px-5 py-3 w-full rounded">
-                                                    @if($company->logo_path)
-                                                        <img
-                                                            class="object-contain h-full w-full block dark:text-white transition ease-in-out hover:saturate-[1.25]"
-                                                            src="{{ url('storage/'. $company->logo_path) }}"
-                                                            alt="Logo of {{$company->name}}">
-                                                    @else
-                                                        <h2 class="text-4xl">{{$company->name}}</h2>
-                                                    @endif
-                                                </a>
-                                            </div>
-                                        @endforeach
-                                    @endif
-                                </div>
+            <!-- Third banner-->
+            @if(!$anySponsorships)
+                <div class="relative bg-white dark:bg-gray-900 w-full min-h-32 px-4 py-4">
+                    <div>
+                        <h2 class="flex justify-center mt-8 mb-5 uppercase text-3xl font-montserrat font-bold pl-4">
+                            A big thank you to our sponsors
+                        </h2>
+                        <div class="flex flex-col mb-4 text-left pl-4">
+                            <div class="text-xl font-montserrat">
+                                @if(\App\Models\Sponsorship::find(1)->companies()->where('is_sponsorship_approved', true)->count() > 0)
+                                    <div class="py-10">
+                                        <h2 class="text-3xl mb-5 font-semibold">Gold sponsor</h2>
+                                        <div class="flex flex-wrap">
+                                            @foreach(\App\Models\Sponsorship::find(1)->companies as $company)
+                                                @if($company->is_sponsorship_approved)
+                                                    <div class="flex items-center justify-start mr-4 mb-4 w-1/2">
+                                                        <a href="{{$company->website}}"
+                                                           class="bg-gray-50 border h-56 p-5 w-full rounded">
+                                                            @if($company->logo_path)
+                                                                <img
+                                                                    class="object-contain h-full w-full block dark:text-white transition ease-in-out hover:saturate-[1.25]"
+                                                                    src="{{ url('storage/'. $company->logo_path) }}"
+                                                                    alt="Logo of {{$company->name}}">
+                                                            @else
+                                                                <div class="h-full flex text-center items-center justify-center">
+                                                                    <h2 class="text-6xl font-semibold">{{$company->name}}</h2>
+                                                                </div>
+                                                            @endif
+                                                        </a>
+                                                    </div>
+                                                @endif
+                                            @endforeach
+                                        </div>
+                                    </div>
+                                @endif
+                                @if(\App\Models\Sponsorship::find(2)->companies()->where('is_sponsorship_approved', true)->count() > 0)
+                                    <div class="pb-10">
+                                        <h2 class="text-2xl font-semibold mb-5">Silver sponsor</h2>
+                                        <div class="flex flex-wrap">
+                                            @foreach(\App\Models\Sponsorship::find(2)->companies as $company)
+                                                @if($company->is_sponsorship_approved)
+                                                    <div class="flex items-center justify-start mr-4 mb-4 w-1/3">
+                                                        <a href="{{$company->website}}"
+                                                           class="bg-gray-50 border h-44 p-5 w-full rounded">
+                                                            @if($company->logo_path)
+                                                                <img
+                                                                    class="object-contain h-full w-full block dark:text-white transition ease-in-out hover:saturate-[1.25]"
+                                                                    src="{{ url('storage/'. $company->logo_path) }}"
+                                                                    alt="Logo of {{$company->name}}">
+                                                            @else
+                                                                <div class="h-full flex text-center items-center justify-center">
+                                                                    <h2 class="text-5xl font-semibold">{{$company->name}}</h2>
+                                                                </div>
+                                                            @endif
+                                                        </a>
+                                                    </div>
+                                                @endif
+                                            @endforeach
+                                        </div>
+                                    </div>
+                                @endif
+                                @if(\App\Models\Sponsorship::find(3)->companies()->where('is_sponsorship_approved', true)->count() > 0)
+                                    <div class="pb-10">
+                                        <h2 class="text-xl mb-5 font-semibold">Bronze sponsor</h2>
+                                        <div class="flex flex-wrap">
+                                            @foreach(\App\Models\Sponsorship::find(3)->companies as $company)
+                                                @if($company->is_sponsorship_approved)
+                                                    <div class="flex items-center justify-start mr-4 mb-4 w-1/4">
+                                                        <a href="{{$company->website}}"
+                                                           class="bg-gray-50 border h-36 px-5 py-3 w-full rounded">
+                                                            @if($company->logo_path)
+                                                                <img
+                                                                    class="object-contain h-full w-full block dark:text-white transition ease-in-out hover:saturate-[1.25]"
+                                                                    src="{{ url('storage/'. $company->logo_path) }}"
+                                                                    alt="Logo of {{$company->name}}">
+                                                            @else
+                                                                <div class="h-full flex text-center items-center justify-center">
+                                                                    <h2 class="text-3xl font-semibold">{{$company->name}}</h2>
+                                                                </div>
+                                                            @endif
+                                                        </a>
+                                                    </div>
+                                                @endif
+                                            @endforeach
+                                        </div>
+                                    </div>
+                                @endif
                             </div>
                         </div>
                     </div>
                 </div>
-            </div>
+            @endif
             <hr>
         </div>
     </div>
diff --git a/routes/web.php b/routes/web.php
index 771c0c48..cb4eba12 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -60,11 +60,12 @@
 Route::get('/faq', [\App\Http\Controllers\FrequentQuestionController::class, 'index'])->name('faq');
 Route::view('/contact', 'contact')->name('contact');
 
-//Route::get('/teams/{team}/requests', [TeamRequestsController::class, 'index'])->name('teams.requests');
-//
-//Route::get('/companies/{team}', [TeamsController::class, 'show'])->name('companies.show');
-//
-//
+// routes for registering from invitation
+Route::get('/register/team-invitations/{invitation}', [InvitationController::class, 'show'])
+    ->middleware(['signed'])->name('registration.page.via.invitation');
+Route::post('/register/team-invitations/{invitation}', [InvitationController::class, 'register'])
+    ->name('register.via.invitation');
+
 Route::middleware([
     'auth:sanctum',
     config('jetstream.auth_session'),
@@ -88,12 +89,6 @@
     Route::delete('/presentations/{presentation}', [PresentationController::class, 'destroy'])
         ->name('presentations.destroy');
 
-    // routes for registering from invitation
-    Route::get('/register/team-invitations/{invitation}', [InvitationController::class, 'show'])
-        ->middleware(['signed'])->name('registration.page.via.invitation');
-    Route::post('/register/team-invitations/{invitation}', [InvitationController::class, 'register'])
-        ->name('register.via.invitation');
-
     //route for personal programme
     Route::get('/my/programme', [ParticipantController::class, 'programme'])
         ->name('my.programme');
@@ -199,7 +194,7 @@
 
     Route::resource('/moderator/booths', BoothController::class);
     Route::resource('/moderator/faqs', FrequentQuestionController::class);
-    Route::post('/moderator/booths/{booth}/approve', [
+    Route::post('/moderator/booths/{booth}/approve/{isApproved}', [
         App\Http\Controllers\Crew\BoothController::class, 'approve'
     ])->name('booths.approve');
 
@@ -207,7 +202,7 @@
         '/moderator/companies',
         App\Http\Controllers\Crew\CompanyController::class
     );
-    Route::post('/moderator/companies/{company}/approve', [
+    Route::post('/moderator/companies/{company}/approve/{isApproved}', [
         App\Http\Controllers\Crew\CompanyController::class, 'approve'
     ])->name('companies.approve');
 
@@ -215,7 +210,7 @@
         '/moderator/presentations',
         App\Http\Controllers\Crew\PresentationController::class
     );
-    Route::post('/moderator/presentations/{presentation}/approve', [
+    Route::post('/moderator/presentations/{presentation}/approve/{isApproved}', [
         App\Http\Controllers\Crew\PresentationController::class, 'approve'
     ])->name('presentations.approve');
 
@@ -230,7 +225,7 @@
         ->name('sponsorships.store');
     Route::delete('/crew/sponsorships/{company}', [SponsorshipController::class, 'destroy'])
         ->name('sponsorships.delete');
-    Route::post('/crew/sponsorships/{company}/approve', [SponsorshipController::class, 'approve'])
+    Route::post('/crew/sponsorships/{company}/approve/{isApproved}', [SponsorshipController::class, 'approve'])
         ->name('sponsorships.approve');
 
     // ====== Crew routes ========
diff --git a/storage/app/config/permissions.yml b/storage/app/config/permissions.yml
index eefec429..87917df8 100644
--- a/storage/app/config/permissions.yml
+++ b/storage/app/config/permissions.yml
@@ -44,6 +44,7 @@ permissions:
     viewAny: [ event organizer, assistant organizer, company representative, company member, booth owner, pending speaker ]
     update: company representative
     delete: company representative
+    add: event organizer
   company member invitation:
     viewAny: company representative
     create: company representative
diff --git a/tailwind.config.js b/tailwind.config.js
index a5df93b0..2a84a1c4 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -80,6 +80,19 @@ export default {
         'dark:bg-sky-600',
         'dark:bg-red-600',
         'dark:bg-yellow-600',
+        'bg-red-400',
+        'hover:bg-red-400',
+        'dark:bg-red-800/50',
+        'dark:hover:bg-red-800/50',
+        'bg-crew-200',
+        'hover:bg-crew-200',
+        'dark:bg-crew-400/50',
+        'dark:hover:bg-crew-400/70',
+        'bg-apricot-peach-200',
+        'hover:bg-apricot-peach-300',
+        'dark:bg-apricot-peach-700/50',
+        'dark:hover:bg-apricot-peach-600/75'
+
     ],
     theme: {
         extend: {
diff --git a/tests/Feature/BoothControllerTest.php b/tests/Feature/BoothControllerTest.php
index a08ffe03..a6d09c60 100644
--- a/tests/Feature/BoothControllerTest.php
+++ b/tests/Feature/BoothControllerTest.php
@@ -81,43 +81,42 @@ public function create_denies_access_to_participant()
         $response->assertStatus(403);
     }
 
-    /** @test */
-    public function store_saves_and_redirects_to_crew()
-    {
-        $user = User::factory()->create();
-        $user->assignRole('event organizer');
-        $company = Company::factory()->create();
-        $data = [
-            'company_id' => $company->id,
-            'width' => 1,
-            'length' => 2,
-            'additional_information' => 'Sample info'
-        ];
-
-        $response = $this->actingAs($user)->post(route('moderator.booths.store'), $data);
-
-        $response->assertRedirect(route('moderator.booths.index'));
-        $this->assertDatabaseHas('booths', $data);
-    }
-
-    /** @test */
-    public function store_denies_action_to_participant()
-    {
-        $user = User::factory()->create();
-        $user->assignRole('participant');
-        $company = Company::factory()->create();
-        $data = [
-            'company_id' => $company->id,
-            'width' => 10,
-            'length' => 20,
-            'additional_information' => 'Sample info'
-        ];
-
-        $response = $this->actingAs($user)->post(route('moderator.booths.store'), $data);
-
-        $response->assertStatus(403);
-        $this->assertNull($company->booth);
-    }
+    // Currently commented out since the route is unused
+    /*    public function store_saves_and_redirects_to_crew()
+        {
+            $user = User::factory()->create();
+            $user->assignRole('event organizer');
+            $company = Company::factory()->create();
+            $data = [
+                'company_id' => $company->id,
+                'width' => 1,
+                'length' => 2,
+                'additional_information' => 'Sample info'
+            ];
+
+            $response = $this->actingAs($user)->post(route('moderator.booths.store'), $data);
+
+            $response->assertRedirect(route('moderator.booths.index'));
+            $this->assertDatabaseHas('booths', $data);
+        }
+
+        public function store_denies_action_to_participant()
+        {
+            $user = User::factory()->create();
+            $user->assignRole('participant');
+            $company = Company::factory()->create();
+            $data = [
+                'company_id' => $company->id,
+                'width' => 10,
+                'length' => 20,
+                'additional_information' => 'Sample info'
+            ];
+
+            $response = $this->actingAs($user)->post(route('moderator.booths.store'), $data);
+
+            $response->assertStatus(403);
+            $this->assertNull($company->booth);
+        }*/
 
     /** @test */
     public function show_displays_correct_booth_to_crew()
@@ -156,7 +155,7 @@ public function approve_updates_booth_and_redirects_to_crew()
         }))->create();
 
         $response = $this->actingAs($user)
-            ->post(route('moderator.booths.approve', [$company->booth, 'approved' => true]));
+            ->post(route('moderator.booths.approve', [$company->booth, 'isApproved' => true]));
 
         $response->assertRedirect(route('moderator.booths.show', ['booth' => $company->booth]));
         $company->refresh();
@@ -171,7 +170,7 @@ public function approve_denies_action_to_participant()
         $company = Company::factory()->has(Booth::factory(1))->create();
 
         $response = $this->actingAs($user)
-            ->post(route('moderator.booths.approve', [$company->booth, 'approved' => true]));
+            ->post(route('moderator.booths.approve', [$company->booth, 'isApproved' => true]));
 
         $response->assertStatus(403);
         $this->assertEquals(0, $company->booth->is_approved);
diff --git a/tests/Feature/CompanyControllerTest.php b/tests/Feature/CompanyControllerTest.php
index d0baeec8..844ec067 100644
--- a/tests/Feature/CompanyControllerTest.php
+++ b/tests/Feature/CompanyControllerTest.php
@@ -208,9 +208,8 @@ public function event_organizer_can_approve_company()
             $user->assignRole($role);
         }))->create();
 
-        $response = $this->actingAs($user)->post(route('moderator.companies.approve', $company), [
-            'approved' => true
-        ]);
+        $response = $this->actingAs($user)
+            ->post(route('moderator.companies.approve', ['company' => $company, 'isApproved' => 1]));
 
         $response->assertRedirect(route('moderator.companies.show', $company));
         $this->assertDatabaseHas('companies', [
@@ -228,9 +227,8 @@ public function event_organizer_can_reject_company()
             $user->assignRole($role);
         }))->create();
 
-        $response = $this->actingAs($user)->post(route('moderator.companies.approve', $company), [
-            'approved' => false
-        ]);
+        $response = $this->actingAs($user)
+            ->post(route('moderator.companies.approve', ['company' => $company, 'isApproved' => 0]));
 
         $response->assertRedirect(route('moderator.companies.index'));
         $this->assertDatabaseMissing('companies', ['name' => $company->name]);
@@ -244,9 +242,8 @@ public function participant_cannot_approve_or_reject_company()
         $company->is_approved = false;
         $company->save();
 
-        $response = $this->actingAs($user)->post(route('moderator.companies.approve', $company), [
-            'approved' => true
-        ]);
+        $response = $this->actingAs($user)
+            ->post(route('moderator.companies.approve', ['company' => $company, 'isApproved' => true]));
 
         $response->assertStatus(403);
         $this->assertEquals(0, $company->is_approved);
diff --git a/tests/Feature/PresentationControllerTest.php b/tests/Feature/PresentationControllerTest.php
index ca291ff5..a4357ad4 100644
--- a/tests/Feature/PresentationControllerTest.php
+++ b/tests/Feature/PresentationControllerTest.php
@@ -171,7 +171,7 @@ public function event_organizer_can_approve_presentation()
         $presentation = Presentation::factory()->create(['is_approved' => false]);
 
         $response = $this->actingAs($user)
-            ->post(route('moderator.presentations.approve', $presentation), ['approved' => true]);
+            ->post(route('moderator.presentations.approve', ['presentation' => $presentation, 'isApproved' => 1]));
 
         $response->assertRedirect(route('moderator.presentations.show', $presentation));
         $this->assertDatabaseHas('presentations', ['id' => $presentation->id, 'is_approved' => true]);
@@ -184,7 +184,7 @@ public function event_organizer_can_reject_presentation()
         $presentation = Presentation::factory()->create(['is_approved' => true]);
 
         $response = $this->actingAs($user)
-            ->post(route('moderator.presentations.approve', $presentation), ['approved' => false]);
+            ->post(route('moderator.presentations.approve', ['presentation' => $presentation, 'isApproved' => 0]));
 
         $response->assertRedirect(route('moderator.presentations.index'));
         $this->assertDatabaseMissing('presentations', ['id' => $presentation->id, 'is_approved' => false]);
@@ -199,7 +199,7 @@ public function participant_cannot_approve_or_reject_presentation()
         $presentation->save();
 
         $response = $this->actingAs($user)
-            ->post(route('moderator.presentations.approve', $presentation), ['approved' => true]);
+            ->post(route('moderator.presentations.approve', ['presentation' => $presentation, 'isApproved' => 1]));
 
         $response->assertStatus(403);
         $this->assertDatabaseHas('presentations', ['id' => $presentation->id, 'is_approved' => false]);
diff --git a/tests/Feature/SponsorshipControllerTest.php b/tests/Feature/SponsorshipControllerTest.php
index 2a4593a9..a3cdbc4b 100644
--- a/tests/Feature/SponsorshipControllerTest.php
+++ b/tests/Feature/SponsorshipControllerTest.php
@@ -129,7 +129,7 @@ public function event_organizer_can_approve_sponsorship()
         }))->create(['is_approved' => 1,'sponsorship_id' => 1]);
 
         $response = $this->actingAs($user)
-            ->post(route('moderator.sponsorships.approve', $company), ['approved' => true]);
+            ->post(route('moderator.sponsorships.approve', ['company' => $company, 'isApproved' => 1]));
 
         $response->assertRedirect(route('moderator.sponsorships.show', $company));
         $this->assertEquals(1, $company->refresh()->is_sponsorship_approved);
@@ -145,7 +145,7 @@ public function event_organizer_can_reject_sponsorship()
         }))->create(['sponsorship_id' => 1]);
 
         $response = $this->actingAs($user)
-            ->post(route('moderator.sponsorships.approve', $company), ['approved' => false]);
+            ->post(route('moderator.sponsorships.approve', ['company' => $company, 'isApproved' => 0]));
 
         $response->assertRedirect(route('moderator.sponsorships.index'));
         $this->assertNull($company->refresh()->is_sponsorship_approved);
@@ -158,7 +158,7 @@ public function user_cannot_approve_or_reject_sponsorship_without_permission()
         $company = Company::factory()->create(['sponsorship_id' => 1]);
 
         $response = $this->actingAs($user)
-            ->post(route('moderator.sponsorships.approve', $company), ['approved' => true]);
+            ->post(route('moderator.sponsorships.approve', ['company' => $company, 'isApproved' => 1]));
 
         $response->assertStatus(403);
         $this->assertDatabaseHas('companies', ['id' => $company->id]);