diff --git a/app/Http/Livewire/BookCase/CityTable.php b/app/Http/Livewire/BookCase/CityTable.php
index 24a589a2..1ce97f49 100644
--- a/app/Http/Livewire/BookCase/CityTable.php
+++ b/app/Http/Livewire/BookCase/CityTable.php
@@ -8,6 +8,7 @@ use Livewire\Component;
 class CityTable extends Component
 {
     public Country $country;
+
     public function render()
     {
         return view('livewire.book-case.city-table');
diff --git a/app/Http/Livewire/Tables/BookCaseTable.php b/app/Http/Livewire/Tables/BookCaseTable.php
index 7adf7ba2..0b337fd0 100644
--- a/app/Http/Livewire/Tables/BookCaseTable.php
+++ b/app/Http/Livewire/Tables/BookCaseTable.php
@@ -14,6 +14,8 @@ class BookCaseTable extends DataTableComponent
 {
     use Actions;
 
+    public string $country;
+
     public bool $viewingModal = false;
     public $currentModal;
     public array $orangepill = [
@@ -94,7 +96,7 @@ class BookCaseTable extends DataTableComponent
                   )
                   ->html(),
             Column::make('Orange-Pilled', 'orange_pilled')
-                  ->label(fn($row, Column $column) => view('columns.book_cases.oranged-pilled')->withRow($row)),
+                  ->label(fn($row, Column $column) => view('columns.book_cases.oranged-pilled')->withRow($row)->withCountry($this->country))
         ];
     }
 
diff --git a/app/Http/Livewire/Tables/CityTable.php b/app/Http/Livewire/Tables/CityTable.php
index 4f1f7e57..405a770a 100644
--- a/app/Http/Livewire/Tables/CityTable.php
+++ b/app/Http/Livewire/Tables/CityTable.php
@@ -114,6 +114,7 @@ class CityTable extends DataTableComponent
 
         return to_route('bookCases.table.bookcases', [
             '#table',
+            'country' => $this->country,
             'table' => [
                 'filters' => [
                     'byids' => $ids->implode(',')
diff --git a/resources/views/columns/book_cases/oranged-pilled.blade.php b/resources/views/columns/book_cases/oranged-pilled.blade.php
index 0bfc0b1c..b0e7f0e5 100644
--- a/resources/views/columns/book_cases/oranged-pilled.blade.php
+++ b/resources/views/columns/book_cases/oranged-pilled.blade.php
@@ -8,7 +8,7 @@
         @endif
         <div class="flex items-center space-x-1">
             <x-button class="whitespace-nowrap" primary class="text-21gray whitespace-nowrap" wire:click="viewHistoryModal({{ $row->id }})">💊 Orange Pill Now</x-button>
-            <x-button class="whitespace-nowrap" :href="route('bookCases.comment.bookcase', ['bookCase' => $row->id])">Details</x-button>
+            <x-button class="whitespace-nowrap" :href="route('bookCases.comment.bookcase', ['bookCase' => $row->id, 'country' => $country])">Details</x-button>
         </div>
     @else
         <div>
diff --git a/resources/views/livewire/book-case/book-case-table.blade.php b/resources/views/livewire/book-case/book-case-table.blade.php
index 7a3c08e5..4bf8ffc1 100644
--- a/resources/views/livewire/book-case/book-case-table.blade.php
+++ b/resources/views/livewire/book-case/book-case-table.blade.php
@@ -4,7 +4,7 @@
     {{-- MAIN --}}
     <section class="w-full mb-12">
         <div class="max-w-screen-2xl mx-auto px-2 sm:px-10" id="table">
-            <livewire:tables.book-case-table/>
+            <livewire:tables.book-case-table :country="$c"/>
         </div>
     </section>
     {{-- FOOTER --}}
diff --git a/routes/web.php b/routes/web.php
index fc5e097f..acd64b25 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -14,21 +14,21 @@ Route::get('/auth/ln', \App\Http\Livewire\Auth\LNUrlAuth::class)
  * */
 Route::middleware([])
      ->as('school.')
-     ->prefix('school')
+     ->prefix('/{country:code}/school')
      ->group(function () {
-         Route::get('/{country:code}/table/city', \App\Http\Livewire\School\CityTable::class)
+         Route::get('/city', \App\Http\Livewire\School\CityTable::class)
               ->name('table.city');
 
-         Route::get('/{country:code}/table/lecturer', \App\Http\Livewire\School\LecturerTable::class)
+         Route::get('/lecturer', \App\Http\Livewire\School\LecturerTable::class)
               ->name('table.lecturer');
 
-         Route::get('/{country:code}/table/venue', \App\Http\Livewire\School\VenueTable::class)
+         Route::get('/venue', \App\Http\Livewire\School\VenueTable::class)
               ->name('table.venue');
 
-         Route::get('/{country:code}/table/course', \App\Http\Livewire\School\CouseTable::class)
+         Route::get('/course', \App\Http\Livewire\School\CouseTable::class)
               ->name('table.course');
 
-         Route::get('/{country:code}/table/event', \App\Http\Livewire\School\EventTable::class)
+         Route::get('/event', \App\Http\Livewire\School\EventTable::class)
               ->name('table.event');
      });
 
@@ -37,12 +37,12 @@ Route::middleware([])
  * */
 Route::middleware([])
      ->as('library.')
-     ->prefix('library')
+     ->prefix('/{country:code}/library')
      ->group(function () {
-         Route::get('/{country:code}/table/library-item', \App\Http\Livewire\Library\LibraryTable::class)
+         Route::get('/library-item', \App\Http\Livewire\Library\LibraryTable::class)
               ->name('table.libraryItems');
 
-         Route::get('/{country:code}/table/content-creator', \App\Http\Livewire\Library\LibraryTable::class)
+         Route::get('/content-creator', \App\Http\Livewire\Library\LibraryTable::class)
               ->name('table.lecturer');
      });
 
@@ -51,12 +51,12 @@ Route::middleware([])
  * */
 Route::middleware([])
      ->as('bookCases.')
-     ->prefix('book-cases')
+     ->prefix('/{country:code}/book-cases')
      ->group(function () {
-         Route::get('/{country:code}/table/city', \App\Http\Livewire\BookCase\CityTable::class)
+         Route::get('/city', \App\Http\Livewire\BookCase\CityTable::class)
               ->name('table.city');
 
-         Route::get('/table/book-case', \App\Http\Livewire\BookCase\BookCaseTable::class)
+         Route::get('/overview', \App\Http\Livewire\BookCase\BookCaseTable::class)
               ->name('table.bookcases');
 
          Route::get('/book-case/{bookCase}', \App\Http\Livewire\BookCase\CommentBookCase::class)
@@ -68,9 +68,9 @@ Route::middleware([])
  * */
 Route::middleware([])
      ->as('bitcoinEvent.')
-     ->prefix('event')
+     ->prefix('/{country:code}/event')
      ->group(function () {
-         Route::get('/{country:code}/table/event', \App\Http\Livewire\BitcoinEvent\BitcoinEventTable::class)
+         Route::get('overview', \App\Http\Livewire\BitcoinEvent\BitcoinEventTable::class)
               ->name('table.bitcoinEvent');
      });
 
@@ -80,11 +80,11 @@ Route::middleware([])
  * */
 Route::middleware([])
      ->as('meetup.')
-     ->prefix('meetup')
+     ->prefix('/{country:code}/meetup')
      ->group(function () {
-         Route::get('/{country:code}/table/meetup', \App\Http\Livewire\Meetup\MeetupTable::class)
+         Route::get('overview', \App\Http\Livewire\Meetup\MeetupTable::class)
               ->name('table.meetup');
-         Route::get('/{country:code}/table/meetup-events', \App\Http\Livewire\Meetup\MeetupEventTable::class)
+         Route::get('/meetup-events', \App\Http\Livewire\Meetup\MeetupEventTable::class)
               ->name('table.meetupEvent');
      });