diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php
index 2f772ea..23eb236 100644
--- a/app/Http/Controllers/AuthController.php
+++ b/app/Http/Controllers/AuthController.php
@@ -14,7 +14,8 @@ class AuthController extends Controller
 {
     public function show()
     {
-        return Inertia::render('Auth/Login');
+        return $this->login();
+        //return Inertia::render('Auth/Login');
     }
 
     public function login()
@@ -42,11 +43,10 @@ public function loginCallback()
 
         $regId = $attendeeListResponse['ids'][0] ?? null;
 
-        /*if (isset($attendeeListResponse['ids'][0]) === false) {
+        if (isset($attendeeListResponse['ids'][0]) === false) {
             return redirect()->route('welcome')->with('message',
                 'Please register for the Convention first before trying to obtain a fursuit badge.');
-        }*/
-        //$regId = $attendeeListResponse['ids'][0];
+        }
 
         $user = User::updateOrCreate([
             'remote_id' => $socialLiteUser->getId(),
@@ -60,7 +60,7 @@ public function loginCallback()
 
         $user->wallet->balance;
 
-        /*$statusResponse = \Illuminate\Support\Facades\Http::attsrv()
+        $statusResponse = \Illuminate\Support\Facades\Http::attsrv()
             ->withToken($socialLiteUser->token)
             ->get('/attendees/'.$regId.'/status');
 
@@ -68,7 +68,7 @@ public function loginCallback()
         if (in_array($statusResponse->json()['status'], ['paid', 'checked in'])) {
             $user->valid_registration = true;
             $user->save();
-        }*/
+        }
 
         (new TokenRefreshService($user))->save(
             accessToken: $socialLiteUser->token,
@@ -76,7 +76,11 @@ public function loginCallback()
             expiresIn: 3500
         );
 
-        Auth::login($user);
+        Auth::login($user, true);
+        if(Session::exists('catch-em-all-redirect')) {
+            Session::forget('catch-em-all-redirect');
+            return redirect()->route('fcea.dashboard');
+        }
         return redirect()->route('dashboard');
     }
 
diff --git a/app/Http/Controllers/FCEA/DashboardController.php b/app/Http/Controllers/FCEA/DashboardController.php
index 43f4061..60a2184 100644
--- a/app/Http/Controllers/FCEA/DashboardController.php
+++ b/app/Http/Controllers/FCEA/DashboardController.php
@@ -40,10 +40,31 @@ public function index()
         }
 
         return Inertia::render('FCEA/Dashboard', [
-            'myUserInfo' => $myUserInfo,
-            'userRanking' => $userRanking,
+            'myUserInfo' => [
+                'id' => $myUserInfo->id,
+                'rank' => $myUserInfo->rank,
+                'score' => $myUserInfo->score,
+                'score_till_next' => $myUserInfo->score_till_next,
+                'others_behind' => $myUserInfo->others_behind,
+            ],
+            'userRanking' => $userRanking
+                ->filter(fn($e) => $e->score > 0)
+            ->map(function ($entry) {
+                return [
+                    'id' => $entry->id,
+                    'rank' => $entry->rank,
+                    'score' => $entry->score,
+                    'score_till_next' => $entry->score_till_next,
+                    'others_behind' => $entry->others_behind,
+                    'user' => [
+                        'name' => $entry->user->name,
+                    ],
+                ];
+            }),
             'myFursuitInfos' => $myFursuitInfos,
-            'fursuitRanking' => $fursuitRanking,
+            'fursuitRanking' => $fursuitRanking->map(fn($entry) => [
+                'name' => $entry->fursuit->name,
+            ]),
             'myFursuitInfoCatchedTotal' => $myFursuitInfoCatchedTotal, // How many times the user got catched on all fursuits summed up
             'caughtFursuit' => $caughtFursuit
         ]);
@@ -107,11 +128,6 @@ public static function refreshRanking() {
         self::refreshFursuitRanking();
     }
 
-    public function refreshRanking() {
-        $this->refreshUserRanking();
-        $this->refreshFursuitRanking();
-    }
-
     // Function to build User Ranking. Truncated Table and iterates all users. Similar to the Fursuit Ranking
     public static function refreshUserRanking() {
         $usersOrdered = User::query()
diff --git a/resources/js/Layouts/CatchEmAllLayout.vue b/resources/js/Layouts/CatchEmAllLayout.vue
new file mode 100644
index 0000000..4c055d3
--- /dev/null
+++ b/resources/js/Layouts/CatchEmAllLayout.vue
@@ -0,0 +1,48 @@
+<script setup>
+import {Link, usePage} from '@inertiajs/vue3';
+import dayjs from "dayjs";
+import Button from "primevue/button";
+import {formatEuroFromCents} from "../helpers.js";
+
+const page = usePage().props;
+</script>
+
+<template>
+    <div class="sm:bg-gray-100">
+        <div class="min-h-screen w-full mx-auto bg-white flex flex-col">
+            <!--- Logo -->
+            <div class="bg-primary-500 pl-4 drop-shadow">
+                <div class="text-white max-w-screen-lg mx-auto flex gap-3">
+                    <Link as="div" :href="route('welcome')" class="cursor-pointer relative h-16 flex gap-3">
+                        <img src="../../assets/ef.svg"
+                             class="hidden xs:block rounded-full bg-primary-500 h-24 px-2 pb-2 pt-2 -mt-2 absolute z-100"
+                             alt="Eurofurence Logo">
+                        <div class="w-24 hidden xs:block"></div>
+                        <div class="flex items-center">
+                            <div>
+                                <div class="font-logo tracking-wider font-semibold text-2xl">
+                                    EUROFURENCE
+                                </div>
+                                <div class="font-semibold text-sm sm:text-base -mt-1">
+                                    Fursuit Catch Em All
+                                </div>
+                            </div>
+                        </div>
+                    </Link>
+                    <div class="flex items-center justify-end ml-auto pr-2">
+                        <Link :href="route('auth.logout')" method="POST" class="text-white"
+                              v-if="usePage().props.auth.user">
+                            <Button title="Logout" class="text-white" text size="large" icon="pi pi-sign-out"
+                                    aria-label="Submit"/>
+                        </Link>
+                    </div>
+                </div>
+            </div>
+            <!-- End of Logo -->
+            <div class="flex-1">
+                <slot></slot>
+            </div>
+            <div id="bottom_nav_teleport"></div>
+        </div>
+    </div>
+</template>
diff --git a/resources/js/Pages/FCEA/Dashboard.vue b/resources/js/Pages/FCEA/Dashboard.vue
index c393dbc..033627c 100644
--- a/resources/js/Pages/FCEA/Dashboard.vue
+++ b/resources/js/Pages/FCEA/Dashboard.vue
@@ -1,14 +1,16 @@
 <script setup lang="ts">
 import {Head, useForm, usePage} from '@inertiajs/vue3'
-import Layout from "@/Layouts/Layout.vue";
+import CatchEmAllLayout from "@/Layouts/CatchEmAllLayout.vue";
 import Button from "primevue/button"
 import BottomNavigation from "@/Components/BottomNavigation.vue";
 import Message from "primevue/message";
 import FlashMessages from "@/Components/FlashMessages.vue";
+import InputText from 'primevue/inputtext'
+import InputMask from 'primevue/inputmask'
 
-defineOptions({ layout: Layout })
+defineOptions({layout: CatchEmAllLayout})
 
-const form = useForm({ catch_code: '' })
+const form = useForm({catch_code: ''})
 
 const props = defineProps<{
     myUserInfo: object,
@@ -23,59 +25,101 @@ const submit = () => form.post(route('fcea.dashboard.catch'))
 
 </script>
 <template>
-    <Head title="Fursuits — Catch'em all!" />
+    <Head title="Fursuits — Catch'em all!"/>
 
-    <FlashMessages :flash="flash" />
-    <div class="card mt-5" style="width: 18rem; margin: auto;">
-        <div class="card-header text-center">
-            <h3>Fursuit Catch Em All</h3>
+    <div class="py-16">
+        <!-- Personal Ranking -->
+        <div class="px-4 mb-4 max-w-sm mx-auto">
+            <div class="flex justify-around items-center mb-3">
+                <!-- Your Place -->
+                <div class="text-center">
+                    <h4 class="font-bold text-4xl"><span
+                        class="font-light font-italic text-2xl">#</span>{{ myUserInfo.rank }}</h4>
+                    <div class="uppercase font-mono text-base">Your Place</div>
+                </div>
+                <!-- Catches -->
+                <div class="text-center">
+                    <h4 class="font-bold text-4xl"><span
+                        class="font-light font-italic text-2xl"></span>{{ myUserInfo.score }}</h4>
+                    <div class="uppercase font-mono text-base">Your Catches</div>
+                </div>
+            </div>
+            <div>
+                <p class="text-center">There are {{ myUserInfo.others_behind }} behind your place.</p>
+            </div>
+            <p class="text-center" v-if="myUserInfo.score_till_next ==! 0"><small>{{ myUserInfo.score_till_next }} more
+                to advance to the next place</small></p>
+        </div>
+        <div class="p-4">
+            <FlashMessages :flash="flash"/>
+        </div>
+        <!-- Input Form -->
+        <div class="px-4 py-6 bg-blue-900 text-white">
+            <div class="mx-auto max-w-sm">
+                <div class="text-center text-sm mb-3">
+                    <h3>Enter the catch code of a fursuiter.</h3>
+                </div>
+                <div class="space-y-3">
+                    <InputMask class="w-full text-center" :invalid="form.hasErrors" v-model="form.catch_code"
+                               mask="*****" placeholder="ABCDE" fluid></InputMask>
+                    <small v-if="form.hasErrors" class="text-red-300">Invalid catch code</small>
+                    <Button severity="warning" class="w-full" @click="submit">Submit Catch Code</Button>
+                    <p class="text-sm text-center">Your name can be displayed on the public leaderboard after you submit your first catch code.</p>
+                </div>
+            </div>
         </div>
 
-        <div class="card-body">
-            <h4 class="text-center">Place #{{ myUserInfo.rank }} with {{ myUserInfo.score }} catches</h4>
-            <p class="text-center" v-if="myUserInfo.score_till_next ==! 0"><small>{{ myUserInfo.score_till_next }} more to advance to the next place</small></p>
-            <p class="text-center"><small>{{ myUserInfo.others_behind }} behind you</small></p>
+        <div>
+            <div class="px-4 py-4 font-bold bg-blue-200 text-xl text-center">Leaderboard</div>
+            <table class="table-auto w-full striped-table" v-if="userRanking.length">
+                <thead>
+                <tr>
+                    <th class="pl-4 text-left bg-blue-900 text-white py-2">Rank</th>
+                    <th class="text-left bg-blue-900 text-white py-2">Name</th>
+                    <th class="pr-4 text-right bg-blue-900 text-white py-2">Catches</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr v-for="i in userRanking">
+                    <td class="pl-4 py-1">Top {{ i.rank }}</td>
+                    <td>{{ i.user.name }}</td>
+                    <td class="pr-4 text-right">{{ i.score }}</td>
+                </tr>
+                </tbody>
+            </table>
+            <p class="text-center py-4" v-else>Be the first person to catch a fursuiter!</p>
+            <div class="px-4 py-4 font-bold bg-blue-200 text-xl text-center">How does this work?</div>
+            <div class="space-y-2 px-4 py-4 text-sm">
+                <p>Some fursuiters at Eurofurence may have a unique 5-digit code located on the bottom right of their Fursuit Badge. These codes are your key to participating in the "Catch 'Em All" game.</p>
 
-            <div class="text-center">
-                 <input type="text" class="form-control mb-2" v-model="form.catch_code" placeholder="Enter Code" />
-                <div v-if="form.hasErrors">Invalid catch code</div>
-                <Button class="btn btn-primary" @click="submit">Submit ></Button>
-            </div>
+                <p><strong>Objective:</strong></p>
+                <p>Catch as many fursuiters as possible by collecting their badge codes. Each time you "catch" a fursuiter, make sure to note their code.</p>
+
+                <p><strong>Participation:</strong></p>
+                <p>Fursuiters can choose whether or not to participate in the game. If they have a code on their badge, they're part of the fun!</p>
+
+                <p><strong>Scoring:</strong></p>
+                <p>Players with the same number of catches will share the same ranking. For example, a player with 200 catches will be ranked just above someone with 199, but if two players both have 200 catches, they will share the same rank.</p>
+
+                <p>Good luck, and happy catching!</p>
 
-            <div class="mt-4">
-                <h5>Top Catchers</h5>
-                <ul class="list-group">
-                    <li class="list-group-item" v-for="i in userRanking"><p v-if="i.user_id == myUserInfo.user_id">[YOU]</p> Top {{i.rank}}: {{i.user.name}} [{{i.score}}]</li>
-                </ul>
             </div>
-            <Teleport defer to="#bottom_nav_teleport"><BottomNavigation class="md:hidden" /></Teleport>
+            <!--
+        <ul class="list-group">
+            <li class="list-group-item" ><p v-if="i.user_id == myUserInfo.user_id">
+                [YOU]</p> Top {{ i.rank }}: {{ i.user.name }} [{{ i.score }}]
+            </li>
+        </ul> -->
         </div>
+        <!--
+        <Teleport defer to="#bottom_nav_teleport">
+            <BottomNavigation/>
+        </Teleport> -->
     </div>
 </template>
 
 <style scoped>
-.card {
-    border: 1px solid #ccc;
-    box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
-}
-
-h3 {
-    font-family: 'Arial', sans-serif;
-    font-weight: bold;
-}
-
-.card-header {
-    background-color: #f8f9fa;
-}
-
-.list-group-item {
-    display: flex;
-    justify-content: space-between;
-    font-weight: bold;
-}
-
-.text-center {
-    font-family: 'Arial', sans-serif;
-    margin-top: 10px;
+.striped-table tr:nth-child(odd) {
+    background-color: #f9f9f9;
 }
 </style>
diff --git a/routes/web.php b/routes/web.php
index c2e8bfb..48cfcac 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -22,3 +22,5 @@
         Route::resource('badges', \App\Http\Controllers\BadgeController::class);
     });
 });
+
+Route::permanentRedirect('/catch-em-all', '/fcea/');