diff --git a/app/Actions/CloseQuizSubmissionAction.php b/app/Actions/CloseQuizSubmissionAction.php
deleted file mode 100644
index 91cea39e..00000000
--- a/app/Actions/CloseQuizSubmissionAction.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Actions;
-
-use App\Models\QuizSubmission;
-use Carbon\Carbon;
-
-class CloseQuizSubmissionAction
-{
-    public function execute(QuizSubmission $submission): void
-    {
-        $submission->closed_at = Carbon::now();
-        $submission->save();
-    }
-}
diff --git a/app/Actions/CloseUserQuizAction.php b/app/Actions/CloseUserQuizAction.php
new file mode 100644
index 00000000..5db6ff98
--- /dev/null
+++ b/app/Actions/CloseUserQuizAction.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Actions;
+
+use App\Models\UserQuiz;
+use Carbon\Carbon;
+
+class CloseUserQuizAction
+{
+    public function execute(UserQuiz $userQuiz): void
+    {
+        $userQuiz->closed_at = Carbon::now();
+        $userQuiz->save();
+    }
+}
diff --git a/app/Helpers/RegonHelper.php b/app/Helpers/RegonHelper.php
new file mode 100644
index 00000000..9235e888
--- /dev/null
+++ b/app/Helpers/RegonHelper.php
@@ -0,0 +1,58 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Helpers;
+
+class RegonHelper
+{
+    public const array WEIGHTS_SHORT = [8, 9, 2, 3, 4, 5, 6, 7];
+    public const array WEIGHTS_LONG = [2, 4, 8, 5, 0, 9, 7, 3, 6, 1, 2, 4, 8];
+
+    public static function generateShortRegon()
+    {
+        $digits = "";
+
+        for ($i = 0; $i < 8; $i++) {
+            $digits .= rand(0, 9);
+        }
+
+        $checksum = self::calculateChecksum(str_split($digits), self::WEIGHTS_SHORT);
+
+        return $digits . $checksum;
+    }
+
+    public static function generateLongRegon()
+    {
+        $digits = "";
+
+        for ($i = 0; $i < 13; $i++) {
+            $digits .= rand(0, 9);
+        }
+
+        $checksum = self::calculateChecksum(str_split($digits), self::WEIGHTS_LONG);
+
+        return $digits . $checksum;
+    }
+
+    /***
+     * @param array<string> $number
+     * @param array<int> $wages
+     */
+    public static function calculateChecksum(array $number, array $wages): int
+    {
+        $sum = 0;
+
+        for ($i = 0; $i < count($wages); $i++) {
+            $sum += $wages[$i] * intval($number[$i]);
+        }
+
+        $checksum = $sum % 11;
+
+        if ($checksum === 10) {
+            return 0;
+        }
+
+        return $checksum;
+    }
+}
diff --git a/app/Helpers/SortHelper.php b/app/Helpers/SortHelper.php
new file mode 100644
index 00000000..f12b2798
--- /dev/null
+++ b/app/Helpers/SortHelper.php
@@ -0,0 +1,70 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Helpers;
+
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Http\Request;
+use Illuminate\Pagination\LengthAwarePaginator;
+use Illuminate\Support\Facades\Lang;
+use Symfony\Component\HttpFoundation\Response as Status;
+
+class SortHelper
+{
+    public function __construct(
+        private Request $request,
+    ) {}
+
+    /**
+     * @param array<string> $allowedFields
+     * @param array<string> $ignoredFields
+     */
+    public function sort(Builder $query, array $allowedFields, array $ignoredFields): Builder
+    {
+        [$field, $order] = $this->getSortParameters();
+
+        if (!in_array($field, $allowedFields, true)) {
+            if (in_array($field, $ignoredFields, true)) {
+                return $query;
+            }
+
+            abort(Status::HTTP_BAD_REQUEST, Lang::get("validation.custom.sorting.unsupported_field", ["attribute" => $field]));
+        }
+
+        return $query->orderBy($field, $order);
+    }
+
+    /**
+     * @return array<string>
+     */
+    public function getSortParameters(): array
+    {
+        $field = $this->request->query("sort", "id");
+        $ascending = $this->request->query("order", "desc") === "asc";
+
+        return [$field, $ascending ? "asc" : "desc"];
+    }
+
+    public function search(Builder $query, string $field): Builder
+    {
+        $searchText = $this->request->query("search");
+
+        if ($searchText) {
+            return $query->where($field, "ilike", "%$searchText%");
+        }
+
+        return $query;
+    }
+
+    public function paginate(Builder $query): LengthAwarePaginator
+    {
+        $limit = (int)$this->request->query("limit", "50");
+
+        if (!$limit || $limit < 0) {
+            $limit = 50;
+        }
+
+        return $query->paginate($limit);
+    }
+}
diff --git a/app/Http/Controllers/AuthenticateSessionController.php b/app/Http/Controllers/AuthenticateSessionController.php
index 58fb4374..61cc4a9e 100644
--- a/app/Http/Controllers/AuthenticateSessionController.php
+++ b/app/Http/Controllers/AuthenticateSessionController.php
@@ -21,9 +21,7 @@ public function authenticate(AuthenticateSessionRequest $request): RedirectRespo
         if (auth()->attempt($credentials)) {
             $request->session()->regenerate();
 
-            return $request->user()->hasRole(["admin", "super_admin"])
-                ? Redirect::route("admin.quizzes.index")
-                : Redirect::route("dashboard");
+            return redirect()->route("home");
         }
 
         throw ValidationException::withMessages([
diff --git a/app/Http/Controllers/ContestController.php b/app/Http/Controllers/ContestController.php
index 34e0fcf3..5d595d44 100644
--- a/app/Http/Controllers/ContestController.php
+++ b/app/Http/Controllers/ContestController.php
@@ -5,10 +5,11 @@
 namespace App\Http\Controllers;
 
 use App\Http\Resources\QuizResource;
-use App\Http\Resources\QuizSubmissionResource;
 use App\Http\Resources\SchoolResource;
+use App\Http\Resources\UserQuizResource;
 use App\Models\Quiz;
 use App\Models\School;
+use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Inertia\Inertia;
 use Inertia\Response;
@@ -22,11 +23,16 @@ public function index(): Response
         return Inertia::render("Home", ["schools" => SchoolResource::collection($schools)]);
     }
 
-    public function create(Request $request): Response
+    public function create(Request $request): RedirectResponse|Response
     {
         $user = $request->user();
-        $submissions = $user->quizSubmissions()
-            ->with(["answerRecords.question.answers", "quiz"])
+
+        if ($user->hasRole(["admin", "super_admin"])) {
+            return redirect()->route("admin.quizzes.index");
+        }
+
+        $userQuizzes = $user->userQuizzes()
+            ->with(["userQuestions.question.answers", "quiz"])
             ->get();
 
         $quizzes = Quiz::query()
@@ -35,7 +41,7 @@ public function create(Request $request): Response
             ->get();
 
         return Inertia::render("User/Dashboard", [
-            "submissions" => QuizSubmissionResource::collection($submissions),
+            "userQuizzes" => UserQuizResource::collection($userQuizzes),
             "quizzes" => QuizResource::collection($quizzes),
         ]);
     }
diff --git a/app/Http/Controllers/QuizController.php b/app/Http/Controllers/QuizController.php
index fae15ed7..5f46f53c 100644
--- a/app/Http/Controllers/QuizController.php
+++ b/app/Http/Controllers/QuizController.php
@@ -4,12 +4,14 @@
 
 namespace App\Http\Controllers;
 
+use App\Helpers\SortHelper;
 use App\Http\Requests\QuizRequest;
 use App\Http\Requests\UpdateQuizRequest;
 use App\Http\Resources\QuizResource;
 use App\Models\Quiz;
 use App\Services\QuizUpdateService;
 use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Inertia\Inertia;
@@ -19,15 +21,24 @@
 
 class QuizController extends Controller
 {
-    public function index(): Response
+    public function index(Request $request, SortHelper $sorter): Response
     {
-        $quizzes = Quiz::query()
-            ->with("questions.answers")
-            ->get();
+        $query = $sorter->sort(Quiz::query()->with("questions.answers"), ["id", "title", "updated_at", "created_at"], []);
+        $query = $this->filterArchivedQuizzes($query, $request);
+        $query = $sorter->search($query, "title");
+        $quizzes = $sorter->paginate($query);
 
         return Inertia::render("Admin/Quizzes", ["quizzes" => QuizResource::collection($quizzes)]);
     }
 
+    public function show(Quiz $quiz): Response
+    {
+        return Inertia::render(
+            "Admin/QuizDemo",
+            ["quiz" => $quiz->load("questions.answers")],
+        );
+    }
+
     public function store(QuizRequest $request): RedirectResponse
     {
         Quiz::query()->create($request->validated());
@@ -78,12 +89,12 @@ public function unlock(Quiz $quiz): RedirectResponse
             ->with("status", "Publikacja testu została wycofana");
     }
 
-    public function createSubmission(Request $request, Quiz $quiz): RedirectResponse
+    public function createUserQuiz(Request $request, Quiz $quiz): RedirectResponse
     {
         $user = $request->user();
-        $submission = $quiz->createSubmission($user);
+        $userQuiz = $quiz->createUserQuiz($user);
 
-        return redirect("/submissions/{$submission->id}/");
+        return redirect("/quizzes/{$userQuiz->id}/");
     }
 
     public function assign(Request $request, Quiz $quiz): RedirectResponse
@@ -96,4 +107,15 @@ public function assign(Request $request, Quiz $quiz): RedirectResponse
             ->back()
             ->with("status", "Przypisano do testu");
     }
+
+    private function filterArchivedQuizzes(Builder $query, Request $request): Builder
+    {
+        $showArchived = $request->query("archived", "false") === "true";
+
+        if (!$showArchived) {
+            return $query->orWhere(fn(Builder $query) => $query->whereNull("locked_at")->orWhereDate("scheduled_at", ">", Carbon::now()));
+        }
+
+        return $query;
+    }
 }
diff --git a/app/Http/Controllers/QuizSubmissionController.php b/app/Http/Controllers/QuizSubmissionController.php
deleted file mode 100644
index 9a11b434..00000000
--- a/app/Http/Controllers/QuizSubmissionController.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Http\Controllers;
-
-use App\Actions\CloseQuizSubmissionAction;
-use App\Http\Resources\QuizSubmissionResource;
-use App\Models\QuizSubmission;
-use Illuminate\Http\RedirectResponse;
-use Inertia\Inertia;
-use Inertia\Response;
-
-class QuizSubmissionController extends Controller
-{
-    public function show(QuizSubmission $quizSubmission): Response
-    {
-        $quizSubmission->load(["answerRecords.question.answers"]);
-
-        return Inertia::render("User/Quiz", ["submission" => QuizSubmissionResource::make($quizSubmission)]);
-    }
-
-    public function close(QuizSubmission $quizSubmission, CloseQuizSubmissionAction $action): RedirectResponse
-    {
-        $action->execute($quizSubmission);
-
-        return redirect()->route("submissions.result", $quizSubmission->id)->with("status", "Test został oddany.");
-    }
-
-    public function result(QuizSubmission $quizSubmission): Response
-    {
-        $quizSubmission->load(["answerRecords.question.answers", "quiz"]);
-
-        return Inertia::render("User/QuizResult", [
-            "submission" => QuizSubmissionResource::make($quizSubmission),
-            "hasRanking" => $quizSubmission->quiz->isRankingPublished,
-        ]);
-    }
-}
diff --git a/app/Http/Controllers/RankingController.php b/app/Http/Controllers/RankingController.php
index 528a58d8..8a652588 100644
--- a/app/Http/Controllers/RankingController.php
+++ b/app/Http/Controllers/RankingController.php
@@ -9,7 +9,7 @@
 use App\Http\Resources\QuizResource;
 use App\Http\Resources\RankingResource;
 use App\Models\Quiz;
-use App\Models\QuizSubmission;
+use App\Models\UserQuiz;
 use Illuminate\Http\RedirectResponse;
 use Inertia\Inertia;
 use Inertia\Response;
@@ -18,14 +18,14 @@ class RankingController extends Controller
 {
     public function index(Quiz $quiz): Response
     {
-        $submissions = QuizSubmission::query()
+        $userQuizzes = UserQuiz::query()
             ->where("quiz_id", $quiz->id)
             ->with("user.school")
             ->get();
 
         return Inertia::render("Admin/Ranking", [
             "quiz" => QuizResource::make($quiz),
-            "rankings" => RankingResource::collection($submissions),
+            "rankings" => RankingResource::collection($userQuizzes),
         ]);
     }
 
@@ -33,14 +33,14 @@ public function indexUser(Quiz $quiz): Response
     {
         $this->authorize("viewUserRanking", $quiz);
 
-        $submissions = QuizSubmission::query()
+        $userQuizzes = UserQuiz::query()
             ->where("quiz_id", $quiz->id)
             ->with("user.school")
             ->get();
 
         return Inertia::render("User/Ranking", [
             "quiz" => QuizResource::make($quiz),
-            "rankings" => RankingResource::collection($submissions),
+            "rankings" => RankingResource::collection($userQuizzes),
         ]);
     }
 
diff --git a/app/Http/Controllers/SchoolsController.php b/app/Http/Controllers/SchoolsController.php
index 8ddf6f14..999bd1cb 100644
--- a/app/Http/Controllers/SchoolsController.php
+++ b/app/Http/Controllers/SchoolsController.php
@@ -5,11 +5,13 @@
 namespace App\Http\Controllers;
 
 use App\Enums\Voivodeship;
+use App\Helpers\SortHelper;
 use App\Http\Requests\SchoolRequest;
 use App\Http\Resources\SchoolResource;
 use App\Jobs\FetchSchoolsJob;
 use App\Models\School;
 use Illuminate\Bus\Batch;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Support\Facades\Bus;
@@ -24,9 +26,15 @@
 
 class SchoolsController extends Controller
 {
-    public function index(): Response
+    public function index(SortHelper $sorter): Response
     {
-        return Inertia::render("Admin/SchoolsPanel", ["schools" => SchoolResource::collection(School::all())]);
+        $query = $sorter->sort(School::query(), ["id", "name", "regon", "updated_at", "created_at"], ["students", "address"]);
+        $query = $this->sortByStudents($query, $sorter);
+        $query = $this->sortByAddress($query, $sorter);
+        $query = $sorter->search($query, "name");
+        $schools = $sorter->paginate($query);
+
+        return Inertia::render("Admin/SchoolsPanel", ["schools" => SchoolResource::collection($schools)]);
     }
 
     public function store(SchoolRequest $request): RedirectResponse
@@ -68,6 +76,7 @@ public function fetch(): JsonResponse
         $jobs = $voivodeships->map(fn(Voivodeship $voivodeships): FetchSchoolsJob => new FetchSchoolsJob($voivodeships, $schoolTypes));
         $batch = Bus::batch($jobs)->finally(fn(): bool => Cache::delete("fetch_schools"))->dispatch();
         Cache::set("fetch_schools", $batch->id);
+        Cache::forget("fetched_schools");
 
         return response()->json(["message" => "Pobieranie rozpoczęte"], Status::HTTP_OK);
     }
@@ -76,6 +85,7 @@ public function status(): JsonResponse
     {
         return response()->json([
             "done" => !$this->isFetching(),
+            "count" => (int)Cache::get("fetched_schools"),
         ]);
     }
 
@@ -96,4 +106,29 @@ protected function findBatch(): ?Batch
 
         return Bus::findBatch($batchId);
     }
+
+    private function sortByStudents(Builder $query, SortHelper $sorter): Builder
+    {
+        [$field, $order] = $sorter->getSortParameters();
+
+        if ($field === "students") {
+            return $query->withCount("users")->orderBy("users_count", $order);
+        }
+
+        return $query;
+    }
+
+    private function sortByAddress(Builder $query, SortHelper $sorter): Builder
+    {
+        [$field, $order] = $sorter->getSortParameters();
+
+        if ($field === "address") {
+            return $query->orderBy("city", $order)
+                ->orderBy("zip_code", $order)
+                ->orderBy("street", $order)
+                ->orderBy("name", $order);
+        }
+
+        return $query;
+    }
 }
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 704839bf..26149992 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -52,7 +52,7 @@ public function anonymize(User $user): RedirectResponse
     {
         $this->authorize("anonymize", $user);
         $user->update([
-            "name" => "Anonymous",
+            "firstname" => "Anonymous",
             "surname" => "User",
             "email" => "anonymous" . $user->id . "@email",
             "is_anonymized" => true,
diff --git a/app/Http/Controllers/AnswerRecordController.php b/app/Http/Controllers/UserQuestionController.php
similarity index 53%
rename from app/Http/Controllers/AnswerRecordController.php
rename to app/Http/Controllers/UserQuestionController.php
index 580895ab..f566be4d 100644
--- a/app/Http/Controllers/AnswerRecordController.php
+++ b/app/Http/Controllers/UserQuestionController.php
@@ -5,16 +5,16 @@
 namespace App\Http\Controllers;
 
 use App\Models\Answer;
-use App\Models\AnswerRecord;
+use App\Models\UserQuestion;
 use Illuminate\Http\RedirectResponse;
 
 use function redirect;
 
-class AnswerRecordController extends Controller
+class UserQuestionController extends Controller
 {
-    public function answer(AnswerRecord $answerRecord, Answer $answer): RedirectResponse
+    public function answer(UserQuestion $userQuestion, Answer $answer): RedirectResponse
     {
-        $answerRecord->answer()->associate($answer)->save();
+        $userQuestion->answer()->associate($answer)->save();
 
         return redirect()->back();
     }
diff --git a/app/Http/Controllers/UserQuizController.php b/app/Http/Controllers/UserQuizController.php
new file mode 100644
index 00000000..1cab5eb0
--- /dev/null
+++ b/app/Http/Controllers/UserQuizController.php
@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Controllers;
+
+use App\Actions\CloseUserQuizAction;
+use App\Http\Resources\UserQuizResource;
+use App\Models\UserQuiz;
+use Illuminate\Http\RedirectResponse;
+use Inertia\Inertia;
+use Inertia\Response;
+
+class UserQuizController extends Controller
+{
+    public function show(UserQuiz $userQuiz): Response
+    {
+        $userQuiz->load(["userQuestions.question.answers"]);
+
+        return Inertia::render("User/Quiz", ["userQuiz" => UserQuizResource::make($userQuiz)]);
+    }
+
+    public function close(UserQuiz $userQuiz, CloseUserQuizAction $action): RedirectResponse
+    {
+        $action->execute($userQuiz);
+
+        return redirect()->route("userQuizzes.result", $userQuiz->id)->with("status", "Test został oddany.");
+    }
+
+    public function result(UserQuiz $userQuiz): Response
+    {
+        $userQuiz->load(["userQuestions.question.answers", "quiz"]);
+
+        return Inertia::render("User/QuizResult", [
+            "userQuiz" => UserQuizResource::make($userQuiz),
+            "hasRanking" => $userQuiz->quiz->isRankingPublished,
+        ]);
+    }
+}
diff --git a/app/Http/Integrations/RSPOConnector/RSPOConnector.php b/app/Http/Integrations/RSPOConnector/RSPOConnector.php
index 21b156f5..eb310bb7 100644
--- a/app/Http/Integrations/RSPOConnector/RSPOConnector.php
+++ b/app/Http/Integrations/RSPOConnector/RSPOConnector.php
@@ -16,7 +16,7 @@ class RSPOConnector extends Connector implements HasPagination
 
     public function resolveBaseUrl(): string
     {
-        return "https://api-rspo.mein.gov.pl/api";
+        return "https://api-rspo.men.gov.pl/api";
     }
 
     public function paginate(Request $request): Paginator
diff --git a/app/Http/Middleware/EnsureQuizIsNotAlreadyStarted.php b/app/Http/Middleware/EnsureQuizIsNotAlreadyStarted.php
index 19924b42..61aec8d7 100644
--- a/app/Http/Middleware/EnsureQuizIsNotAlreadyStarted.php
+++ b/app/Http/Middleware/EnsureQuizIsNotAlreadyStarted.php
@@ -4,7 +4,7 @@
 
 namespace App\Http\Middleware;
 
-use App\Models\QuizSubmission;
+use App\Models\UserQuiz;
 use Closure;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
@@ -17,10 +17,10 @@ public function handle(Request $request, Closure $next): Response|RedirectRespon
         $user = $request->user();
         $quiz = $request->route()->parameter("quiz");
 
-        $submission = QuizSubmission::query()->where(["quiz_id" => $quiz->id, "user_id" => $user->id])->first();
+        $userQuiz = UserQuiz::query()->where(["quiz_id" => $quiz->id, "user_id" => $user->id])->first();
 
-        if ($submission) {
-            return redirect(route("submissions.show", $submission->id));
+        if ($userQuiz) {
+            return redirect(route("userQuizzes.show", $userQuiz->id));
         }
 
         return $next($request);
diff --git a/app/Http/Requests/Auth/RegisterUserRequest.php b/app/Http/Requests/Auth/RegisterUserRequest.php
index 4495fc06..d9aacfb8 100644
--- a/app/Http/Requests/Auth/RegisterUserRequest.php
+++ b/app/Http/Requests/Auth/RegisterUserRequest.php
@@ -17,7 +17,7 @@ public function rules(): array
     {
         return [
             "email" => ["required", "string", "email:rfc,dns", "max:255"],
-            "name" => ["required", "string", "max:255"],
+            "firstname" => ["required", "string", "max:255"],
             "surname" => ["required", "string", "max:255"],
             "password" => ["required", "string", "min:8"],
             "school_id" => ["required", "integer", "exists:schools,id"],
diff --git a/app/Http/Requests/QuizRequest.php b/app/Http/Requests/QuizRequest.php
index 35918158..716abe07 100644
--- a/app/Http/Requests/QuizRequest.php
+++ b/app/Http/Requests/QuizRequest.php
@@ -27,7 +27,7 @@ public function prepareForValidation(): void
     public function rules(): array
     {
         return [
-            "title" => ["required", "string"],
+            "title" => ["required", "string", "max:255"],
             "scheduled_at" => ["date", "after:now"],
             "duration" => ["numeric", "min:1", "max:2147483647"],
         ];
diff --git a/app/Http/Requests/SchoolRequest.php b/app/Http/Requests/SchoolRequest.php
index f3cb16d8..fff205fa 100644
--- a/app/Http/Requests/SchoolRequest.php
+++ b/app/Http/Requests/SchoolRequest.php
@@ -4,6 +4,7 @@
 
 namespace App\Http\Requests;
 
+use App\Rules\Regon;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Foundation\Http\FormRequest;
 
@@ -35,13 +36,13 @@ public function prepareForValidation(): void
     public function rules(): array
     {
         return [
-            "name" => ["required", "string"],
-            "city" => ["required", "string"],
-            "regon" => ["required", "string"],
-            "street" => ["required", "string"],
-            "building_number" => ["required", "string"],
-            "apartment_number" => ["string", "nullable"],
-            "zip_code" => ["required", "string"],
+            "name" => ["required", "string", "max:255"],
+            "city" => ["required", "string", "max:255"],
+            "regon" => ["required", "string", new Regon()],
+            "street" => ["required", "string", "max:255"],
+            "building_number" => ["required", "string", "max:255"],
+            "apartment_number" => ["string", "nullable", "max:255"],
+            "zip_code" => ["required", "string", "regex:/^\d{2}-\d{3}$/"],
         ];
     }
 }
diff --git a/app/Http/Requests/UpdateQuizRequest.php b/app/Http/Requests/UpdateQuizRequest.php
index 2f6e89f2..ac40815a 100644
--- a/app/Http/Requests/UpdateQuizRequest.php
+++ b/app/Http/Requests/UpdateQuizRequest.php
@@ -28,7 +28,7 @@ public function prepareForValidation(): void
     public function rules(): array
     {
         return [
-            "title" => ["required", "string"],
+            "title" => ["required", "string", "max:255"],
             "scheduled_at" => ["date", "after:now"],
             "duration" => ["integer", "min:1", "max:2147483647"],
             "questions" => ["array"],
diff --git a/app/Http/Requests/UserRequest.php b/app/Http/Requests/UserRequest.php
index b97c3d16..1ee2b303 100644
--- a/app/Http/Requests/UserRequest.php
+++ b/app/Http/Requests/UserRequest.php
@@ -17,7 +17,7 @@ public function rules(): array
     {
         return [
             "email" => ["required", "string", "email", "max:255", "unique:users,email," . $this->user->id],
-            "name" => ["required", "string", "max:255"],
+            "firstname" => ["required", "string", "max:255"],
             "surname" => ["required", "string", "max:255"],
             "school_id" => ["required", "integer", "exists:schools,id"],
         ];
diff --git a/app/Http/Resources/RankingResource.php b/app/Http/Resources/RankingResource.php
index 6d6dd84e..3d1fcd8d 100644
--- a/app/Http/Resources/RankingResource.php
+++ b/app/Http/Resources/RankingResource.php
@@ -19,7 +19,7 @@ public function toArray(Request $request): array
         return [
             "user" => [
                 "id" => $this->user->id,
-                "name" => $isAdmin ? $this->user->name : null,
+                "firstname" => $isAdmin ? $this->user->firstname : null,
                 "surname" => $isAdmin ? $this->user->surname : null,
                 "school" => $this->user->school,
             ],
diff --git a/app/Http/Resources/AnswerRecordResource.php b/app/Http/Resources/UserQuestionResource.php
similarity index 90%
rename from app/Http/Resources/AnswerRecordResource.php
rename to app/Http/Resources/UserQuestionResource.php
index ac666847..9a533401 100644
--- a/app/Http/Resources/AnswerRecordResource.php
+++ b/app/Http/Resources/UserQuestionResource.php
@@ -10,17 +10,17 @@
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Support\Collection;
 
-class AnswerRecordResource extends JsonResource
+class UserQuestionResource extends JsonResource
 {
     public function toArray(Request $request): array
     {
         return [
             "id" => $this->id,
-            "question" => $this->question->text,
+            "text" => $this->question->text,
             "createdAt" => $this->created_at,
             "updatedAt" => $this->updated_at,
             "closed" => $this->isClosed,
-            "selected" => $this->answer_id,
+            "selectedAnswer" => $this->answer_id,
             "answers" => $this->questionAnswersToArray($this->question)->shuffle(),
         ];
     }
diff --git a/app/Http/Resources/QuizSubmissionResource.php b/app/Http/Resources/UserQuizResource.php
similarity index 67%
rename from app/Http/Resources/QuizSubmissionResource.php
rename to app/Http/Resources/UserQuizResource.php
index fc725b1e..36149b17 100644
--- a/app/Http/Resources/QuizSubmissionResource.php
+++ b/app/Http/Resources/UserQuizResource.php
@@ -7,20 +7,19 @@
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
-class QuizSubmissionResource extends JsonResource
+class UserQuizResource extends JsonResource
 {
     public function toArray(Request $request): array
     {
         return [
             "id" => $this->id,
-            "name" => $this->quiz->title,
+            "title" => $this->quiz->title,
             "createdAt" => $this->created_at,
             "updatedAt" => $this->updated_at,
-            "openedAt" => $this->quiz->scheduled_at,
             "closedAt" => $this->closed_at,
             "closed" => $this->isClosed,
             "quiz" => $this->quiz_id,
-            "answers" => AnswerRecordResource::collection($this->answerRecords->shuffle()),
+            "questions" => UserQuestionResource::collection($this->userQuestions->shuffle()),
         ];
     }
 }
diff --git a/app/Http/Resources/UserResource.php b/app/Http/Resources/UserResource.php
index 86f48451..ae230c78 100644
--- a/app/Http/Resources/UserResource.php
+++ b/app/Http/Resources/UserResource.php
@@ -16,7 +16,7 @@ public function toArray(Request $request): array
     {
         return [
             "id" => $this->id,
-            "name" => $this->name,
+            "firstname" => $this->firstname,
             "surname" => $this->surname,
             "email" => $this->email,
             "school" => SchoolResource::make($this->school),
diff --git a/app/Jobs/FetchSchoolsJob.php b/app/Jobs/FetchSchoolsJob.php
index 1ddef93f..4c37e676 100644
--- a/app/Jobs/FetchSchoolsJob.php
+++ b/app/Jobs/FetchSchoolsJob.php
@@ -10,6 +10,7 @@
 use Illuminate\Bus\Batchable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Queue\Queueable;
+use Illuminate\Support\Facades\Cache;
 
 class FetchSchoolsJob implements ShouldQueue
 {
@@ -26,6 +27,7 @@ public function __construct(
 
     public function handle(GetSchoolDataService $service): void
     {
-        $service->getSchools($this->voivodeship, $this->schoolTypes);
+        $added_schools = $service->getSchools($this->voivodeship, $this->schoolTypes);
+        Cache::set("fetched_schools", $added_schools);
     }
 }
diff --git a/app/Models/Quiz.php b/app/Models/Quiz.php
index 0a405cf2..87d4bdd2 100644
--- a/app/Models/Quiz.php
+++ b/app/Models/Quiz.php
@@ -18,8 +18,8 @@
  * @property string $title
  * @property Carbon $created_at
  * @property Carbon $updated_at
- * @property Carbon $scheduled_at
- * @property Carbon $ranking_published_at
+ * @property ?Carbon $scheduled_at
+ * @property ?Carbon $ranking_published_at
  * @property ?Carbon $locked_at
  * @property ?int $duration
  * @property bool $isLocked
@@ -32,7 +32,7 @@
  * @property Collection<Question> $questions
  * @property Collection<Answer> $answers
  * @property Collection<User> $assignedUsers
- * @property Collection<QuizSubmission> $quizSubmissions
+ * @property Collection<UserQuiz> $userQuizzes
  */
 class Quiz extends Model
 {
@@ -61,9 +61,9 @@ public function assignedUsers(): BelongsToMany
         return $this->belongsToMany(User::class, "quiz_assignments");
     }
 
-    public function quizSubmissions(): HasMany
+    public function userQuizzes(): HasMany
     {
-        return $this->hasMany(QuizSubmission::class);
+        return $this->hasMany(UserQuiz::class);
     }
 
     public function isLocked(): Attribute
@@ -124,22 +124,22 @@ public function clone(): self
         return $quizCopy;
     }
 
-    public function createSubmission(User $user): QuizSubmission
+    public function createUserQuiz(User $user): UserQuiz
     {
-        $submission = new QuizSubmission();
-        $submission->closed_at = $this->closeAt;
-        $submission->quiz()->associate($this);
-        $submission->user()->associate($user);
-        $submission->save();
+        $userQuiz = new UserQuiz();
+        $userQuiz->closed_at = $this->closeAt;
+        $userQuiz->quiz()->associate($this);
+        $userQuiz->user()->associate($user);
+        $userQuiz->save();
 
         foreach ($this->questions as $question) {
-            $answerRecord = new AnswerRecord();
-            $answerRecord->quizSubmission()->associate($submission);
-            $answerRecord->question()->associate($question);
-            $answerRecord->save();
+            $userQuestion = new UserQuestion();
+            $userQuestion->userQuiz()->associate($userQuiz);
+            $userQuestion->question()->associate($question);
+            $userQuestion->save();
         }
 
-        return $submission;
+        return $userQuiz;
     }
 
     public function isReadyToBePublished(): bool
@@ -147,9 +147,9 @@ public function isReadyToBePublished(): bool
         return $this->scheduled_at !== null && $this->duration !== null && $this->allQuestionsHaveCorrectAnswer();
     }
 
-    public function hasSubmissionsFrom(User $user): bool
+    public function hasUserQuizzesFrom(User $user): bool
     {
-        return $this->quizSubmissions->where("user_id", $user->id)->isNotEmpty();
+        return $this->userQuizzes->where("user_id", $user->id)->isNotEmpty();
     }
 
     protected function allQuestionsHaveCorrectAnswer(): bool
diff --git a/app/Models/User.php b/app/Models/User.php
index bf5aae8f..32ac52d4 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -20,7 +20,7 @@
 /**
  * @param string $token
  * @property int $id
- * @property string $name
+ * @property string $firstname
  * @property string $surname
  * @property string $email
  * @property string $password
@@ -30,7 +30,7 @@
  * @property Carbon $updated_at
  * @property School $school
  * @property boolean $is_anonymized
- * @property Collection<QuizSubmission> $quizSubmissions
+ * @property Collection<UserQuiz> $userQuizzes
  * @property Collection<Quiz> $assignedQuizzes
  */
 class User extends Authenticatable implements MustVerifyEmail, CanResetPassword
@@ -40,7 +40,7 @@ class User extends Authenticatable implements MustVerifyEmail, CanResetPassword
     use HasRoles;
 
     protected $fillable = [
-        "name",
+        "firstname",
         "surname",
         "email",
         "school_id",
@@ -65,9 +65,9 @@ public function sendPasswordResetNotification($token): void
         $this->notify(new ResetPasswordNotification($token));
     }
 
-    public function quizSubmissions(): HasMany
+    public function userQuizzes(): HasMany
     {
-        return $this->hasMany(QuizSubmission::class);
+        return $this->hasMany(UserQuiz::class);
     }
 
     public function assignedQuizzes()
diff --git a/app/Models/AnswerRecord.php b/app/Models/UserQuestion.php
similarity index 77%
rename from app/Models/AnswerRecord.php
rename to app/Models/UserQuestion.php
index 35e862e8..9a0de9c3 100644
--- a/app/Models/AnswerRecord.php
+++ b/app/Models/UserQuestion.php
@@ -14,16 +14,16 @@
  * @property int $id
  * @property Carbon $created_at
  * @property Carbon $updated_at
- * @property int $quiz_submission_id
+ * @property int $user_quiz_id
  * @property int $question_id
  * @property int $answer_id
  * @property bool $isClosed
  * @property bool $isCorrect
- * @property QuizSubmission $quizSubmission
+ * @property UserQuiz $userQuiz
  * @property Question $question
  * @property ?Answer $answer
  */
-class AnswerRecord extends Model
+class UserQuestion extends Model
 {
     use HasFactory;
 
@@ -31,9 +31,9 @@ class AnswerRecord extends Model
         "text",
     ];
 
-    public function quizSubmission(): BelongsTo
+    public function userQuiz(): BelongsTo
     {
-        return $this->belongsTo(QuizSubmission::class);
+        return $this->belongsTo(UserQuiz::class);
     }
 
     public function answer(): BelongsTo
@@ -48,7 +48,7 @@ public function question(): BelongsTo
 
     public function isClosed(): Attribute
     {
-        return Attribute::get(fn(): bool => $this->quizSubmission->isClosed);
+        return Attribute::get(fn(): bool => $this->userQuiz->isClosed);
     }
 
     public function isCorrect(): Attribute
diff --git a/app/Models/QuizSubmission.php b/app/Models/UserQuiz.php
similarity index 82%
rename from app/Models/QuizSubmission.php
rename to app/Models/UserQuiz.php
index 681bf45f..e54473c1 100644
--- a/app/Models/QuizSubmission.php
+++ b/app/Models/UserQuiz.php
@@ -24,9 +24,9 @@
  * @property bool $isClosed
  * @property Quiz $quiz
  * @property User $user
- * @property Collection<AnswerRecord> $answerRecords
+ * @property Collection<UserQuestion> $userQuestions
  */
-class QuizSubmission extends Model
+class UserQuiz extends Model
 {
     use HasFactory;
 
@@ -40,9 +40,9 @@ public function user(): BelongsTo
         return $this->belongsTo(User::class);
     }
 
-    public function answerRecords(): HasMany
+    public function userQuestions(): HasMany
     {
-        return $this->hasMany(AnswerRecord::class);
+        return $this->hasMany(UserQuestion::class);
     }
 
     public function isClosed(): Attribute
@@ -53,7 +53,7 @@ public function isClosed(): Attribute
     public function points(): Attribute
     {
         return Attribute::get(function (): int {
-            $correctAnswers = $this->answerRecords->filter(fn(AnswerRecord $record): bool => $record->isCorrect);
+            $correctAnswers = $this->userQuestions->filter(fn(UserQuestion $userQuestion): bool => $userQuestion->isCorrect);
 
             return $correctAnswers->count();
         });
diff --git a/app/Policies/AnswerRecordPolicy.php b/app/Policies/AnswerRecordPolicy.php
deleted file mode 100644
index 159446ab..00000000
--- a/app/Policies/AnswerRecordPolicy.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Policies;
-
-use App\Models\Answer;
-use App\Models\AnswerRecord;
-use App\Models\User;
-
-class AnswerRecordPolicy
-{
-    public function answer(User $user, AnswerRecord $answerRecord, Answer $answer): bool
-    {
-        $submission = $answerRecord->quizSubmission;
-
-        return !$submission->isClosed && $submission->user_id === $user->id && $answerRecord->question_id === $answer->question_id;
-    }
-}
diff --git a/app/Policies/QuizPolicy.php b/app/Policies/QuizPolicy.php
index 43709907..15af4039 100644
--- a/app/Policies/QuizPolicy.php
+++ b/app/Policies/QuizPolicy.php
@@ -5,8 +5,8 @@
 namespace App\Policies;
 
 use App\Models\Quiz;
-use App\Models\QuizSubmission;
 use App\Models\User;
+use App\Models\UserQuiz;
 use Illuminate\Auth\Access\Response;
 
 class QuizPolicy
@@ -42,7 +42,7 @@ public function unlock(User $user, Quiz $quiz): bool
 
     public function assign(User $user, Quiz $quiz): bool
     {
-        return $quiz->isLocked && !$quiz->isPublished && !$quiz->hasSubmissionsFrom($user);
+        return $quiz->isLocked && !$quiz->isPublished && !$quiz->hasUserQuizzesFrom($user);
     }
 
     public function viewAdminRanking(User $user, Quiz $quiz): Response
@@ -56,7 +56,7 @@ public function viewUserRanking(User $user, Quiz $quiz): Response
             return Response::deny("Ranking nie jest opublikowany.");
         }
 
-        $isUserInRanking = QuizSubmission::where("quiz_id", $quiz->id)
+        $isUserInRanking = UserQuiz::where("quiz_id", $quiz->id)
             ->where("user_id", $user->id)
             ->exists();
 
@@ -65,6 +65,6 @@ public function viewUserRanking(User $user, Quiz $quiz): Response
 
     public function publish(User $user, Quiz $quiz): bool
     {
-        return $quiz->isLocked && $user->hasRole("admin|super_admin") && $quiz->quizSubmissions->isNotEmpty();
+        return $quiz->isLocked && $user->hasRole("admin|super_admin") && $quiz->userQuizzes->isNotEmpty();
     }
 }
diff --git a/app/Policies/QuizSubmissionPolicy.php b/app/Policies/QuizSubmissionPolicy.php
deleted file mode 100644
index 8310e800..00000000
--- a/app/Policies/QuizSubmissionPolicy.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Policies;
-
-use App\Models\QuizSubmission;
-use App\Models\User;
-
-class QuizSubmissionPolicy
-{
-    public function view(User $user, QuizSubmission $quizSubmission): bool
-    {
-        return $user->id === $quizSubmission->user_id;
-    }
-
-    public function close(User $user, QuizSubmission $quizSubmission): bool
-    {
-        return $user->id === $quizSubmission->user_id && !$quizSubmission->isClosed;
-    }
-
-    public function result(User $user, QuizSubmission $quizSubmission): bool
-    {
-        return $user->id === $quizSubmission->user_id && $quizSubmission->isClosed;
-    }
-}
diff --git a/app/Policies/UserQuestionPolicy.php b/app/Policies/UserQuestionPolicy.php
new file mode 100644
index 00000000..23a394e8
--- /dev/null
+++ b/app/Policies/UserQuestionPolicy.php
@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Policies;
+
+use App\Models\Answer;
+use App\Models\User;
+use App\Models\UserQuestion;
+
+class UserQuestionPolicy
+{
+    public function answer(User $user, UserQuestion $userQuestion, Answer $answer): bool
+    {
+        $userQuiz = $userQuestion->userQuiz;
+
+        return !$userQuiz->isClosed && $userQuiz->user_id === $user->id && $userQuestion->question_id === $answer->question_id;
+    }
+}
diff --git a/app/Policies/UserQuizPolicy.php b/app/Policies/UserQuizPolicy.php
new file mode 100644
index 00000000..a15b0e23
--- /dev/null
+++ b/app/Policies/UserQuizPolicy.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Policies;
+
+use App\Models\User;
+use App\Models\UserQuiz;
+
+class UserQuizPolicy
+{
+    public function view(User $user, UserQuiz $userQuiz): bool
+    {
+        return $user->id === $userQuiz->user_id;
+    }
+
+    public function close(User $user, UserQuiz $userQuiz): bool
+    {
+        return $user->id === $userQuiz->user_id && !$userQuiz->isClosed;
+    }
+
+    public function result(User $user, UserQuiz $userQuiz): bool
+    {
+        return $user->id === $userQuiz->user_id && $userQuiz->isClosed;
+    }
+}
diff --git a/app/Rules/Regon.php b/app/Rules/Regon.php
new file mode 100644
index 00000000..b2899558
--- /dev/null
+++ b/app/Rules/Regon.php
@@ -0,0 +1,60 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Rules;
+
+use App\Helpers\RegonHelper;
+use Closure;
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Support\Facades\Lang;
+
+use function ctype_digit;
+use function intval;
+use function str_split;
+use function strlen;
+
+class Regon implements ValidationRule
+{
+    public function validate(string $attribute, mixed $value, Closure $fail): void
+    {
+        if (!ctype_digit($value)) {
+            $fail(Lang::get("validation.custom.regon.digits_only"));
+
+            return;
+        }
+
+        if (strlen($value) !== 9 && strlen($value) !== 14) {
+            $fail(Lang::get("validation.custom.regon.invalid_length"));
+
+            return;
+        }
+
+        $this->validate_short_regon($value, $fail);
+
+        if (strlen($value) === 14) {
+            $this->validate_long_regon($value, $fail);
+        }
+    }
+
+    protected function validate_short_regon(string $value, Closure $fail): void
+    {
+        $digits = str_split($value);
+        $checksum = RegonHelper::calculateChecksum($digits, RegonHelper::WEIGHTS_SHORT) % 11;
+
+        if ($checksum !== intval($digits[8])) {
+            $fail(Lang::get("validation.custom.regon.invalid_checksum"));
+        }
+    }
+
+    protected function validate_long_regon(string $value, Closure $fail): void
+    {
+        $digits = str_split($value);
+
+        $checksum = RegonHelper::calculateChecksum($digits, RegonHelper::WEIGHTS_LONG) % 11;
+
+        if ($checksum !== intval($digits[13])) {
+            $fail(Lang::get("validation.custom.regon.invalid_checksum"));
+        }
+    }
+}
diff --git a/app/Services/GetSchoolDataService.php b/app/Services/GetSchoolDataService.php
index 692b23fd..f3f0761c 100644
--- a/app/Services/GetSchoolDataService.php
+++ b/app/Services/GetSchoolDataService.php
@@ -21,9 +21,9 @@ public function __construct(
     /**
      * @param array<SchoolType> $schoolTypes
      */
-    public function getSchools(Voivodeship $voivodeship, array $schoolTypes): void
+    public function getSchools(Voivodeship $voivodeship, array $schoolTypes): int
     {
-        $this->store($this->fetchSchools($voivodeship, $schoolTypes));
+        return $this->store($this->fetchSchools($voivodeship, $schoolTypes));
     }
 
     /**
@@ -45,12 +45,17 @@ protected function fetchSchools(Voivodeship $voivodeship, array $schoolTypes): C
     /**
      * @param Collection<SchoolDTO> $schools
      */
-    protected function store(Collection $schools): void
+    protected function store(Collection $schools): int
     {
+        $fetched = 0;
+
         foreach ($schools as $dto) {
-            $school = School::query()->firstOrNew(["regon" => $dto->regon]);
-            $school->fill($dto->toArray());
-            $school->save();
+            if (School::query()->where("regon", "=", $dto->regon)->doesntExist()) {
+                School::query()->create($dto->toArray());
+                ++$fetched;
+            }
         }
+
+        return $fetched;
     }
 }
diff --git a/composer.lock b/composer.lock
index 8926c8e4..2fe4ef9d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -380,16 +380,16 @@
         },
         {
             "name": "dragonmantank/cron-expression",
-            "version": "v3.3.3",
+            "version": "v3.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dragonmantank/cron-expression.git",
-                "reference": "adfb1f505deb6384dc8b39804c5065dd3c8c8c0a"
+                "reference": "8c784d071debd117328803d86b2097615b457500"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/adfb1f505deb6384dc8b39804c5065dd3c8c8c0a",
-                "reference": "adfb1f505deb6384dc8b39804c5065dd3c8c8c0a",
+                "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/8c784d071debd117328803d86b2097615b457500",
+                "reference": "8c784d071debd117328803d86b2097615b457500",
                 "shasum": ""
             },
             "require": {
@@ -402,10 +402,14 @@
             "require-dev": {
                 "phpstan/extension-installer": "^1.0",
                 "phpstan/phpstan": "^1.0",
-                "phpstan/phpstan-webmozart-assert": "^1.0",
                 "phpunit/phpunit": "^7.0|^8.0|^9.0"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.x-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
                     "Cron\\": "src/Cron/"
@@ -429,7 +433,7 @@
             ],
             "support": {
                 "issues": "https://github.com/dragonmantank/cron-expression/issues",
-                "source": "https://github.com/dragonmantank/cron-expression/tree/v3.3.3"
+                "source": "https://github.com/dragonmantank/cron-expression/tree/v3.4.0"
             },
             "funding": [
                 {
@@ -437,7 +441,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-08-10T19:36:49+00:00"
+            "time": "2024-10-09T13:47:03+00:00"
         },
         {
             "name": "egulias/email-validator",
@@ -1128,16 +1132,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v11.25.0",
+            "version": "v11.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "b487a9089c0b1c71ac63bb6bc44fb4b00dc6da2e"
+                "reference": "365090ed2c68244e3141cdb5e247cdf3dfba2c40"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/b487a9089c0b1c71ac63bb6bc44fb4b00dc6da2e",
-                "reference": "b487a9089c0b1c71ac63bb6bc44fb4b00dc6da2e",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/365090ed2c68244e3141cdb5e247cdf3dfba2c40",
+                "reference": "365090ed2c68244e3141cdb5e247cdf3dfba2c40",
                 "shasum": ""
             },
             "require": {
@@ -1156,7 +1160,7 @@
                 "fruitcake/php-cors": "^1.3",
                 "guzzlehttp/guzzle": "^7.8",
                 "guzzlehttp/uri-template": "^1.0",
-                "laravel/prompts": "^0.1.18|^0.2.0",
+                "laravel/prompts": "^0.1.18|^0.2.0|^0.3.0",
                 "laravel/serializable-closure": "^1.3",
                 "league/commonmark": "^2.2.1",
                 "league/flysystem": "^3.8.0",
@@ -1333,25 +1337,25 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2024-09-26T11:21:58+00:00"
+            "time": "2024-11-12T15:36:15+00:00"
         },
         {
             "name": "laravel/prompts",
-            "version": "v0.2.1",
+            "version": "v0.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/prompts.git",
-                "reference": "a132ccf64d46da183b7cf3729df260e836cc7e15"
+                "reference": "0e0535747c6b8d6d10adca8b68293cf4517abb0f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/prompts/zipball/a132ccf64d46da183b7cf3729df260e836cc7e15",
-                "reference": "a132ccf64d46da183b7cf3729df260e836cc7e15",
+                "url": "https://api.github.com/repos/laravel/prompts/zipball/0e0535747c6b8d6d10adca8b68293cf4517abb0f",
+                "reference": "0e0535747c6b8d6d10adca8b68293cf4517abb0f",
                 "shasum": ""
             },
             "require": {
+                "composer-runtime-api": "^2.2",
                 "ext-mbstring": "*",
-                "illuminate/collections": "^10.0|^11.0",
                 "php": "^8.1",
                 "symfony/console": "^6.2|^7.0"
             },
@@ -1360,8 +1364,9 @@
                 "laravel/framework": ">=10.17.0 <10.25.0"
             },
             "require-dev": {
+                "illuminate/collections": "^10.0|^11.0",
                 "mockery/mockery": "^1.5",
-                "pestphp/pest": "^2.3",
+                "pestphp/pest": "^2.3|^3.4",
                 "phpstan/phpstan": "^1.11",
                 "phpstan/phpstan-mockery": "^1.1"
             },
@@ -1371,7 +1376,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "0.2.x-dev"
+                    "dev-main": "0.3.x-dev"
                 }
             },
             "autoload": {
@@ -1389,9 +1394,9 @@
             "description": "Add beautiful and user-friendly forms to your command-line applications.",
             "support": {
                 "issues": "https://github.com/laravel/prompts/issues",
-                "source": "https://github.com/laravel/prompts/tree/v0.2.1"
+                "source": "https://github.com/laravel/prompts/tree/v0.3.2"
             },
-            "time": "2024-09-19T10:28:37+00:00"
+            "time": "2024-11-12T14:59:47+00:00"
         },
         {
             "name": "laravel/sanctum",
@@ -1459,16 +1464,16 @@
         },
         {
             "name": "laravel/serializable-closure",
-            "version": "v1.3.5",
+            "version": "v1.3.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/serializable-closure.git",
-                "reference": "1dc4a3dbfa2b7628a3114e43e32120cce7cdda9c"
+                "reference": "f865a58ea3a0107c336b7045104c75243fa59d96"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/1dc4a3dbfa2b7628a3114e43e32120cce7cdda9c",
-                "reference": "1dc4a3dbfa2b7628a3114e43e32120cce7cdda9c",
+                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/f865a58ea3a0107c336b7045104c75243fa59d96",
+                "reference": "f865a58ea3a0107c336b7045104c75243fa59d96",
                 "shasum": ""
             },
             "require": {
@@ -1516,7 +1521,7 @@
                 "issues": "https://github.com/laravel/serializable-closure/issues",
                 "source": "https://github.com/laravel/serializable-closure"
             },
-            "time": "2024-09-23T13:33:08+00:00"
+            "time": "2024-11-11T17:06:04+00:00"
         },
         {
             "name": "laravel/tinker",
@@ -1774,16 +1779,16 @@
         },
         {
             "name": "league/flysystem",
-            "version": "3.29.0",
+            "version": "3.29.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "0adc0d9a51852e170e0028a60bd271726626d3f0"
+                "reference": "edc1bb7c86fab0776c3287dbd19b5fa278347319"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/0adc0d9a51852e170e0028a60bd271726626d3f0",
-                "reference": "0adc0d9a51852e170e0028a60bd271726626d3f0",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/edc1bb7c86fab0776c3287dbd19b5fa278347319",
+                "reference": "edc1bb7c86fab0776c3287dbd19b5fa278347319",
                 "shasum": ""
             },
             "require": {
@@ -1851,9 +1856,9 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/flysystem/issues",
-                "source": "https://github.com/thephpleague/flysystem/tree/3.29.0"
+                "source": "https://github.com/thephpleague/flysystem/tree/3.29.1"
             },
-            "time": "2024-09-29T11:59:11+00:00"
+            "time": "2024-10-08T08:58:34+00:00"
         },
         {
             "name": "league/flysystem-local",
@@ -1962,16 +1967,16 @@
         },
         {
             "name": "monolog/monolog",
-            "version": "3.7.0",
+            "version": "3.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "f4393b648b78a5408747de94fca38beb5f7e9ef8"
+                "reference": "32e515fdc02cdafbe4593e30a9350d486b125b67"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f4393b648b78a5408747de94fca38beb5f7e9ef8",
-                "reference": "f4393b648b78a5408747de94fca38beb5f7e9ef8",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/32e515fdc02cdafbe4593e30a9350d486b125b67",
+                "reference": "32e515fdc02cdafbe4593e30a9350d486b125b67",
                 "shasum": ""
             },
             "require": {
@@ -1991,12 +1996,14 @@
                 "guzzlehttp/psr7": "^2.2",
                 "mongodb/mongodb": "^1.8",
                 "php-amqplib/php-amqplib": "~2.4 || ^3",
-                "phpstan/phpstan": "^1.9",
-                "phpstan/phpstan-deprecation-rules": "^1.0",
-                "phpstan/phpstan-strict-rules": "^1.4",
-                "phpunit/phpunit": "^10.5.17",
+                "php-console/php-console": "^3.1.8",
+                "phpstan/phpstan": "^2",
+                "phpstan/phpstan-deprecation-rules": "^2",
+                "phpstan/phpstan-strict-rules": "^2",
+                "phpunit/phpunit": "^10.5.17 || ^11.0.7",
                 "predis/predis": "^1.1 || ^2",
-                "ruflin/elastica": "^7",
+                "rollbar/rollbar": "^4.0",
+                "ruflin/elastica": "^7 || ^8",
                 "symfony/mailer": "^5.4 || ^6",
                 "symfony/mime": "^5.4 || ^6"
             },
@@ -2047,7 +2054,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Seldaek/monolog/issues",
-                "source": "https://github.com/Seldaek/monolog/tree/3.7.0"
+                "source": "https://github.com/Seldaek/monolog/tree/3.8.0"
             },
             "funding": [
                 {
@@ -2059,24 +2066,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-28T09:40:51+00:00"
+            "time": "2024-11-12T13:57:08+00:00"
         },
         {
             "name": "nesbot/carbon",
-            "version": "3.8.0",
+            "version": "3.8.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "bbd3eef89af8ba66a3aa7952b5439168fbcc529f"
+                "reference": "e1268cdbc486d97ce23fef2c666dc3c6b6de9947"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/bbd3eef89af8ba66a3aa7952b5439168fbcc529f",
-                "reference": "bbd3eef89af8ba66a3aa7952b5439168fbcc529f",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/e1268cdbc486d97ce23fef2c666dc3c6b6de9947",
+                "reference": "e1268cdbc486d97ce23fef2c666dc3c6b6de9947",
                 "shasum": ""
             },
             "require": {
-                "carbonphp/carbon-doctrine-types": "*",
+                "carbonphp/carbon-doctrine-types": "<100.0",
                 "ext-json": "*",
                 "php": "^8.1",
                 "psr/clock": "^1.0",
@@ -2165,28 +2172,28 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-08-19T06:22:39+00:00"
+            "time": "2024-11-07T17:46:48+00:00"
         },
         {
             "name": "nette/schema",
-            "version": "v1.3.0",
+            "version": "v1.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nette/schema.git",
-                "reference": "a6d3a6d1f545f01ef38e60f375d1cf1f4de98188"
+                "reference": "da801d52f0354f70a638673c4a0f04e16529431d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nette/schema/zipball/a6d3a6d1f545f01ef38e60f375d1cf1f4de98188",
-                "reference": "a6d3a6d1f545f01ef38e60f375d1cf1f4de98188",
+                "url": "https://api.github.com/repos/nette/schema/zipball/da801d52f0354f70a638673c4a0f04e16529431d",
+                "reference": "da801d52f0354f70a638673c4a0f04e16529431d",
                 "shasum": ""
             },
             "require": {
                 "nette/utils": "^4.0",
-                "php": "8.1 - 8.3"
+                "php": "8.1 - 8.4"
             },
             "require-dev": {
-                "nette/tester": "^2.4",
+                "nette/tester": "^2.5.2",
                 "phpstan/phpstan-nette": "^1.0",
                 "tracy/tracy": "^2.8"
             },
@@ -2225,9 +2232,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nette/schema/issues",
-                "source": "https://github.com/nette/schema/tree/v1.3.0"
+                "source": "https://github.com/nette/schema/tree/v1.3.2"
             },
-            "time": "2023-12-11T11:54:22+00:00"
+            "time": "2024-10-06T23:10:23+00:00"
         },
         {
             "name": "nette/utils",
@@ -2375,32 +2382,31 @@
         },
         {
             "name": "nunomaduro/termwind",
-            "version": "v2.1.0",
+            "version": "v2.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nunomaduro/termwind.git",
-                "reference": "e5f21eade88689536c0cdad4c3cd75f3ed26e01a"
+                "reference": "42c84e4e8090766bbd6445d06cd6e57650626ea3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nunomaduro/termwind/zipball/e5f21eade88689536c0cdad4c3cd75f3ed26e01a",
-                "reference": "e5f21eade88689536c0cdad4c3cd75f3ed26e01a",
+                "url": "https://api.github.com/repos/nunomaduro/termwind/zipball/42c84e4e8090766bbd6445d06cd6e57650626ea3",
+                "reference": "42c84e4e8090766bbd6445d06cd6e57650626ea3",
                 "shasum": ""
             },
             "require": {
                 "ext-mbstring": "*",
                 "php": "^8.2",
-                "symfony/console": "^7.0.4"
+                "symfony/console": "^7.1.5"
             },
             "require-dev": {
-                "ergebnis/phpstan-rules": "^2.2.0",
-                "illuminate/console": "^11.1.1",
-                "laravel/pint": "^1.15.0",
-                "mockery/mockery": "^1.6.11",
-                "pestphp/pest": "^2.34.6",
-                "phpstan/phpstan": "^1.10.66",
-                "phpstan/phpstan-strict-rules": "^1.5.2",
-                "symfony/var-dumper": "^7.0.4",
+                "illuminate/console": "^11.28.0",
+                "laravel/pint": "^1.18.1",
+                "mockery/mockery": "^1.6.12",
+                "pestphp/pest": "^2.36.0",
+                "phpstan/phpstan": "^1.12.6",
+                "phpstan/phpstan-strict-rules": "^1.6.1",
+                "symfony/var-dumper": "^7.1.5",
                 "thecodingmachine/phpstan-strict-rules": "^1.0.0"
             },
             "type": "library",
@@ -2443,7 +2449,7 @@
             ],
             "support": {
                 "issues": "https://github.com/nunomaduro/termwind/issues",
-                "source": "https://github.com/nunomaduro/termwind/tree/v2.1.0"
+                "source": "https://github.com/nunomaduro/termwind/tree/v2.2.0"
             },
             "funding": [
                 {
@@ -2459,7 +2465,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-09-05T15:25:50+00:00"
+            "time": "2024-10-15T16:15:16+00:00"
         },
         {
             "name": "phpoption/phpoption",
@@ -3471,16 +3477,16 @@
         },
         {
             "name": "symfony/clock",
-            "version": "v7.1.1",
+            "version": "v7.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/clock.git",
-                "reference": "3dfc8b084853586de51dd1441c6242c76a28cbe7"
+                "reference": "97bebc53548684c17ed696bc8af016880f0f098d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/clock/zipball/3dfc8b084853586de51dd1441c6242c76a28cbe7",
-                "reference": "3dfc8b084853586de51dd1441c6242c76a28cbe7",
+                "url": "https://api.github.com/repos/symfony/clock/zipball/97bebc53548684c17ed696bc8af016880f0f098d",
+                "reference": "97bebc53548684c17ed696bc8af016880f0f098d",
                 "shasum": ""
             },
             "require": {
@@ -3525,7 +3531,7 @@
                 "time"
             ],
             "support": {
-                "source": "https://github.com/symfony/clock/tree/v7.1.1"
+                "source": "https://github.com/symfony/clock/tree/v7.1.6"
             },
             "funding": [
                 {
@@ -3541,20 +3547,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:57:53+00:00"
+            "time": "2024-09-25T14:20:29+00:00"
         },
         {
             "name": "symfony/console",
-            "version": "v7.1.5",
+            "version": "v7.1.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "0fa539d12b3ccf068a722bbbffa07ca7079af9ee"
+                "reference": "3284aafcac338b6e86fd955ee4d794cbe434151a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/0fa539d12b3ccf068a722bbbffa07ca7079af9ee",
-                "reference": "0fa539d12b3ccf068a722bbbffa07ca7079af9ee",
+                "url": "https://api.github.com/repos/symfony/console/zipball/3284aafcac338b6e86fd955ee4d794cbe434151a",
+                "reference": "3284aafcac338b6e86fd955ee4d794cbe434151a",
                 "shasum": ""
             },
             "require": {
@@ -3618,7 +3624,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v7.1.5"
+                "source": "https://github.com/symfony/console/tree/v7.1.7"
             },
             "funding": [
                 {
@@ -3634,20 +3640,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-20T08:28:38+00:00"
+            "time": "2024-11-05T15:34:55+00:00"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v7.1.1",
+            "version": "v7.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "1c7cee86c6f812896af54434f8ce29c8d94f9ff4"
+                "reference": "4aa4f6b3d6749c14d3aa815eef8226632e7bbc66"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/1c7cee86c6f812896af54434f8ce29c8d94f9ff4",
-                "reference": "1c7cee86c6f812896af54434f8ce29c8d94f9ff4",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/4aa4f6b3d6749c14d3aa815eef8226632e7bbc66",
+                "reference": "4aa4f6b3d6749c14d3aa815eef8226632e7bbc66",
                 "shasum": ""
             },
             "require": {
@@ -3683,7 +3689,7 @@
             "description": "Converts CSS selectors to XPath expressions",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/css-selector/tree/v7.1.1"
+                "source": "https://github.com/symfony/css-selector/tree/v7.1.6"
             },
             "funding": [
                 {
@@ -3699,7 +3705,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:57:53+00:00"
+            "time": "2024-09-25T14:20:29+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -3770,16 +3776,16 @@
         },
         {
             "name": "symfony/error-handler",
-            "version": "v7.1.3",
+            "version": "v7.1.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/error-handler.git",
-                "reference": "432bb369952795c61ca1def65e078c4a80dad13c"
+                "reference": "010e44661f4c6babaf8c4862fe68c24a53903342"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/error-handler/zipball/432bb369952795c61ca1def65e078c4a80dad13c",
-                "reference": "432bb369952795c61ca1def65e078c4a80dad13c",
+                "url": "https://api.github.com/repos/symfony/error-handler/zipball/010e44661f4c6babaf8c4862fe68c24a53903342",
+                "reference": "010e44661f4c6babaf8c4862fe68c24a53903342",
                 "shasum": ""
             },
             "require": {
@@ -3825,7 +3831,7 @@
             "description": "Provides tools to manage errors and ease debugging PHP code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/error-handler/tree/v7.1.3"
+                "source": "https://github.com/symfony/error-handler/tree/v7.1.7"
             },
             "funding": [
                 {
@@ -3841,20 +3847,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-07-26T13:02:51+00:00"
+            "time": "2024-11-05T15:34:55+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v7.1.1",
+            "version": "v7.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "9fa7f7a21beb22a39a8f3f28618b29e50d7a55a7"
+                "reference": "87254c78dd50721cfd015b62277a8281c5589702"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/9fa7f7a21beb22a39a8f3f28618b29e50d7a55a7",
-                "reference": "9fa7f7a21beb22a39a8f3f28618b29e50d7a55a7",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/87254c78dd50721cfd015b62277a8281c5589702",
+                "reference": "87254c78dd50721cfd015b62277a8281c5589702",
                 "shasum": ""
             },
             "require": {
@@ -3905,7 +3911,7 @@
             "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v7.1.1"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v7.1.6"
             },
             "funding": [
                 {
@@ -3921,7 +3927,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:57:53+00:00"
+            "time": "2024-09-25T14:20:29+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
@@ -4001,16 +4007,16 @@
         },
         {
             "name": "symfony/finder",
-            "version": "v7.1.4",
+            "version": "v7.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "d95bbf319f7d052082fb7af147e0f835a695e823"
+                "reference": "2cb89664897be33f78c65d3d2845954c8d7a43b8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/d95bbf319f7d052082fb7af147e0f835a695e823",
-                "reference": "d95bbf319f7d052082fb7af147e0f835a695e823",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/2cb89664897be33f78c65d3d2845954c8d7a43b8",
+                "reference": "2cb89664897be33f78c65d3d2845954c8d7a43b8",
                 "shasum": ""
             },
             "require": {
@@ -4045,7 +4051,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v7.1.4"
+                "source": "https://github.com/symfony/finder/tree/v7.1.6"
             },
             "funding": [
                 {
@@ -4061,20 +4067,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-08-13T14:28:19+00:00"
+            "time": "2024-10-01T08:31:23+00:00"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v7.1.5",
+            "version": "v7.1.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "e30ef73b1e44eea7eb37ba69600a354e553f694b"
+                "reference": "5183b61657807099d98f3367bcccb850238b17a9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e30ef73b1e44eea7eb37ba69600a354e553f694b",
-                "reference": "e30ef73b1e44eea7eb37ba69600a354e553f694b",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/5183b61657807099d98f3367bcccb850238b17a9",
+                "reference": "5183b61657807099d98f3367bcccb850238b17a9",
                 "shasum": ""
             },
             "require": {
@@ -4122,7 +4128,7 @@
             "description": "Defines an object-oriented layer for the HTTP specification",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-foundation/tree/v7.1.5"
+                "source": "https://github.com/symfony/http-foundation/tree/v7.1.7"
             },
             "funding": [
                 {
@@ -4138,20 +4144,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-20T08:28:38+00:00"
+            "time": "2024-11-06T09:02:46+00:00"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v7.1.5",
+            "version": "v7.1.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "44204d96150a9df1fc57601ec933d23fefc2d65b"
+                "reference": "7f137cda31fd41e422edcdc01915f2c095b84399"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/44204d96150a9df1fc57601ec933d23fefc2d65b",
-                "reference": "44204d96150a9df1fc57601ec933d23fefc2d65b",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/7f137cda31fd41e422edcdc01915f2c095b84399",
+                "reference": "7f137cda31fd41e422edcdc01915f2c095b84399",
                 "shasum": ""
             },
             "require": {
@@ -4236,7 +4242,7 @@
             "description": "Provides a structured process for converting a Request into a Response",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v7.1.5"
+                "source": "https://github.com/symfony/http-kernel/tree/v7.1.7"
             },
             "funding": [
                 {
@@ -4252,20 +4258,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-21T06:09:21+00:00"
+            "time": "2024-11-06T09:54:34+00:00"
         },
         {
             "name": "symfony/mailer",
-            "version": "v7.1.5",
+            "version": "v7.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mailer.git",
-                "reference": "bbf21460c56f29810da3df3e206e38dfbb01e80b"
+                "reference": "69c9948451fb3a6a4d47dc8261d1794734e76cdd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mailer/zipball/bbf21460c56f29810da3df3e206e38dfbb01e80b",
-                "reference": "bbf21460c56f29810da3df3e206e38dfbb01e80b",
+                "url": "https://api.github.com/repos/symfony/mailer/zipball/69c9948451fb3a6a4d47dc8261d1794734e76cdd",
+                "reference": "69c9948451fb3a6a4d47dc8261d1794734e76cdd",
                 "shasum": ""
             },
             "require": {
@@ -4316,7 +4322,7 @@
             "description": "Helps sending emails",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/mailer/tree/v7.1.5"
+                "source": "https://github.com/symfony/mailer/tree/v7.1.6"
             },
             "funding": [
                 {
@@ -4332,20 +4338,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-08T12:32:26+00:00"
+            "time": "2024-09-25T14:20:29+00:00"
         },
         {
             "name": "symfony/mime",
-            "version": "v7.1.5",
+            "version": "v7.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "711d2e167e8ce65b05aea6b258c449671cdd38ff"
+                "reference": "caa1e521edb2650b8470918dfe51708c237f0598"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/711d2e167e8ce65b05aea6b258c449671cdd38ff",
-                "reference": "711d2e167e8ce65b05aea6b258c449671cdd38ff",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/caa1e521edb2650b8470918dfe51708c237f0598",
+                "reference": "caa1e521edb2650b8470918dfe51708c237f0598",
                 "shasum": ""
             },
             "require": {
@@ -4400,7 +4406,7 @@
                 "mime-type"
             ],
             "support": {
-                "source": "https://github.com/symfony/mime/tree/v7.1.5"
+                "source": "https://github.com/symfony/mime/tree/v7.1.6"
             },
             "funding": [
                 {
@@ -4416,7 +4422,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-20T08:28:38+00:00"
+            "time": "2024-10-25T15:11:02+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -5056,16 +5062,16 @@
         },
         {
             "name": "symfony/process",
-            "version": "v7.1.5",
+            "version": "v7.1.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "5c03ee6369281177f07f7c68252a280beccba847"
+                "reference": "9b8a40b7289767aa7117e957573c2a535efe6585"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/5c03ee6369281177f07f7c68252a280beccba847",
-                "reference": "5c03ee6369281177f07f7c68252a280beccba847",
+                "url": "https://api.github.com/repos/symfony/process/zipball/9b8a40b7289767aa7117e957573c2a535efe6585",
+                "reference": "9b8a40b7289767aa7117e957573c2a535efe6585",
                 "shasum": ""
             },
             "require": {
@@ -5097,7 +5103,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v7.1.5"
+                "source": "https://github.com/symfony/process/tree/v7.1.7"
             },
             "funding": [
                 {
@@ -5113,20 +5119,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-19T21:48:23+00:00"
+            "time": "2024-11-06T09:25:12+00:00"
         },
         {
             "name": "symfony/routing",
-            "version": "v7.1.4",
+            "version": "v7.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "1500aee0094a3ce1c92626ed8cf3c2037e86f5a7"
+                "reference": "66a2c469f6c22d08603235c46a20007c0701ea0a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/1500aee0094a3ce1c92626ed8cf3c2037e86f5a7",
-                "reference": "1500aee0094a3ce1c92626ed8cf3c2037e86f5a7",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/66a2c469f6c22d08603235c46a20007c0701ea0a",
+                "reference": "66a2c469f6c22d08603235c46a20007c0701ea0a",
                 "shasum": ""
             },
             "require": {
@@ -5178,7 +5184,7 @@
                 "url"
             ],
             "support": {
-                "source": "https://github.com/symfony/routing/tree/v7.1.4"
+                "source": "https://github.com/symfony/routing/tree/v7.1.6"
             },
             "funding": [
                 {
@@ -5194,7 +5200,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-08-29T08:16:25+00:00"
+            "time": "2024-10-01T08:31:23+00:00"
         },
         {
             "name": "symfony/service-contracts",
@@ -5281,16 +5287,16 @@
         },
         {
             "name": "symfony/string",
-            "version": "v7.1.5",
+            "version": "v7.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "d66f9c343fa894ec2037cc928381df90a7ad4306"
+                "reference": "61b72d66bf96c360a727ae6232df5ac83c71f626"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/d66f9c343fa894ec2037cc928381df90a7ad4306",
-                "reference": "d66f9c343fa894ec2037cc928381df90a7ad4306",
+                "url": "https://api.github.com/repos/symfony/string/zipball/61b72d66bf96c360a727ae6232df5ac83c71f626",
+                "reference": "61b72d66bf96c360a727ae6232df5ac83c71f626",
                 "shasum": ""
             },
             "require": {
@@ -5348,7 +5354,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v7.1.5"
+                "source": "https://github.com/symfony/string/tree/v7.1.6"
             },
             "funding": [
                 {
@@ -5364,20 +5370,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-20T08:28:38+00:00"
+            "time": "2024-09-25T14:20:29+00:00"
         },
         {
             "name": "symfony/translation",
-            "version": "v7.1.5",
+            "version": "v7.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "235535e3f84f3dfbdbde0208ede6ca75c3a489ea"
+                "reference": "b9f72ab14efdb6b772f85041fa12f820dee8d55f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/235535e3f84f3dfbdbde0208ede6ca75c3a489ea",
-                "reference": "235535e3f84f3dfbdbde0208ede6ca75c3a489ea",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/b9f72ab14efdb6b772f85041fa12f820dee8d55f",
+                "reference": "b9f72ab14efdb6b772f85041fa12f820dee8d55f",
                 "shasum": ""
             },
             "require": {
@@ -5442,7 +5448,7 @@
             "description": "Provides tools to internationalize your application",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/translation/tree/v7.1.5"
+                "source": "https://github.com/symfony/translation/tree/v7.1.6"
             },
             "funding": [
                 {
@@ -5458,7 +5464,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-16T06:30:38+00:00"
+            "time": "2024-09-28T12:35:13+00:00"
         },
         {
             "name": "symfony/translation-contracts",
@@ -5540,16 +5546,16 @@
         },
         {
             "name": "symfony/uid",
-            "version": "v7.1.5",
+            "version": "v7.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/uid.git",
-                "reference": "8c7bb8acb933964055215d89f9a9871df0239317"
+                "reference": "65befb3bb2d503bbffbd08c815aa38b472999917"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/uid/zipball/8c7bb8acb933964055215d89f9a9871df0239317",
-                "reference": "8c7bb8acb933964055215d89f9a9871df0239317",
+                "url": "https://api.github.com/repos/symfony/uid/zipball/65befb3bb2d503bbffbd08c815aa38b472999917",
+                "reference": "65befb3bb2d503bbffbd08c815aa38b472999917",
                 "shasum": ""
             },
             "require": {
@@ -5594,7 +5600,7 @@
                 "uuid"
             ],
             "support": {
-                "source": "https://github.com/symfony/uid/tree/v7.1.5"
+                "source": "https://github.com/symfony/uid/tree/v7.1.6"
             },
             "funding": [
                 {
@@ -5610,20 +5616,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-17T09:16:35+00:00"
+            "time": "2024-09-25T14:20:29+00:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v7.1.5",
+            "version": "v7.1.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "e20e03889539fd4e4211e14d2179226c513c010d"
+                "reference": "f6ea51f669760cacd7464bf7eaa0be87b8072db1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/e20e03889539fd4e4211e14d2179226c513c010d",
-                "reference": "e20e03889539fd4e4211e14d2179226c513c010d",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/f6ea51f669760cacd7464bf7eaa0be87b8072db1",
+                "reference": "f6ea51f669760cacd7464bf7eaa0be87b8072db1",
                 "shasum": ""
             },
             "require": {
@@ -5677,7 +5683,7 @@
                 "dump"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v7.1.5"
+                "source": "https://github.com/symfony/var-dumper/tree/v7.1.7"
             },
             "funding": [
                 {
@@ -5693,7 +5699,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-16T10:07:02+00:00"
+            "time": "2024-11-05T15:34:55+00:00"
         },
         {
             "name": "tijsverkoyen/css-to-inline-styles",
@@ -9934,13 +9940,13 @@
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {},
     "prefer-stable": true,
     "prefer-lowest": false,
     "platform": {
         "php": "^8.3.4",
         "ext-pdo": "*"
     },
-    "platform-dev": [],
+    "platform-dev": {},
     "plugin-api-version": "2.6.0"
 }
diff --git a/database/factories/SchoolFactory.php b/database/factories/SchoolFactory.php
index bc36c77f..0d121b9c 100644
--- a/database/factories/SchoolFactory.php
+++ b/database/factories/SchoolFactory.php
@@ -4,11 +4,10 @@
 
 namespace Database\Factories;
 
+use App\Helpers\RegonHelper;
 use App\Models\School;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
-use function str;
-
 /**
  * @extends Factory<School>
  */
@@ -23,12 +22,12 @@ public function definition(): array
     {
         return [
             "name" => fake()->company(),
-            "regon" => str(fake()->randomNumber(9)),
+            "regon" => RegonHelper::generateShortRegon(),
             "city" => fake()->city(),
             "street" => fake()->streetName(),
             "building_number" => fake()->buildingNumber(),
             "apartment_number" => fake()->buildingNumber(),
-            "zip_code" => fake()->postcode(),
+            "zip_code" => fake()->randomNumber(2) . "-" . fake()->randomNumber(3),
         ];
     }
 
diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php
index 6c18b01e..15ac6060 100644
--- a/database/factories/UserFactory.php
+++ b/database/factories/UserFactory.php
@@ -19,7 +19,7 @@ class UserFactory extends Factory
     public function definition(): array
     {
         return [
-            "name" => fake()->firstName(),
+            "firstname" => fake()->firstName(),
             "surname" => fake()->lastName(),
             "email" => fake()->unique()->safeEmail(),
             "email_verified_at" => Carbon::now(),
diff --git a/database/factories/AnswerRecordFactory.php b/database/factories/UserQuestionFactory.php
similarity index 58%
rename from database/factories/AnswerRecordFactory.php
rename to database/factories/UserQuestionFactory.php
index d0ee29f6..33cfc8b9 100644
--- a/database/factories/AnswerRecordFactory.php
+++ b/database/factories/UserQuestionFactory.php
@@ -4,20 +4,20 @@
 
 namespace Database\Factories;
 
-use App\Models\AnswerRecord;
 use App\Models\Question;
-use App\Models\QuizSubmission;
+use App\Models\UserQuestion;
+use App\Models\UserQuiz;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 /**
- * @extends Factory<AnswerRecord>
+ * @extends Factory<UserQuestion>
  */
-class AnswerRecordFactory extends Factory
+class UserQuestionFactory extends Factory
 {
     public function definition(): array
     {
         return [
-            "quiz_submission_id" => QuizSubmission::factory(),
+            "user_quiz_id" => UserQuiz::factory(),
             "question_id" => Question::factory(),
         ];
     }
diff --git a/database/factories/QuizSubmissionFactory.php b/database/factories/UserQuizFactory.php
similarity index 84%
rename from database/factories/QuizSubmissionFactory.php
rename to database/factories/UserQuizFactory.php
index 4c10c093..e6f508e1 100644
--- a/database/factories/QuizSubmissionFactory.php
+++ b/database/factories/UserQuizFactory.php
@@ -5,15 +5,15 @@
 namespace Database\Factories;
 
 use App\Models\Quiz;
-use App\Models\QuizSubmission;
 use App\Models\User;
+use App\Models\UserQuiz;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 /**
- * @extends Factory<QuizSubmission>
+ * @extends Factory<UserQuiz>
  */
-class QuizSubmissionFactory extends Factory
+class UserQuizFactory extends Factory
 {
     public function definition(): array
     {
diff --git a/database/migrations/0001_01_01_000000_create_users_table.php b/database/migrations/0001_01_01_000000_create_users_table.php
index 38b52a4a..5f34af2f 100644
--- a/database/migrations/0001_01_01_000000_create_users_table.php
+++ b/database/migrations/0001_01_01_000000_create_users_table.php
@@ -11,7 +11,7 @@ public function up(): void
     {
         Schema::create("users", function (Blueprint $table): void {
             $table->bigIncrements("id")->unique();
-            $table->string("name");
+            $table->string("firstname");
             $table->string("surname");
             $table->string("email")->unique();
             $table->timestamp("email_verified_at")->nullable();
diff --git a/database/migrations/2024_08_13_104625_create_quiz_submissions_table.php b/database/migrations/2024_08_13_104625_create_quiz_submissions_table.php
index 59639aa2..4783a7dd 100644
--- a/database/migrations/2024_08_13_104625_create_quiz_submissions_table.php
+++ b/database/migrations/2024_08_13_104625_create_quiz_submissions_table.php
@@ -11,7 +11,7 @@
 return new class() extends Migration {
     public function up(): void
     {
-        Schema::create("quiz_submissions", function (Blueprint $table): void {
+        Schema::create("user_quizzes", function (Blueprint $table): void {
             $table->id();
             $table->foreignIdFor(Quiz::class)->constrained()->cascadeOnDelete();
             $table->foreignIdFor(User::class)->constrained()->cascadeOnDelete();
@@ -22,6 +22,6 @@ public function up(): void
 
     public function down(): void
     {
-        Schema::dropIfExists("quiz_submissions");
+        Schema::dropIfExists("user_quizzes");
     }
 };
diff --git a/database/migrations/2024_08_13_104743_create_answer_records_table.php b/database/migrations/2024_08_13_104743_create_answer_records_table.php
index e026e30d..3e74d73f 100644
--- a/database/migrations/2024_08_13_104743_create_answer_records_table.php
+++ b/database/migrations/2024_08_13_104743_create_answer_records_table.php
@@ -4,7 +4,7 @@
 
 use App\Models\Answer;
 use App\Models\Question;
-use App\Models\QuizSubmission;
+use App\Models\UserQuiz;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
@@ -12,9 +12,9 @@
 return new class() extends Migration {
     public function up(): void
     {
-        Schema::create("answer_records", function (Blueprint $table): void {
+        Schema::create("user_questions", function (Blueprint $table): void {
             $table->id();
-            $table->foreignIdFor(QuizSubmission::class)->constrained()->cascadeOnDelete();
+            $table->foreignIdFor(UserQuiz::class)->constrained()->cascadeOnDelete();
             $table->foreignIdFor(Question::class)->constrained()->cascadeOnDelete();
             $table->foreignIdFor(Answer::class)->nullable()->constrained()->nullOnDelete();
             $table->timestamps();
@@ -23,6 +23,6 @@ public function up(): void
 
     public function down(): void
     {
-        Schema::dropIfExists("answer_records");
+        Schema::dropIfExists("user_questions");
     }
 };
diff --git a/database/seeders/AdminSeeder.php b/database/seeders/AdminSeeder.php
index ccec082c..44cea50a 100644
--- a/database/seeders/AdminSeeder.php
+++ b/database/seeders/AdminSeeder.php
@@ -18,7 +18,7 @@ public function run(): void
         $superAdmin = User::firstOrCreate(
             ["email" => "superadmin@example.com"],
             [
-                "name" => "Example",
+                "firstname" => "Example",
                 "surname" => "Super Admin",
                 "email_verified_at" => Carbon::now(),
                 "password" => Hash::make("password"),
@@ -31,7 +31,7 @@ public function run(): void
         $admin = User::firstOrCreate(
             ["email" => "admin@example.com"],
             [
-                "name" => "Example",
+                "firstname" => "Example",
                 "surname" => "Admin",
                 "email_verified_at" => Carbon::now(),
                 "password" => Hash::make("password"),
@@ -44,7 +44,7 @@ public function run(): void
         $user = User::firstOrCreate(
             ["email" => "user@example.com"],
             [
-                "name" => "Example",
+                "firstname" => "Example",
                 "surname" => "User",
                 "email_verified_at" => Carbon::now(),
                 "password" => Hash::make("password"),
diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php
index 33bd9207..e630fe40 100644
--- a/database/seeders/DatabaseSeeder.php
+++ b/database/seeders/DatabaseSeeder.php
@@ -36,9 +36,9 @@ public function run(): void
         }
 
         foreach (User::query()->role("user")->get() as $user) {
-            $submission = $quiz->createSubmission($user);
+            $userQuiz = $quiz->createUserQuiz($user);
 
-            foreach ($submission->answerRecords as $answer) {
+            foreach ($userQuiz->userQuestions as $answer) {
                 $answer->answer()->associate($answer->question->answers->random());
                 $answer->save();
             }
diff --git a/database/seeders/UserQuizSeeder.php b/database/seeders/UserQuizSeeder.php
index b0705f85..fd0c6e34 100644
--- a/database/seeders/UserQuizSeeder.php
+++ b/database/seeders/UserQuizSeeder.php
@@ -5,11 +5,11 @@
 namespace Database\Seeders;
 
 use App\Models\Answer;
-use App\Models\AnswerRecord;
 use App\Models\Question;
 use App\Models\Quiz;
-use App\Models\QuizSubmission;
 use App\Models\User;
+use App\Models\UserQuestion;
+use App\Models\UserQuiz;
 use Illuminate\Database\Seeder;
 
 class UserQuizSeeder extends Seeder
@@ -42,13 +42,13 @@ public function run(): void
             }
         }
 
-        $this->createSubmissionForUser($user1, null);
-        $this->createSubmissionForUser($user2, null);
+        $this->createUserQuizForUser($user1, null);
+        $this->createUserQuizForUser($user2, null);
     }
 
-    public function createSubmissionForUser(User $user, ?int $correctAnswersCount): void
+    public function createUserQuizForUser(User $user, ?int $correctAnswersCount): void
     {
-        $quizSubmission = QuizSubmission::factory()
+        $userQuiz = UserQuiz::factory()
             ->for($this->quiz)
             ->for($user)
             ->create();
@@ -71,8 +71,8 @@ public function createSubmissionForUser(User $user, ?int $correctAnswersCount):
                 ? $answers->where("id", $question->correct_answer_id)->first()
                 : $answers->where("id", "!=", $question->correct_answer_id)->random();
 
-            AnswerRecord::factory()
-                ->for($quizSubmission)
+            UserQuestion::factory()
+                ->for($userQuiz)
                 ->for($question)
                 ->for($selectedAnswer)
                 ->create();
diff --git a/lang/en/validation.php b/lang/en/validation.php
index a9fb9422..90d6575f 100644
--- a/lang/en/validation.php
+++ b/lang/en/validation.php
@@ -154,6 +154,11 @@
         "attribute-name" => [
             "rule-name" => "custom-message",
         ],
+        "regon" => [
+            "digits_only" => "The :attribute must contain only digits.",
+            "invalid_length" => "The :attribute must be 9 or 14 digits long.",
+            "invalid_checksum" => "The :attribute checksum is incorrect for a valid REGON.",
+        ],
     ],
     "attributes" => [],
 ];
diff --git a/lang/pl/validation.php b/lang/pl/validation.php
index c690cb35..0ebd5cde 100644
--- a/lang/pl/validation.php
+++ b/lang/pl/validation.php
@@ -131,9 +131,18 @@
         "questions.*.text" => [
             "required" => "Treść pytania jest wymagana.",
         ],
+        "regon" => [
+            "digits_only" => "Pole :attribute może zawierać tylko cyfry.",
+            "invalid_length" => "Pole :attribute musi mieć dokładnie 9 lub 14 cyfr.",
+            "invalid_checksum" => "Pole :attribute ma nieprawidłową sumę kontrolną.",
+        ],
+        "sorting" => [
+            "unsupported_field" => "Sortowanie po polu :attribute nie jest wspierane.",
+        ],
     ],
     "attributes" => [
-        "name" => "imię",
+        "name" => "nazwa",
+        "firstname" => "imię",
         "title" => "tytuł",
         "duration" => "czas trwania",
         "scheduled_at" => "rozpoczęcie",
@@ -142,5 +151,11 @@
         "date" => "data",
         "password" => "hasło",
         "school_id" => "szkoła",
+        "regon" => "regon",
+        "street" => "ulica",
+        "building_number" => "numer budynku",
+        "apartment_number" => "numer mieszkania",
+        "zip_code" => "kod pocztowy",
+        "city" => "miasto",
     ],
 ];
diff --git a/public/favicon.png b/public/favicon.png
index c92ba5cc..f458cb32 100644
Binary files a/public/favicon.png and b/public/favicon.png differ
diff --git a/public/favicon.svg b/public/favicon.svg
index 385cb539..6dd12379 100644
--- a/public/favicon.svg
+++ b/public/favicon.svg
@@ -1,4 +1,4 @@
 <svg class="size-10" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M7.02484 14.3074C6.60832 14.3074 6.3744 13.828 6.63076 13.4997L15.3851 2.28913C15.7308 1.84642 16.4312 2.22227 16.2534 2.75511L13.6884 10.4434C13.6668 10.5082 13.715 10.575 13.7832 10.575H16.4951C16.9018 10.575 17.1384 11.0347 16.902 11.3656L9.30015 22.0091C8.96935 22.4723 8.24533 22.1111 8.41638 21.5683L10.6633 14.4375C10.6836 14.373 10.6355 14.3074 10.5679 14.3074H7.02484Z" fill="#262C89"/>
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M12.2545 17.8224V6.2803L15.3847 2.28313C15.731 1.84101 16.4307 2.21751 16.2525 2.75005L13.6885 10.4136C13.6668 10.4784 13.715 10.5453 13.7834 10.5453H16.4935C16.9005 10.5453 17.137 11.0056 16.9 11.3365L12.2545 17.8224Z" fill="#6566C2"/>
+  <path d="M7.02484 14.3074C6.60832 14.3074 6.3744 13.828 6.63076 13.4997L15.3851 2.28913C15.7308 1.84642 16.4312 2.22227 16.2534 2.75511L13.6884 10.4434C13.6668 10.5082 13.715 10.575 13.7832 10.575H16.4951C16.9018 10.575 17.1384 11.0347 16.902 11.3656L9.30015 22.0091C8.96935 22.4723 8.24533 22.1111 8.41638 21.5683L10.6633 14.4375C10.6836 14.373 10.6355 14.3074 10.5679 14.3074H7.02484Z" fill="#E4007D"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M12.2545 17.8224V6.2803L15.3847 2.28313C15.731 1.84101 16.4307 2.21751 16.2525 2.75005L13.6885 10.4136C13.6668 10.4784 13.715 10.5453 13.7834 10.5453H16.4935C16.9005 10.5453 17.137 11.0056 16.9 11.3365L12.2545 17.8224Z" fill="#FF17A1"/>
 </svg>
diff --git a/public/logo.png b/public/logo.png
index 4b93f66c..2f8a1ba3 100644
Binary files a/public/logo.png and b/public/logo.png differ
diff --git a/resources/css/app.css b/resources/css/app.css
index 0a3647ec..5ab975a0 100644
--- a/resources/css/app.css
+++ b/resources/css/app.css
@@ -7,6 +7,18 @@
   font-family: 'Poppins', sans-serif;
 }
 
+.theme-witelon {
+  --color-primary: 38 44 137;
+  --color-primary-bright: 37 43 174;
+  --color-primary-dark: 20 22 71;
+}
+
+.theme-tauron {
+  --color-primary: 228 0 125;
+  --color-primary-bright: 245 13 147;
+  --color-primary-dark: 176 4 96;
+}
+
 .v-enter-active,
 .v-leave-active {
   transition: opacity 0.3s ease;
@@ -27,7 +39,7 @@
 }
  
 ::-webkit-scrollbar-thumb {
-  background: #262c8926;
+  background: #E4007D26;
   border-radius: 1rem;
   border: 2px solid transparent;
   background-clip: content-box;
@@ -35,7 +47,7 @@
 }
 
 ::-webkit-scrollbar-thumb:hover {
-  background: #262c894c;
+  background: #E4007D4c;
   border: 2px solid transparent;
   background-clip: content-box;
   position: fixed;
diff --git a/resources/js/Helpers/Converter.ts b/resources/js/Helpers/Converter.ts
new file mode 100644
index 00000000..6966eaea
--- /dev/null
+++ b/resources/js/Helpers/Converter.ts
@@ -0,0 +1,29 @@
+import dayjs from 'dayjs'
+import { formatDate } from '@/Helpers/Format'
+
+export const converter = {
+  question: {
+    adminToUser(question: Question): UserQuestion {
+      return {
+        id: 1,
+        text: question.text ?? '',
+        answers: question.answers as UserAnswer[],
+      }
+    },
+  },
+  quiz: {
+    adminToUser(quiz: Quiz): UserQuiz {
+      return {
+        title: quiz.title,
+        quiz: quiz.id,
+        closedAt: formatDate(
+          dayjs(quiz.scheduledAt).add(quiz.duration ?? 0, 'minute'),
+          false,
+        ),
+        questions: quiz.questions.map(
+          converter.question.adminToUser,
+        ),
+      }
+    },
+  },
+}
diff --git a/resources/js/Helpers/KeysManager.ts b/resources/js/Helpers/KeysManager.ts
index 1090e02f..2692c7b1 100644
--- a/resources/js/Helpers/KeysManager.ts
+++ b/resources/js/Helpers/KeysManager.ts
@@ -9,9 +9,9 @@ export function keysWrapper<T extends object & {key?:string}>(objects: T[]): Arr
   return objects as Array<T & {key:string}>
 }
 
-const itemsAsKeys = new WeakMap<any,string>()
+const itemsAsKeys = new WeakMap<object,string>()
 
-export default function getKey(item: any) : string{
+export default function getKey(item: object) : string{
   if (!itemsAsKeys.has(item)) 
     itemsAsKeys.set(item, nanoid())
   return itemsAsKeys.get(item) ?? nanoid()
diff --git a/resources/js/Helpers/Params.ts b/resources/js/Helpers/Params.ts
new file mode 100644
index 00000000..7483c8c3
--- /dev/null
+++ b/resources/js/Helpers/Params.ts
@@ -0,0 +1,10 @@
+export function useParams(): Record<string, string | undefined> {
+  const searchParams = new URL(window.location.href).searchParams
+  let params:  Record<string, string> = {}
+
+  for (const [key, value] of searchParams.entries()) {
+    params[key] = value
+  }
+
+  return params
+}
diff --git a/resources/js/Helpers/Sorter.ts b/resources/js/Helpers/Sorter.ts
index 8750c0f3..61d3679d 100644
--- a/resources/js/Helpers/Sorter.ts
+++ b/resources/js/Helpers/Sorter.ts
@@ -1,48 +1,43 @@
-import {onMounted, ref, type Ref, watch} from 'vue'
-import dayjs from 'dayjs'
-import {keysWrapper} from '@/Helpers/KeysManager'
+import {computed, type Ref, ref, watch} from 'vue'
+import {router} from '@inertiajs/vue3'
+import {useParams} from '@/Helpers/Params'
 
-function setSorter<T extends Sortable>(sorter: Ref<Sorter<T> | undefined>, sorterName: string, type: 'name' | 'title' | 'creationDate' | 'modificationDate', desc = false) {
-  sessionStorage.setItem(`${sorterName}SorterPreference`, JSON.stringify([type, desc]))
+export function useSorter(sortOptions: SortOption[], searchText?: Ref<string | undefined>, customQueries?: () => string[]): [query: Ref<string>, Ref<Option[]>] {
+  const params = useParams()
+  const key = ref(params.sort)
+  const desc = ref(params.order)
 
-  sorter.value = (a: T, b: T) => {
-    if (desc) {
-      [a, b] = [b, a]
+  const options = computed(() => sortOptions.map<Option>((option) => ({
+    ...option, action: () => { key.value = option.key; desc.value = option.desc ? 'desc' : 'asc' },
+  })))
+
+  const query = computed(() => {
+    let query: string[] = []
+
+    if (key.value && desc.value) {
+      query.push(`sort=${key.value}`)
+      query.push(`order=${desc.value}`)
     }
 
-    const comparators = {
-      title: () => ('title' in a && 'title' in b) ? a.title.localeCompare(b.title) : 0,
-      name: () => ('name' in a && 'name' in b) ? a.name.localeCompare(b.name) : 0,
-      creationDate: () => dayjs(a.createdAt).diff(dayjs(b.createdAt)),
-      modificationDate: () => dayjs(a.updatedAt).diff(dayjs(b.updatedAt)),
+    if (searchText?.value) {
+      query.push(`search=${searchText?.value}`)
     }
 
-    return comparators[type]()
-  }
-}
+    if (customQueries) {
+      query.push(...customQueries())
+    }
 
-export function useSorter<T extends Sortable>(sorterName: string, data: () => T[], options: SortOptionConstructor[]): [Ref<T[], T[]>, SortOption[]] {
-  const items = ref<T[]>(data()) as Ref<T[]>
-  const sorter = ref<(a: T, b: T) => number>()
-  const sortOptions = keysWrapper(options.map((option) => ({
-    text: option.text,
-    action: () => setSorter(sorter, sorterName, option.type, option.desc) }
-  )))
-
-  onMounted(() => {
-    const savedSorter = sessionStorage.getItem(`${sorterName}SorterPreference`)
-    const [type, desc] = savedSorter ? JSON.parse(savedSorter) : ['modificationDate', true]
-    setSorter(sorter, sorterName, type, desc)
+    return query.length > 0 ? '&' + query.join('&') : ''
   })
 
-  watch(
-    [data, sorter],
-    ([newData, sorter]) => {
-      items.value = newData
-      items.value.sort(sorter)
-    },
-    { immediate: true },
+  watch(query, query =>
+    router.visit(
+      `?page=1${query}`, {
+        preserveState: true,
+        replace: true,
+      },
+    ),
   )
 
-  return [items, sortOptions]
+  return [query, options]
 }
diff --git a/resources/js/Helpers/Time.ts b/resources/js/Helpers/Time.ts
index 313ee06b..4bf99aca 100644
--- a/resources/js/Helpers/Time.ts
+++ b/resources/js/Helpers/Time.ts
@@ -25,21 +25,26 @@ const translateHoursLeft = usePlurals('godzina', 'godziny', 'godzin')
 export function timeToString(time: TimeObject, withLeft = false): string {
   const { s, m, h } = time
 
-  if (h <= 0 && m <= 0) {
-    return `${withLeft ? translateLeft(s) : ''} ${s} ${translateSecondsLeft(s)}`.trimStart()
+  function formatTime(h:number|undefined, m:number|undefined, s:number|undefined) {
+    const hours = h ? `${h} ${translateHoursLeft(h)}` : ''
+    const minutes = m ? `${m} ${translateMinutesLeft(m)}` : ''
+    const seconds =  s ? `${s} ${translateSecondsLeft(s)}` : ''
+    const leading = h ?? m ?? s
+    
+    return `${(withLeft && leading ? translateLeft(leading) : '')} ${hours} ${minutes} ${seconds}`.trimStart()
   }
 
-  if (h <= 0 && m < 10 && s > 0 ) {
-    return `${withLeft ? translateLeft(m) : ''} ${m} ${translateMinutesLeft(m)} i ${s} ${translateSecondsLeft(s)}`.trimStart()
+  if (h) {
+    return formatTime(h,m,undefined)
   }
 
-  if (h <= 0) {
-    return `${withLeft ? translateLeft(m) : ''} ${m} ${translateMinutesLeft(m)}`.trimStart()
+  if (m < 10) {
+    return formatTime(undefined,m,s)
   }
 
-  if (h <= 0 && m > 0) {
-    return `${withLeft ? translateLeft(h) : ''} ${h} ${translateHoursLeft(h)} i ${m} ${translateMinutesLeft(m)}`.trimStart()
+  if (m) {
+    return formatTime(undefined,m,undefined)
   }
 
-  return `${withLeft ? translateLeft(h) : ''} ${h} ${translateHoursLeft(h)}`.trimStart()
+  return formatTime(undefined,undefined,s)
 }
diff --git a/resources/js/Helpers/Timer.ts b/resources/js/Helpers/Timer.ts
index 33545ccf..72dbf871 100644
--- a/resources/js/Helpers/Timer.ts
+++ b/resources/js/Helpers/Timer.ts
@@ -1,7 +1,7 @@
 import {computed, ref} from 'vue'
 import {calcSecondsLeftToDate, secondsToHour, timeToString} from '@/Helpers/Time'
 
-export function useTimer(to: string | number, timeout: () => void) {
+export function useTimer(to: string | number | undefined, timeout: () => void) {
   const left = ref(calcSecondsLeftToDate(to))
 
   const interval = setInterval(() => {
diff --git a/resources/js/Layouts/AdminLayout.vue b/resources/js/Layouts/AdminLayout.vue
deleted file mode 100644
index 5c121114..00000000
--- a/resources/js/Layouts/AdminLayout.vue
+++ /dev/null
@@ -1,22 +0,0 @@
-<script setup lang="ts">
-import BaseLayout from '@/Layouts/BaseLayout.vue'
-import { type PageProps } from '@/Types/PageProps'
-
-const props = defineProps<PageProps>()
-
-const pages: Page[] = [
-  { title: 'Testy', href: '/admin/quizzes' },
-  { title: 'Szkoły', href: '/admin/schools' },
-  { title: 'Uczniowie', href: '/admin/users' },
-]
-
-if (props.user?.isSuperAdmin) {
-  pages.push({ title: 'Administratorzy', href: '/admin/admins'})
-}
-</script>
-
-<template>
-  <BaseLayout :pages :app-name="appName" :user :flash>
-    <slot />
-  </BaseLayout>
-</template>
diff --git a/resources/js/Layouts/BaseLayout.vue b/resources/js/Layouts/BaseLayout.vue
index 96abd0eb..3460e3e8 100644
--- a/resources/js/Layouts/BaseLayout.vue
+++ b/resources/js/Layouts/BaseLayout.vue
@@ -6,20 +6,44 @@ import Banner from '@/components/Common/Banner.vue'
 import {ref, watch} from 'vue'
 import {type PageProps} from '@/Types/PageProps'
 
-const props = defineProps<{ pages: Page[] } & PageProps>()
+const props = defineProps<PageProps>()
 const status = ref<string | undefined>(props.flash.status)
 
 watch(() => props.flash, flash => {
   status.value = flash.status
 }, { immediate: true })
 
+function hideMessage() {
+  status.value = undefined
+}
+
+const pages: Page[] = []
+
+if (!!props.user?.isAdmin || props.user?.isSuperAdmin) {
+  pages.push(
+    { title: 'Testy', href: '/admin/quizzes' },
+    { title: 'Szkoły', href: '/admin/schools' },
+    { title: 'Uczniowie', href: '/admin/users' },
+  )
+}
+else {
+  pages.push({ title: 'Konkursy', href: '/dashboard' })
+}
+
+pages.push(
+  { title: 'Profil', href: '/profile' },
+)
+
+if (props.user?.isSuperAdmin) {
+  pages.push({ title: 'Administratorzy', href: '/admin/admins'})
+}
 </script>
 
 <template>
   <BackgroundEffect />
 
   <div class="flex flex-col items-center h-full min-h-screen">
-    <Banner v-model="status" />
+    <Banner :show="!!status" :message="status" @close="hideMessage" />
     <Header :pages :user="props.user" :app-name="props.appName" />
     <slot />
     <Footer />
diff --git a/resources/js/Layouts/GuestLayout.vue b/resources/js/Layouts/GuestLayout.vue
index ed6bde66..2cdbf948 100644
--- a/resources/js/Layouts/GuestLayout.vue
+++ b/resources/js/Layouts/GuestLayout.vue
@@ -11,21 +11,20 @@ const status = ref<string | undefined>(props.flash.status)
 const titleRef = ref('')
 provide('titleRef', titleRef)
 
-watch(
-  () => props.flash,
-  flash => {
-    status.value = flash.status
-  },
-  { immediate: true },
-)
+watch(() => props.flash, flash => {
+  status.value = flash.status
+}, { immediate: true })
+
+function hideMessage() {
+  status.value = undefined
+}
 </script>
 
 <template>
   <BackgroundEffect />
 
   <div class="flex flex-col items-center h-full min-h-screen">
-    <Banner v-model="status" />
-
+    <Banner :show="!!status" :message="status" @close="hideMessage" />
     <Header :title="titleRef" :pages="[]" :user="props.user" :app-name="props.appName" />
 
     <slot />
diff --git a/resources/js/Layouts/UserLayout.vue b/resources/js/Layouts/UserLayout.vue
deleted file mode 100644
index b362a5b0..00000000
--- a/resources/js/Layouts/UserLayout.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<script setup lang="ts">
-import BaseLayout from '@/Layouts/BaseLayout.vue'
-import type {PageProps} from '@/Types/PageProps'
-
-defineProps<PageProps>()
-
-const pages: Page[] = [
-  { title: 'Konkursy', href: '/dashboard' },
-  { title: 'Profil', href: '/profile' },
-]
-</script>
-
-<template>
-  <BaseLayout :pages :app-name="appName" :user :flash>
-    <slot />
-  </BaseLayout>
-</template>
diff --git a/resources/js/Pages/Admin/QuizDemo.vue b/resources/js/Pages/Admin/QuizDemo.vue
new file mode 100644
index 00000000..0d3bf0c0
--- /dev/null
+++ b/resources/js/Pages/Admin/QuizDemo.vue
@@ -0,0 +1,15 @@
+<script setup lang="ts">
+import QuizPage from '@/components/UserQuiz/QuizPage.vue'
+import { converter } from '@/Helpers/Converter'
+import {type PageProps} from '@/Types/PageProps'
+
+const props = defineProps<{ quiz: Quiz } & PageProps>()
+</script>
+
+<template>
+  <div class="w-full bg-primary text-white text-center font-bold mb-4 p-1">Wersja demonstracyjna</div>
+  <QuizPage
+    :user-quiz="converter.quiz.adminToUser(props.quiz)"
+    :request-close-quiz="{ method: 'get', href: '/admin/quizzes/' }"
+  />
+</template>
diff --git a/resources/js/Pages/Admin/Quizzes.vue b/resources/js/Pages/Admin/Quizzes.vue
index 27eb186b..ba5f2d69 100644
--- a/resources/js/Pages/Admin/Quizzes.vue
+++ b/resources/js/Pages/Admin/Quizzes.vue
@@ -8,21 +8,37 @@ import useCurrentTime from '@/Helpers/CurrentTime'
 import CrudPage from '@/components/Crud/CrudPage.vue'
 import FormButton from '@/components/Common/FormButton.vue'
 import { PlusCircleIcon } from '@heroicons/vue/20/solid'
+import {useParams} from '@/Helpers/Params'
+import NoContent from '@/components/Common/NoContent.vue'
+import {type PageProps} from '@/Types/PageProps'
 
 provide<Ref<number>>('currentTime', useCurrentTime())
 
-defineProps<{ quizzes: Quiz[] }>()
+defineProps<{ quizzes: Pagination<Quiz> } & PageProps>()
 
-const sortOptions: SortOptionConstructor[] = [
-  { text: 'Po nazwie (A–Z)', type: 'title' },
-  { text: 'Po nazwie (Z–A)', type: 'title', desc: true },
-  { text: 'Od najnowszych' , type: 'creationDate' },
-  { text: 'Od najstarszych', type: 'creationDate', desc: true },
-  { text: 'Od najnowszych zmienionych', type: 'modificationDate' },
-  { text: 'Od najstarszych zmienionych', type: 'modificationDate', desc: true },
+const sortOptions: SortOption[] = [
+  { text: 'Po id (rosnąco)', key: 'id' },
+  { text: 'Po id (malejąco)', key: 'id', desc: true },
+  { text: 'Po nazwie (A–Z)', key: 'title' },
+  { text: 'Po nazwie (Z–A)', key: 'title', desc: true },
+  { text: 'Od najnowszych', key: 'created_at', desc: true },
+  { text: 'Od najstarszych', key: 'created_at' },
+  { text: 'Po dacie modyfikacji (rosnąco)', key: 'updated_at' },
+  { text: 'Po dacie modyfikacji (malejąco)', key: 'updated_at', desc: true },
 ]
 
-const showArchivedQuizzes = ref<boolean>(true)
+const params = useParams()
+const hideArchivedQuizzes = ref<boolean>(params.archived !== 'true')
+
+function customQueries(): string[] {
+  let query: string[] = []
+
+  if (!hideArchivedQuizzes.value) {
+    query.push(`archived=${true}`)
+  }
+
+  return query
+}
 </script>
 
 <template>
@@ -33,21 +49,22 @@ const showArchivedQuizzes = ref<boolean>(true)
   <CrudPage
     :options="sortOptions"
     :items="quizzes"
+    :custom-queries="customQueries"
     resource-name="quizzes"
     new-button-text="Dodaj test"
     :new-item-data="{ title: 'Nowy test' }"
   >
     <template #actions>
       <button
-        :title="`${showArchivedQuizzes ? 'Wyświetl' : 'Schowaj'} zarchiwizowane testy`"
-        class="flex gap-2 hover:bg-primary/5 hover:text-primary duration-200 p-2 rounded-lg"
-        @click="showArchivedQuizzes = !showArchivedQuizzes"
+        :title="`${hideArchivedQuizzes ? 'Wyświetl' : 'Schowaj'} zarchiwizowane testy`"
+        class="flex gap-2 hover:bg-primary/5 hover:text-primary duration-200 p-2 rounded-lg h-fit"
+        @click="hideArchivedQuizzes = !hideArchivedQuizzes"
       >
-        <ArchiveDynamicIcon :active="showArchivedQuizzes" />
-        <span class="hidden sm:block">{{ showArchivedQuizzes ? 'Wyświetl' : 'Schowaj' }} zarchiwizowane testy</span>
+        <ArchiveDynamicIcon :active="hideArchivedQuizzes" />
+        <span class="hidden sm:block">{{ hideArchivedQuizzes ? 'Wyświetl' : 'Schowaj' }} zarchiwizowane testy</span>
       </button>
 
-      <Expand />
+      <Expand class="hidden md:block" />
 
       <FormButton
         class="rounded-xl"
@@ -63,8 +80,23 @@ const showArchivedQuizzes = ref<boolean>(true)
     <template #item="{item}">
       <QuizComponent
         :quiz="item"
-        :show-archived-quizzes="showArchivedQuizzes"
       />
     </template>
+
+    <template #noContent="{search}">
+      <NoContent :description="search ? `Wygląda na to, że nie mamy tego, czego szukasz.` : undefined">
+        <div v-if="!search">
+          <FormButton
+            class="rounded-xl"
+            button-class="pl-3 font-bold"
+            method="post"
+            href="/admin/quizzes"
+            :data="{ title: 'Nowy test' }"
+          >
+            <PlusCircleIcon class="size-6 text-white" /> Dodaj test
+          </FormButton>
+        </div>
+      </NoContent>
+    </template>
   </CrudPage>
 </template>
diff --git a/resources/js/Pages/Admin/Ranking.vue b/resources/js/Pages/Admin/Ranking.vue
index cfe39efb..3aebfbf8 100644
--- a/resources/js/Pages/Admin/Ranking.vue
+++ b/resources/js/Pages/Admin/Ranking.vue
@@ -3,14 +3,15 @@ import {computed} from 'vue'
 import Divider from '@/components/Common/Divider.vue'
 import FormButton from '@/components/Common/FormButton.vue'
 import {groupBy} from '@/Helpers/GroupBy'
+import {type PageProps} from '@/Types/PageProps'
 
 const props = defineProps<{
   quiz: Quiz
   rankings: Ranking[]
-}>()
+} & PageProps>()
 
 const sorted = computed(() => [...props.rankings].toSorted((a, b) =>
-  `${a.user.name} ${a.user.surname}`.localeCompare(`${b.user.name} ${b.user.surname}`)))
+  `${a.user.firstname} ${a.user.surname}`.localeCompare(`${b.user.firstname} ${b.user.surname}`)))
 
 const grouped = computed(() => groupBy('points', sorted.value))
 
@@ -19,7 +20,7 @@ const grouped = computed(() => groupBy('points', sorted.value))
 <template>
   <div class="w-full p-2 md:max-w-8xl">
     <Divider>
-      <h1 class="font-bold text-xl text-primary text-center p-4 whitespace-nowrap">{{ quiz.name }} - Ranking</h1>
+      <h1 class="font-bold text-xl text-primary text-center py-4 whitespace-nowrap">{{ quiz.name }} - Ranking</h1>
     </Divider>
 
     <div class="w-full flex justify-between text-sm font-semibold text-gray-900 border shadow bg-white rounded-md px-4 py-2 gap-x-1">
@@ -36,7 +37,7 @@ const grouped = computed(() => groupBy('points', sorted.value))
         </h1>
 
         <div v-for="ranking in place" :key="ranking.user.id" class="w-full flex justify-between text-sm text-gray-900 p-4 gap-x-1">
-          <div class="flex-1 sm:flex-none sm:w-full sm:max-w-56">{{ ranking.user.name }}</div>
+          <div class="flex-1 sm:flex-none sm:w-full sm:max-w-56">{{ ranking.user.firstname }}</div>
           <div class="flex-1">{{ ranking.user.surname }}</div>
           <div class="flex-1">{{ ranking.user.school.name }}</div>
           <div class="flex-none w-full max-w-16 text-center">{{ ranking.points }}</div>
diff --git a/resources/js/Pages/Admin/SchoolsPanel.vue b/resources/js/Pages/Admin/SchoolsPanel.vue
index 284fd58c..a74fba69 100644
--- a/resources/js/Pages/Admin/SchoolsPanel.vue
+++ b/resources/js/Pages/Admin/SchoolsPanel.vue
@@ -1,43 +1,75 @@
 <script setup lang="ts">
 import {Head, router} from '@inertiajs/vue3'
-import { ArrowUpCircleIcon } from '@heroicons/vue/20/solid'
+import { ArrowDownCircleIcon } from '@heroicons/vue/20/solid'
 import AddressInput from '@/components/Common/AddressInput.vue'
 import CrudPage from '@/components/Crud/CrudPage.vue'
 import Expand from '@/components/Common/Expand.vue'
 import InputWrapper from '@/components/QuizzesPanel/InputWrapper.vue'
-import {ref, watch} from 'vue'
+import {ref} from 'vue'
 import axios from 'axios'
 import Button from '@/components/Common/Button.vue'
 import vDynamicTextAreaHeight from '@/Helpers/vDynamicTextAreaHeight'
 import CrudInput from '@/components/Crud/CrudInput.vue'
-
-defineProps<{schools: School[]}>()
-
-const sortOptions: SortOptionConstructor[] = [
-  { text: 'Po nazwie (A–Z)', type: 'name' },
-  { text: 'Po nazwie (Z–A)', type: 'name', desc: true },
-  { text: 'Od najnowszych' , type: 'creationDate' },
-  { text: 'Od najstarszych', type: 'creationDate', desc: true },
-  { text: 'Od najnowszych zmienionych', type: 'modificationDate' },
-  { text: 'Od najstarszych zmienionych', type: 'modificationDate', desc: true },
+import Banner from '@/components/Common/Banner.vue'
+import {usePlurals} from '@/Helpers/Plurals'
+import {type PageProps} from '@/Types/PageProps'
+
+defineProps<{schools: Pagination<School>} & PageProps>()
+
+const sortOptions: SortOption[] = [
+  { text: 'Po id (rosnąco)', key: 'id' },
+  { text: 'Po id (malejąco)', key: 'id', desc: true },
+  { text: 'Po nazwie (rosnąco)', key: 'name' },
+  { text: 'Po nazwie (malejąco)', key: 'name', desc: true },
+  { text: 'Po liczbie uczniów (rosnąco)', key: 'students' },
+  { text: 'Po liczbie uczniów (malejąco)', key: 'students', desc: true },
+  { text: 'Po REGON (rosnąco)', key: 'regon' },
+  { text: 'Po REGON (malejąco)', key: 'regon', desc: true },
+  { text: 'Po adresie (rosnąco)', key: 'address' },
+  { text: 'Po adresie (malejąco)', key: 'address', desc: true },
+  { text: 'Od najnowszych' , key: 'created_at', desc: true },
+  { text: 'Od najstarszych', key: 'created_at' },
+  { text: 'Po dacie modyfikacji (rosnąco)', key: 'updated_at' },
+  { text: 'Po dacie modyfikacji (malejąco)', key: 'updated_at', desc: true },
 ]
 
 const status = ref<boolean | null>(null)
+const message = ref<string>()
+const schoolTranslation = usePlurals('szkołę', 'szkoły', 'szkół')
+
+function hideMessage() {
+  message.value = undefined
+}
+
+async function isImportingFinished(): Promise<[boolean, number | null]> {
+  try {
+    const response = await axios.get('/admin/schools/status')
+    const { done, count } = response.data
 
-async function isImporting(): Promise<boolean> {
-  return await axios.get('/admin/schools/status')
-    .then(res => !res.data.done)
-    .catch(() => true)
+    return [done, count]
+  }
+  catch {
+    return [false, null]
+  }
 }
 
 setInterval(async () => {
   if (!status.value) {
-    status.value = !(await isImporting())
+    const [done, count] = (await isImportingFinished())
+    const isFirstCheck = status.value === null
+
+    if (!isFirstCheck && done && count !== null) {
+      message.value = `Zaimportowano ${count} ${schoolTranslation(count)}.`
+
+      if (count > 0) {
+        router.reload({ only: ['schools'] })
+      }
+    }
+
+    status.value = done
   }
 }, 1000)
 
-watch(status, () => router.reload())
-
 function startFetching() {
   if (status.value) {
     status.value = false
@@ -51,6 +83,8 @@ function startFetching() {
     <title>Szkoły - Panel administracyjny</title>
   </Head>
 
+  <Banner :show="!!message" :message="message" @close="hideMessage" />
+
   <Transition>
     <div v-show="status === false" class="fixed bg-white/50 backdrop-blur-md z-10 size-full left-0 top-0 flex items-center justify-center gap-2">
       <div class="inline-block size-8 animate-spin rounded-full border-4 border-solid border-current border-e-transparent align-[-0.125em] text-primary motion-reduce:animate-[spin_1.5s_linear_infinite]" role="status" />
@@ -61,15 +95,17 @@ function startFetching() {
   <CrudPage
     :options="sortOptions"
     :items="schools"
+    :custom-search="(text) => text?.toLocaleUpperCase()"
     resource-name="schools"
     new-button-text="Dodaj szkołę"
     :new-item-data="{ name: 'Nowa szkoła', regon: '', apartmentNumber: '', street: '', buildingNumber: '', city: '', numberOfStudents: 0, zipCode: '' }"
+    display-search-in-lower-case
     deletable
     mobile-nav
     creatable
   >
     <template #actions>
-      <Expand />
+      <Expand class="hidden sm:block" />
 
       <Button
         :disabled="!status"
@@ -77,7 +113,7 @@ function startFetching() {
         :class="{'cursor-pointer': status}"
         @click="startFetching()"
       >
-        <ArrowUpCircleIcon class="size-6 text-white" /> Importuj szkoły
+        <ArrowDownCircleIcon class="size-6 text-white" /> Importuj szkoły
       </Button>
     </template>
 
@@ -114,7 +150,7 @@ function startFetching() {
         <CrudInput
           v-model="data.item.regon"
           name="regon"
-          label="Regon:"
+          label="REGON:"
           :editing="data.editing"
           :error="data.errors.regon"
         />
diff --git a/resources/js/Pages/Home.vue b/resources/js/Pages/Home.vue
index 440d2028..bbe14e01 100644
--- a/resources/js/Pages/Home.vue
+++ b/resources/js/Pages/Home.vue
@@ -10,23 +10,25 @@ import AuthSection from '@/components/Home/AuthSection.vue'
 import BackgroundEffect from '@/components/Common/BackgroundEffect.vue'
 import { type PageProps } from '@/Types/PageProps'
 
-const authSectiontRef = ref<InstanceType<typeof AuthSection>>()
+const authSectionRef = ref<InstanceType<typeof AuthSection>>()
 const { errors, schools, ...props } = defineProps<{
   errors:Errors
   schools:School[]
 } & PageProps>()
 const status = ref<string | undefined>(props.flash.status)
 
-watch(
-  () => props.flash,
-  flash => status.value = flash.status,
-  { immediate: true },
-)
+watch(() => props.flash, flash => {
+  status.value = flash.status
+}, { immediate: true })
+
+function hideMessage() {
+  status.value = undefined
+}
 
 function scrollToAuth(isLogin:boolean) {
-  if (!authSectiontRef.value?.authSectionElement) return 
-  authSectiontRef.value.isLogin = isLogin
-  const element = authSectiontRef.value.authSectionElement
+  if (!authSectionRef.value?.authSectionElement) return
+  authSectionRef.value.isLogin = isLogin
+  const element = authSectionRef.value.authSectionElement
   const offsetTop = element.getBoundingClientRect().top + window.scrollY
   window.scrollTo({
     top: offsetTop,
@@ -37,15 +39,15 @@ function scrollToAuth(isLogin:boolean) {
 
 <template>
   <Head title="Strona główna" />
-  
-  <Banner v-model="status" />
+
+  <Banner :show="!!status" :message="status" @close="hideMessage" />
 
   <div class="flex flex-col h-screen">
     <BackgroundEffect />
-    <AuthBanner :is-login="authSectiontRef?.isLogin" @scroll-to-auth="scrollToAuth" />
+    <AuthBanner :is-login="authSectionRef?.isLogin" @scroll-to-auth="scrollToAuth" />
     <div class="flex flex-col lg:flex-row lg:justify-evenly lg:gap-x-[5vw] lg:px-[5vw]">
       <GeneralSection />
-      <AuthSection ref="authSectiontRef" :errors="errors" :schools="schools" />
+      <AuthSection ref="authSectionRef" :errors="errors" :schools="schools" />
     </div>
     <Footer />
   </div>
diff --git a/resources/js/Pages/User/Dashboard.vue b/resources/js/Pages/User/Dashboard.vue
index 535006af..9ecc8afe 100644
--- a/resources/js/Pages/User/Dashboard.vue
+++ b/resources/js/Pages/User/Dashboard.vue
@@ -5,75 +5,76 @@ import dayjs from 'dayjs'
 import FormButton from '@/components/Common/FormButton.vue'
 import Divider from '@/components/Common/Divider.vue'
 import LinkButton from '@/components/Common/LinkButton.vue'
-import {type QuizSubmission} from '@/Types/QuizSubmission'
+import QuizItem from '@/components/Dashboard/QuizItem.vue'
+import {type PageProps} from '@/Types/PageProps'
 
 const props = defineProps<{
-  submissions: QuizSubmission[]
+  userQuizzes: UserQuiz[]
   quizzes: Quiz[]
-}>()
+}& PageProps>()
 
 const isClosed = (quiz: Quiz) => (
   dayjs(quiz.scheduledAt).add(quiz.duration ?? 0, 'm').isBefore(Date.now()) ||
-    props.submissions.find(submission => submission.quiz === quiz.id)?.closed
+    props.userQuizzes.find(userQuiz => userQuiz.quiz === quiz.id)?.closed
 )
 
 const started = computed(() => props.quizzes.filter(quiz => quiz.state == 'published' && !isClosed(quiz)))
 const scheduled = computed(() => props.quizzes.filter(quiz => quiz.state == 'locked'))
-const history = computed(() => props.submissions.filter(submission => submission.closed))
+const history = computed(() => props.userQuizzes.filter(userQuiz => userQuiz.closed))
 </script>
 
 <template>
-  <Head>
-    <title>Konkursy</title>
-  </Head>
+  <Head title="Konkursy" />
 
-  <div class="w-full p-2 md:max-w-8xl">
+  <div class="flex flex-col w-full p-5 gap-5 max-w-6xl">
     <Divider v-if="started.length > 0">
-      <h1 class="font-bold text-xl text-primary text-center p-4 whitespace-nowrap">Trwające konkursy</h1>
+      <h1 class="font-bold text-lg text-primary whitespace-nowrap">Trwające konkursy</h1>
     </Divider>
-    <div v-for="quiz in started" :key="quiz.id" class="rounded-lg bg-white shadow border px-4 py-2 flex items-center justify-between mb-2">
-      <div>
-        <p class="font-semibold text-sm 2xs:text-base text-primary">{{ quiz.title }}</p>
-        <p class="text-xs py-1">{{ dayjs(quiz.scheduledAt).fromNow() }}</p>
-      </div>
-      <FormButton button-class="min-w-24 text-center" small method="post" :href="`/quizzes/${quiz.id}/start`" preserve-scroll>
+    <QuizItem
+      v-for="quiz in started"
+      :key="quiz.id"
+      :title="quiz.title"
+      :time="quiz.scheduledAt"
+    >
+      <FormButton button-class="min-w-32 w-full 2xs:w-fit" class="w-full 2xs:w-fit" method="post" :href="`/quizzes/${quiz.id}/start`" preserve-scroll>
         Weź udział
       </FormButton>
-    </div>
+    </QuizItem>
 
     <Divider v-if="scheduled.length > 0 || started.length == 0">
-      <h1 class="font-bold text-xl text-primary text-center p-4 whitespace-nowrap">Nadchodzące konkursy</h1>
+      <h1 class="font-bold text-lg text-primary whitespace-nowrap">Nadchodzące konkursy</h1>
     </Divider>
-    <div v-for="quiz in scheduled" :key="quiz.id" class="rounded-lg bg-white shadow border px-4 py-2 flex items-center justify-between mb-2">
-      <div>
-        <p class="font-semibold text-sm 2xs:text-base text-primary">{{ quiz.title }}</p>
-        <p class="text-xs py-1">{{ dayjs(quiz.scheduledAt).fromNow() }}</p>
-      </div>
-
-      <FormButton v-if="!quiz.isUserAssigned" button-class="min-w-24 text-center" small method="post" :href="`/quizzes/${quiz.id}/assign`" preserve-scroll>
+    <QuizItem
+      v-for="quiz in scheduled"
+      :key="quiz.id"
+      :title="quiz.title"
+      :time="quiz.scheduledAt"
+    >
+      <FormButton v-if="!quiz.isUserAssigned" button-class="min-w-32 w-full 2xs:w-fit" class="w-full 2xs:w-fit" method="post" :href="`/quizzes/${quiz.id}/assign`" preserve-scroll>
         Zapisz się
       </FormButton>
 
-      <FormButton v-else button-class="min-w-24 text-center" disabled small method="post" :href="`/quizzes/${quiz.id}/assign`">
+      <FormButton v-else button-class="min-w-32 w-full 2xs:w-fit" class="w-full 2xs:w-fit" disabled method="post" :href="`/quizzes/${quiz.id}/assign`">
         Zapisano
       </FormButton>
-    </div>
+    </QuizItem>
 
     <div v-if="scheduled.length == 0 && started.length == 0">
       <p>Obecnie nie mamy zaplanowanych żadnych konkursów.</p>
     </div>
 
     <Divider v-if="history.length > 0">
-      <h1 class="font-bold text-xl text-primary text-center p-4 whitespace-nowrap">Historia</h1>
+      <h1 class="font-bold text-lg text-primary whitespace-nowrap">Historia</h1>
     </Divider>
-    <div v-for="submission in history" :key="submission.id" class="rounded-lg bg-white shadow border px-4 py-2 flex items-center justify-between mb-2">
-      <div>
-        <p class="font-semibold text-sm 2xs:text-base text-primary">{{ submission.name }}</p>
-        <p class="text-xs py-1">{{ dayjs(submission.closedAt).fromNow() }}</p>
-      </div>
-      <LinkButton class="min-w-24" button-class="justify-center" small :href="`/submissions/${submission.id}/result`">
+    <QuizItem
+      v-for="userQuiz in history"
+      :key="userQuiz.id"
+      :title="userQuiz.title"
+      :time="userQuiz.closedAt"
+    >
+      <LinkButton class="min-w-32 w-full 2xs:w-fit" button-class="justify-center" :href="`/quizzes/${userQuiz.id}/result`">
         Wyniki
       </LinkButton>
-    </div>
+    </QuizItem>
   </div>
 </template>
diff --git a/resources/js/Pages/User/Edit.vue b/resources/js/Pages/User/Edit.vue
index 6fc16b54..8342786a 100644
--- a/resources/js/Pages/User/Edit.vue
+++ b/resources/js/Pages/User/Edit.vue
@@ -1,13 +1,14 @@
 <script setup lang="ts">
 import { useForm } from '@inertiajs/vue3'
+import {type PageProps} from '@/Types/PageProps'
 
 const props = defineProps<{
   user: User
   schools?: School[]
-}>()
+} & Omit<PageProps, 'user'>>()
 
 const form = useForm({
-  name: props.user.name,
+  firstname: props.user.firstname,
   surname: props.user.surname,
   email: props.user.email,
   school_id: props.user.school.id,
@@ -23,8 +24,8 @@ function update() {
     <form @submit.prevent="update">
       <div>ID: {{ props.user.id }}</div>
       <div>
-        <label for="name">Imię</label>
-        <input id="name" v-model="form.name" type="text">
+        <label for="firstname">Imię</label>
+        <input id="firstname" v-model="form.firstname" type="text">
       </div>
 
       <div>
diff --git a/resources/js/Pages/User/Profile.vue b/resources/js/Pages/User/Profile.vue
index 9b64818b..e7613de8 100644
--- a/resources/js/Pages/User/Profile.vue
+++ b/resources/js/Pages/User/Profile.vue
@@ -3,11 +3,13 @@ import { type Errors } from '@inertiajs/core'
 import PasswordUpdate from '@/components/Profile/PasswordUpdateSection.vue'
 import UserData from '@/components/Profile/UserDataSection.vue'
 import { Head } from '@inertiajs/vue3'
+import {type PageProps} from '@/Types/PageProps'
 
 defineProps<{
   user: User
   errors: Errors
-  }>()
+} & Omit<PageProps, 'user' | 'errors'>>()
+
 </script>
 
 <template>
diff --git a/resources/js/Pages/User/Quiz.vue b/resources/js/Pages/User/Quiz.vue
index 2c3f83d1..6b6c2eda 100644
--- a/resources/js/Pages/User/Quiz.vue
+++ b/resources/js/Pages/User/Quiz.vue
@@ -1,179 +1,36 @@
 <script setup lang="ts">
-import {type QuizSubmission} from '@/Types/QuizSubmission'
-import Divider from '@/components/Common/Divider.vue'
-import {computed, ref, watch} from 'vue'
+import QuizPage from '@/components/UserQuiz/QuizPage.vue'
 import axios from 'axios'
-import FormButton from '@/components/Common/FormButton.vue'
+import { ref } from 'vue'
 import Button from '@/components/Common/Button.vue'
-import {type AnswerRecord} from '@/Types/AnswerRecord'
 import MessageBox from '@/components/Common/MessageBox.vue'
-import {Head} from '@inertiajs/vue3'
-import {useTimer} from '@/Helpers/Timer'
-import { useWindowScroll } from '@vueuse/core'
-import { TransitionRoot } from '@headlessui/vue'
-import {calcSecondsLeftToDate} from '@/Helpers/Time'
+import {type PageProps} from '@/Types/PageProps'
 
-const props = defineProps<{ submission: QuizSubmission }>()
-const answers = ref(props.submission.answers)
-const allAnswered = computed((() => answers.value.every(answer => answer.selected != null)))
-const timeout = ref(false)
-const emptyAnswerMessage = ref(false)
-const timeoutMessage = ref(false)
-const timeoutWarningMessage = ref(false)
+defineProps<{ userQuiz: UserQuiz } & PageProps>()
 const networkErrorMessage = ref(false)
 
-const scroll = useWindowScroll()
-const showDuration = ref(false)
-const durationInMilliseconds = calcSecondsLeftToDate(props.submission.closedAt) * 1000
-const fiveMinutesInMilliseconds = 300000
-
-watch(scroll.y, v => showDuration.value = v > 150)
-
-if (durationInMilliseconds > fiveMinutesInMilliseconds) {
-  setTimeout(() => timeoutWarningMessage.value = true, durationInMilliseconds - fiveMinutesInMilliseconds)
-}
-
-const timeLeft = useTimer(props.submission.closedAt, () => {
-  timeout.value = true
-  timeoutMessage.value = true
-})
-
-function handleAnswer(answers: AnswerRecord, selected: number) {
-  answers.selected = selected
-
-  axios.post(`/answers/${answers.id}/${selected}`, { _method: 'patch' }).catch(() => {
+function handleAnswer(question: UserQuestion, selectedAnswer: number) {
+  axios.post(`/questions/${question.id}/${selectedAnswer}`, { _method: 'patch' }).catch(() => {
     networkErrorMessage.value = true
-    answers.selected = null
+    question.selectedAnswer = undefined
   })
 }
 </script>
 
 <template>
-  <Head>
-    <title>{{ submission.name }}</title>
-  </Head>
-  <TransitionRoot
-    :show="showDuration"
-    enter="transition-opacity duration-75"
-    enter-from="opacity-0"
-    enter-to="opacity-100"
-    leave="transition-opacity duration-50"
-    leave-from="opacity-100"
-    leave-to="opacity-0"
-    appear
-  >
-    <div class="fixed top-0 right-0 w-full text-center bg-white border px-6 py-2.5 font-bold text-sm text-black">
-      {{ timeLeft }}
-    </div>
-  </TransitionRoot>
-
-  <div class="w-full p-2 md:max-w-5xl">
-    <Divider>
-      <h1 class="font-bold text-xl text-primary text-center px-4 whitespace-nowrap">
-        {{ submission.name }}
-      </h1>
-    </Divider>
-
-    <div class="w-full text-sm font-semibold text-right">
-      {{ timeLeft }}
-    </div>
-
-    <div v-for="(record, index) in answers" :key="record.id" class="rounded-lg bg-white shadow border flex flex-col justify-between px-4 py-2 m-5">
-      <div>
-        <p class="pt-2 font-semibold text-primary">Pytanie: {{ index + 1 }}/{{ answers.length }}</p>
-        <p class="py-2 mt-2">{{ record.question }}</p>
-      </div>
-
-      <div class="mb-3 mt-2">
-        <form class="flex flex-col gap-2">
-          <label
-            v-for="answer in record.answers"
-            :key="answer.id"
-            :class="[timeout ? 'cursor-not-allowed' : 'cursor-pointer']"
-            class="flex items-center text-sm text-black"
-            :title="timeout ? 'Czas przewidziany na ten test dobiegł końca' : undefined"
-          >
-            <input
-              :id="answer.id"
-              type="radio"
-              :disabled="timeout"
-              :checked="record.selected === answer.id"
-              :class="[timeout ? 'cursor-not-allowed' : 'cursor-pointer']"
-              class="mr-2 size-6 border-black text-primary accent-primary"
-              @change.prevent="handleAnswer(record, answer.id)"
-            >
-            {{ answer.text }}
-          </label>
-        </form>
-      </div>
-    </div>
-
-    <div v-if="!timeout" class="h-80 flex flex-col items-center justify-center">
-      <p class="font-semibold text-primary text-xl p-5 text-center">To już wszystkie pytania. Czy chcesz oddać test?</p>
-      <FormButton v-if="allAnswered" small :href="`/submissions/${submission.id}/close`" method="post">Oddaj test</FormButton>
-      <Button v-else small @click="emptyAnswerMessage = true">Oddaj test</Button>
-    </div>
-
-    <div v-else class="h-80 flex flex-col items-center justify-center">
-      <p class="font-semibold text-primary text-xl p-5 text-center">Czas przewidziany na ten test dobiegł końca. <br> Twój test został przesłany do ocenienia</p>
-      <FormButton small :href="`/submissions/${submission.id}/result`" method="get">Podsumowanie</FormButton>
-    </div>
-  </div>
-
-  <MessageBox :open="emptyAnswerMessage" @close="emptyAnswerMessage = false">
-    <template #title>
-      Pytania bez odpowiedzi
-    </template>
-
-    <template #message>
-      Nie udzielono odpowiedzi na wszystkie pytania, czy na pewno chcesz oddać test?
-    </template>
-
-    <template #buttons>
-      <Button small text @click="emptyAnswerMessage = false">Wróć</Button>
-      <FormButton small :href="`/submissions/${submission.id}/close`" method="post">Oddaj mimo to</FormButton>
-    </template>
-  </MessageBox>
-
-  <MessageBox :open="timeoutMessage" @close="timeoutMessage = false">
-    <template #title>
-      Koniec czasu
-    </template>
-
-    <template #message>
-      Czas przewidziany na ten test dobiegł końca. Możliwość udzielania dalszych odpowiedzi została zablokowana.
-    </template>
-
-    <template #buttons>
-      <Button small @click="timeoutMessage = false">Ok</Button>
-    </template>
-  </MessageBox>
+  <QuizPage
+    :user-quiz="userQuiz"
+    :request-close-quiz="{ method: 'post', href: `/quizzes/${userQuiz.id}/close` }"
+    @answer="handleAnswer"
+  />
 
   <MessageBox :open="networkErrorMessage" @close="networkErrorMessage = false">
-    <template #title>
-      Nie udało się wysłać odpowiedzi
-    </template>
+    <template #title>Nie udało się wysłać odpowiedzi</template>
 
-    <template #message>
-      Wystąpił problem z wysłaniem Twojej odpowiedzi. Sprawdź swoje połączenie internetowe i spróbuj ponownie.
-    </template>
+    <template #message>Wystąpił problem z wysłaniem Twojej odpowiedzi. Sprawdź swoje połączenie internetowe i spróbuj ponownie.</template>
 
     <template #buttons>
       <Button small @click="networkErrorMessage = false">Ok</Button>
     </template>
   </MessageBox>
-
-  <MessageBox :open="timeoutWarningMessage" @close="timeoutWarningMessage = false">
-    <template #title>
-      Zbliża się koniec czasu
-    </template>
-
-    <template #message>
-      Pozostało 5 minut do końca testu.
-    </template>
-
-    <template #buttons>
-      <Button small @click="timeoutWarningMessage = false">Ok</Button>
-    </template>
-  </MessageBox>
 </template>
diff --git a/resources/js/Pages/User/QuizResult.vue b/resources/js/Pages/User/QuizResult.vue
index c2b29d02..b69b162c 100644
--- a/resources/js/Pages/User/QuizResult.vue
+++ b/resources/js/Pages/User/QuizResult.vue
@@ -1,75 +1,60 @@
 <script setup lang="ts">
-import {type QuizSubmission} from '@/Types/QuizSubmission'
 import Divider from '@/components/Common/Divider.vue'
 import Button from '@/components/Common/Button.vue'
 import {calcSecondsBetweenDates, secondsToHour, timeToString} from '@/Helpers/Time'
 import {computed} from 'vue'
 import LinkButton from '@/components/Common/LinkButton.vue'
-import AnswerResult from '@/components/Common/AnswerResult.vue'
 import {Head} from '@inertiajs/vue3'
+import QuestionResult from '@/components/QuizResult/QuestionResult.vue'
+import {type PageProps} from '@/Types/PageProps'
 
-const props = defineProps<{ submission: QuizSubmission, hasRanking: boolean }>()
-const duration = secondsToHour(calcSecondsBetweenDates(props.submission.closedAt, props.submission.createdAt))
-
+const props = defineProps<{ userQuiz: UserQuiz, hasRanking: boolean } & PageProps>()
+const duration = secondsToHour(calcSecondsBetweenDates(props.userQuiz.closedAt, props.userQuiz.createdAt))
 const points = computed(() =>
-  props.submission.answers.filter(
-    record => record.answers.some(answer => record.selected === answer.id && answer.correct),
+  props.userQuiz.questions.filter(
+    question => question.answers.some(answer => question.selected === answer.id && answer.correct),
   ).length,
 )
 </script>
 
 <template>
-  <Head>
-    <title>{{ submission.name }} - Wyniki</title>
-  </Head>
+  <Head :title="`${userQuiz.title} - Wyniki`" />
 
-  <div class="w-full p-2 md:max-w-7xl">
-    <Divider>
-      <h1 class="font-bold text-xl text-primary text-center px-4 whitespace-nowrap">
-        {{ submission.name }}
+  <Divider>
+    <template #default>
+      <h1 class="font-bold text-lg text-primary whitespace-nowrap">
+        {{ userQuiz.title }}
       </h1>
-    </Divider>
-    <div class="w-full flex justify-between">
-      <div v-if="hasRanking" class="w-full text-left text-sm font-semibold">
-        Zdobyte punkty: {{ points }}/{{ submission.answers.length }}
-      </div>
+    </template>
 
-      <div class="w-full text-right text-sm font-semibold">
+    <template #right>
+      <p class="text-primary font-semibold whitespace-nowrap">
         Twój czas rozwiązania testu: {{ timeToString(duration) }}
-      </div>
-    </div>
+      </p>
+    </template>
+  </Divider>
 
-    <div v-for="(record, index) in submission.answers" :key="record.id" class="rounded-lg bg-white shadow border flex flex-col justify-between px-4 py-2 m-5">
-      <div>
-        <p class="pt-2 font-semibold text-primary">Pytanie: {{ index + 1 }}/{{ submission.answers.length }}</p>
-        <p class="py-2 mt-2">{{ record.question }}</p>
-      </div>
-
-      <div class="mb-3 mt-2">
-        <div class="flex flex-col gap-2">
-          <AnswerResult
-            v-for="answer in record.answers"
-            :id="answer.id"
-            :key="answer.id"
-            type="radio"
-            :checked="record.selected == answer.id || answer.correct"
-            :mode="!hasRanking ? 'none' : answer.correct ? 'success' : 'error'"
-            :bold="record.selected == answer.id"
-          >
-            {{ answer.text }}
-          </AnswerResult>
-        </div>
-      </div>
+  <div class="flex flex-col p-5 gap-5 max-w-6xl">
+    <div v-if="hasRanking" class="text-primary font-semibold whitespace-nowrap">
+      Zdobyte punkty: {{ points }}/{{ userQuiz.questions.length }}
     </div>
 
+    <QuestionResult
+      v-for="(question, index) in userQuiz.questions" :key="question.id"
+      :index="index"
+      :question="question"
+      :questions-total="userQuiz.questions.length"
+      :has-ranking="hasRanking"
+    />
+
     <div v-if="hasRanking" class="h-80 flex flex-col items-center justify-center">
       <p class="font-semibold text-primary text-xl p-5 text-center">To już wszystkie pytania</p>
-      <LinkButton small :href="`/quizzes/${submission.quiz}/ranking`">Ranking</LinkButton>
+      <LinkButton large :href="`/quizzes/${userQuiz.quiz}/ranking`">Ranking</LinkButton>
     </div>
 
     <div v-else class="h-80 flex flex-col items-center justify-center">
       <p class="font-semibold text-primary text-xl p-5 text-center">Ranking jest w trakcie przygotowania, wyślemy powiadomienie na Twoją skrzynkę pocztową gdy będzie gotowy!</p>
-      <Button small disabled>Ranking</Button>
+      <Button large disabled>Ranking</Button>
     </div>
   </div>
 </template>
diff --git a/resources/js/Pages/User/Ranking.vue b/resources/js/Pages/User/Ranking.vue
index 00f59961..b0552879 100644
--- a/resources/js/Pages/User/Ranking.vue
+++ b/resources/js/Pages/User/Ranking.vue
@@ -16,7 +16,7 @@ const grouped = computed(() => groupBy('points', props.rankings))
 <template>
   <div class="w-full p-2 md:max-w-8xl">
     <Divider>
-      <h1 class="font-bold text-xl text-primary text-center p-4 whitespace-nowrap">{{ quiz.name }} - Ranking</h1>
+      <h1 class="font-bold text-xl text-primary text-center py-4 whitespace-nowrap">{{ quiz.name }} - Ranking</h1>
     </Divider>
 
     <div class="w-full flex justify-between text-sm font-semibold text-gray-900 border shadow bg-white rounded-md px-4 py-2 gap-x-2">
@@ -33,10 +33,10 @@ const grouped = computed(() => groupBy('points', props.rankings))
         </h1>
 
         <div v-for="ranking in place" :key="ranking.user.id" class="w-full flex justify-between text-sm text-gray-900 p-4 gap-x-2">
-          <div class="sm:flex-none sm:w-full sm:max-w-56" :class="[ranking.user.id === user.id ? 'text-black' : 'text-gray-500']">{{ ranking.user.id === user.id ? user.name : ranking.user.name ?? '---' }}</div>
-          <div class="flex-1" :class="[ranking.user.id === user.id ? 'text-black' : 'text-gray-500']">{{ ranking.user.id === user.id ? user.surname : ranking.user.surname ?? '---' }}</div>
-          <div class="flex-1" :class="[ranking.user.id === user.id ? 'text-black' : 'text-gray-500']">{{ ranking.user.school.name }}</div>
-          <div class="sm:flex-none sm:w-full max-w-16 text-center" :class="[ranking.user.id === user.id ? 'text-black' : 'text-gray-500']">{{ ranking.points }}</div>
+          <div class="sm:flex-none sm:w-full sm:max-w-56" :class="[ranking.user.id === user?.id ? 'text-black' : 'text-gray-500']">{{ ranking.user.id === user?.id ? user.firstname : ranking.user.firstname ?? '---' }}</div>
+          <div class="flex-1" :class="[ranking.user.id === user?.id ? 'text-black' : 'text-gray-500']">{{ ranking.user.id === user?.id ? user.surname : ranking.user.surname ?? '---' }}</div>
+          <div class="flex-1" :class="[ranking.user.id === user?.id ? 'text-black' : 'text-gray-500']">{{ ranking.user.school.name }}</div>
+          <div class="sm:flex-none sm:w-full max-w-16 text-center" :class="[ranking.user.id === user?.id ? 'text-black' : 'text-gray-500']">{{ ranking.points }}</div>
         </div>
       </div>
     </div>
diff --git a/resources/js/Types/Answer.d.ts b/resources/js/Types/Answer.d.ts
index 060eafc9..195693cc 100644
--- a/resources/js/Types/Answer.d.ts
+++ b/resources/js/Types/Answer.d.ts
@@ -4,3 +4,7 @@ interface Answer {
   text: string
   correct: boolean
 }
+
+interface UserAnswer extends Answer {
+  id: number
+}
diff --git a/resources/js/Types/AnswerRecord.d.ts b/resources/js/Types/AnswerRecord.d.ts
deleted file mode 100644
index 50733839..00000000
--- a/resources/js/Types/AnswerRecord.d.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-export interface AnswerRecordAnswer {
-  id: number
-  text: string
-  correct?: boolean
-}
-
-export interface AnswerRecord {
-  id: number
-  question: string
-  createAt: string
-  updatedAt: string
-  closed: boolean
-  selected?: number
-  answers: AnswerRecordAnswer[]
-}
diff --git a/resources/js/Types/ButtonFrameProps.d.ts b/resources/js/Types/ButtonFrameProps.d.ts
index ec468eb5..7cc2f6bf 100644
--- a/resources/js/Types/ButtonFrameProps.d.ts
+++ b/resources/js/Types/ButtonFrameProps.d.ts
@@ -1,6 +1,8 @@
 export interface ButtonFrameProps {
   small?: boolean
   extraSmall?: boolean
+  large?: boolean
   disabled?: boolean
   text?: boolean
+  icon?: boolean
 }
diff --git a/resources/js/Types/PageProps.d.ts b/resources/js/Types/PageProps.d.ts
index 6aa51bd5..edebf7d4 100644
--- a/resources/js/Types/PageProps.d.ts
+++ b/resources/js/Types/PageProps.d.ts
@@ -2,7 +2,7 @@ export interface PageProps {
   appName: string
   flash: {
     status?: string
+    errors?: Record<string, string>
   }
-  errors?: Record<string, string>
   user?: User
 }
diff --git a/resources/js/Types/Pagination.d.ts b/resources/js/Types/Pagination.d.ts
new file mode 100644
index 00000000..b1cf4785
--- /dev/null
+++ b/resources/js/Types/Pagination.d.ts
@@ -0,0 +1,25 @@
+interface PaginationLink {
+  active: boolean
+  label: string
+  url?: string
+}
+
+interface Pagination<T> {
+  data: T[]
+  links: {
+    first: string
+    last: string
+    next?: string
+    prev?: string
+  }
+  meta: {
+    current_page: number
+    from: number
+    last_pag: number
+    path: string
+    per_page: number
+    to: number
+    total: number
+    links: PaginationLink[]
+  }
+}
diff --git a/resources/js/Types/Question.d.ts b/resources/js/Types/Question.d.ts
index fc2dec63..9ee81312 100644
--- a/resources/js/Types/Question.d.ts
+++ b/resources/js/Types/Question.d.ts
@@ -1,6 +1,13 @@
 interface Question {
   [key: string]
-  id?: number
-  text: string | undefined
+  text?: string
   answers: Answer[]
 }
+
+interface UserQuestion {
+  [key: string]
+  id: number
+  text: string
+  selectedAnswer?: number
+  answers: UserAnswer[]
+}
diff --git a/resources/js/Types/Quiz.d.ts b/resources/js/Types/Quiz.d.ts
index 807c1248..7197f616 100644
--- a/resources/js/Types/Quiz.d.ts
+++ b/resources/js/Types/Quiz.d.ts
@@ -11,3 +11,13 @@ interface Quiz {
   isRankingPublished: boolean
   questions: Question[]
 }
+
+interface UserQuiz {
+  [key: string]
+  id?: number
+  title: string
+  closedAt?: string
+  closed?: boolean
+  quiz: number
+  questions: UserQuestion[]
+}
diff --git a/resources/js/Types/QuizSubmission.d.ts b/resources/js/Types/QuizSubmission.d.ts
deleted file mode 100644
index 4f812b79..00000000
--- a/resources/js/Types/QuizSubmission.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import {type AnswerRecord} from '@/Types/AnswerRecord'
-
-export interface QuizSubmission {
-  id: number
-  name: string
-  createdAt: string
-  updatedAt: string
-  closedAt?: string
-  openedAt: string
-  closed: boolean
-  quiz: number
-  answers: AnswerRecord[]
-}
diff --git a/resources/js/Types/Sort.d.ts b/resources/js/Types/Sort.d.ts
index a0849712..ffbb14e3 100644
--- a/resources/js/Types/Sort.d.ts
+++ b/resources/js/Types/Sort.d.ts
@@ -1,4 +1,5 @@
-type Sortable = ({ name: string } | { title: string }) & { createdAt: string, updatedAt: string }
-interface SortOptionConstructor { text: string, type: 'name' | 'title' | 'creationDate' | 'modificationDate', desc?: boolean }
-interface SortOption { key: string, text: string, action: () => void }
-type Sorter<T extends Sortable> = (a: T, b: T) => number;
+interface SortOption {
+  key: string
+  text: string
+  desc?: boolean
+}
diff --git a/resources/js/Types/User.d.ts b/resources/js/Types/User.d.ts
index 75511bdc..5f12f648 100644
--- a/resources/js/Types/User.d.ts
+++ b/resources/js/Types/User.d.ts
@@ -1,6 +1,6 @@
 interface User {
   id: number
-  name: string
+  firstname: string
   surname: string
   email: string
   school: School
diff --git a/resources/js/app.ts b/resources/js/app.ts
index 55845f72..89883ccb 100644
--- a/resources/js/app.ts
+++ b/resources/js/app.ts
@@ -2,8 +2,7 @@ import '../css/app.css'
 import { createApp, h, type DefineComponent } from 'vue'
 import { createInertiaApp } from '@inertiajs/vue3'
 import { resolvePageComponent } from 'laravel-vite-plugin/inertia-helpers'
-import UserLayout from '@/Layouts/UserLayout.vue'
-import AdminLayout from '@/Layouts/AdminLayout.vue'
+import BaseLayout from '@/Layouts/BaseLayout.vue'
 import GuestLayout from '@/Layouts/GuestLayout.vue'
 import dayjs from 'dayjs'
 import relativeTime from 'dayjs/plugin/relativeTime'
@@ -14,6 +13,9 @@ dayjs.locale('pl')
 
 const appName = import.meta.env.VITE_APP_NAME
 
+const themeClass = localStorage.getItem('theme')
+themeClass && document.documentElement.classList.add(themeClass)
+
 createInertiaApp({
   title: (title) => `${title} - ${appName}`,
   resolve: async (name) => {
@@ -22,12 +24,8 @@ createInertiaApp({
       import.meta.glob<DefineComponent>('./Pages/**/*.vue'),
     )
 
-    if (name.startsWith('Admin/')) {
-      page.default.layout ??= AdminLayout
-    }
-
-    if (name.startsWith('User/')) {
-      page.default.layout ??= UserLayout
+    if (name.startsWith('Admin/') || name.startsWith('User/')) {
+      page.default.layout ??= BaseLayout
     }
 
     if (name.startsWith('Guest/')) {
diff --git a/resources/js/components/Common/AddressInput.vue b/resources/js/components/Common/AddressInput.vue
index 99289b1e..788a105d 100644
--- a/resources/js/components/Common/AddressInput.vue
+++ b/resources/js/components/Common/AddressInput.vue
@@ -1,6 +1,8 @@
 <script setup lang="ts">
 import {type Errors} from '@inertiajs/core'
 import CrudInput from '@/components/Crud/CrudInput.vue'
+import ZipCodeInput from '@/components/Common/ZipCodeInput.vue'
+import InputWrapper from '@/components/QuizzesPanel/InputWrapper.vue'
 
 const address = defineModel<Address>({ required: true })
 
@@ -35,13 +37,20 @@ defineProps<{
     :editing="!disabled"
   />
 
-  <CrudInput
-    v-model="address.zipCode"
-    name="zip_code"
-    label="Kod pocztowy:"
+  <InputWrapper
     :error="errors.zip_code"
-    :editing="!disabled"
-  />
+    :hide-error="disabled"
+    :hide-content="!address.zipCode && disabled"
+    label="Kod pocztowy:"
+    :class="{ 'hidden': !address.zipCode && disabled }"
+  >
+    <ZipCodeInput
+      v-model="address.zipCode"
+      name="zip_code"
+      :error="errors.zip_code"
+      :editing="!disabled"
+    />
+  </InputWrapper>
 
   <CrudInput
     v-model="address.city"
diff --git a/resources/js/components/Common/AnswerResult.vue b/resources/js/components/Common/AnswerResult.vue
deleted file mode 100644
index cedabf8b..00000000
--- a/resources/js/components/Common/AnswerResult.vue
+++ /dev/null
@@ -1,38 +0,0 @@
-<script setup lang="ts">
-import { CheckIcon, XMarkIcon } from '@heroicons/vue/20/solid'
-
-withDefaults(defineProps<{
-    id?: string | number
-    checked?: boolean
-    bold?: boolean
-    mode?: 'success' | 'error' | 'none'
-  }>(), { mode: 'none', id: undefined })
-</script>
-
-<template>
-  <label class="flex items-center text-sm text-black relative cursor-not-allowed" :class="{'font-semibold': bold }">
-    <input
-      :id
-      type="radio"
-      disabled="disabled"
-      :checked
-      :class="{'appearance-none': mode !== 'none'}"
-      class="mr-2 p-2 border border-gray-600 rounded-full"
-    >
-
-    <div
-      v-if="checked && mode !== 'none'"
-      class="flex justify-center items-center p-2 border border-transparent absolute"
-      :class="{
-        'stroke-primary hover:stroke-primary-700': mode === 'none',
-        'stroke-red hover:stroke-orange-700': mode === 'error',
-        'stroke-green-700 hover:stroke-green-900': mode === 'success'
-      }"
-    >
-      <XMarkIcon v-if="mode=='error'" class="size-3 absolute" />
-      <CheckIcon v-else-if="mode=='success'" class="size-3 absolute" />
-    </div>
-    <slot />
-  </label>
-</template>
-
diff --git a/resources/js/components/Common/BackgroundEffect.vue b/resources/js/components/Common/BackgroundEffect.vue
index e3193403..13186a8d 100644
--- a/resources/js/components/Common/BackgroundEffect.vue
+++ b/resources/js/components/Common/BackgroundEffect.vue
@@ -19,7 +19,7 @@ onUnmounted(() => window.removeEventListener('scroll', setBannerVisibility))
       size-full
       bg-gradient-to-r
       from-[#ff80b5]
-      to-primary-600
+      to-[#373ff4]
       opacity-30
     " style="
       clip-path: polygon(
diff --git a/resources/js/components/Common/Banner.vue b/resources/js/components/Common/Banner.vue
index b4b3b91a..189787aa 100644
--- a/resources/js/components/Common/Banner.vue
+++ b/resources/js/components/Common/Banner.vue
@@ -2,31 +2,32 @@
 import { XMarkIcon } from '@heroicons/vue/20/solid'
 import { watch } from 'vue'
 
-const model = defineModel<string>()
-
-function close() {
-  model.value = ''
-}
+const emit = defineEmits(['close'])
+const props = defineProps<{ show?: boolean, hideCloseButton?: boolean, message?:string }>()
 
 let timeoutId: ReturnType<typeof setTimeout>
 
-watch(model, text => {
+watch(props, props => {
   clearTimeout(timeoutId)
-  if (!text) return
-  const time = text.split(' ').length * 1000
-  timeoutId = setTimeout(close, time)
+
+  if (!props.message) {
+    return
+  }
+
+  const time = props.message.split(' ').length * 1000
+  timeoutId = setTimeout(() => emit('close'), time)
 })
 </script>
 
 <template>
-  <div 
-    :class="{ '-translate-y-full': !model }"
-    class="duration-200 text-white z-50 flex fixed top-0 w-full items-center gap-x-6 bg-primary px-6 py-2.5 sm:px-3.5 sm:before:flex-1"
+  <div
+    :class="{ '-translate-y-full': !show }"
+    class="duration-200 text-white z-50 flex fixed top-0 w-full items-center gap-x-6 bg-primary px-6 py-2.5 sm:px-3.5 sm:before:flex-1 font-bold"
   >
-    <b> {{ model }} </b>
+    <p> {{ message }} </p>
     <div class="flex flex-1 justify-end">
-      <button type="button" class="-m-3 p-3 focus-visible:outline-offset-[-4px]">
-        <XMarkIcon class="size-5" aria-hidden="true" @click="close" />
+      <button v-if="!hideCloseButton" type="button" class="-m-3 p-3 focus-visible:outline-offset-[-4px]">
+        <XMarkIcon class="size-5" aria-hidden="true" @click="emit('close')" />
       </button>
     </div>
   </div>
diff --git a/resources/js/components/Common/Button.vue b/resources/js/components/Common/Button.vue
index d47f5e6e..cab6ee73 100644
--- a/resources/js/components/Common/Button.vue
+++ b/resources/js/components/Common/Button.vue
@@ -8,8 +8,8 @@ const emit = defineEmits(['click'])
 </script>
 
 <template>
-  <button :disabled :type="type" @click="emit('click')">
-    <ButtonFrame :disabled :small :extra-small :text>
+  <button :class="{ 'w-full flex justify-center' : large }" :disabled :type="type" @click="emit('click')">
+    <ButtonFrame :disabled :small :extra-small :large :text :icon>
       <slot />
     </ButtonFrame>
   </button>
diff --git a/resources/js/components/Common/ButtonFrame.vue b/resources/js/components/Common/ButtonFrame.vue
index e865964d..32abaa06 100644
--- a/resources/js/components/Common/ButtonFrame.vue
+++ b/resources/js/components/Common/ButtonFrame.vue
@@ -1,23 +1,21 @@
 <script setup lang="ts">
 import { type ButtonFrameProps } from '@/Types/ButtonFrameProps'
 
-const slots = defineSlots()
-const defaultSlot = slots.default()[0]
 defineProps<ButtonFrameProps>()
 </script>
 
 <template>
   <div
-    class="flex gap-2 transition-colors-opacity duration-200"
+    class="flex justify-center gap-2 transition-colors-opacity duration-200"
     :class="{
-      'rounded-lg text-xs xs:text-sm': small,
-      'rounded text-xs px-2': extraSmall,
-      'rounded-xl': !small && !extraSmall,
-      'focus:rounded-sm text-black hover:text-primary-800 p-0 font-semibold': text,
-      'px-4 bg-primary text-white hover:bg-primary-950 py-2.5 font-bold': !text,
+      'rounded-lg size-6 xs:text-sm items-center': icon,
+      'text-xs xs:text-sm': small,
+      'text-xs px-2': extraSmall,
+      'py-3 max-w-96 w-full': large,
+      'focus:rounded-xl text-black hover:text-primary-bright p-0 font-semibold': text,
+      'bg-primary text-white hover:bg-primary-dark py-2.5 font-bold': !text,
+      'rounded-xl px-4 py-2.5': !text && !icon,
       'opacity-50 pointer-events-none': disabled,
-      'pl-3': defaultSlot?.children?.at(0)?.type !== Symbol.for('v-txt'),
-      'pr-3': defaultSlot?.children?.at(-1)?.type !== Symbol.for('v-txt'),
     }"
   >
     <slot />
diff --git a/resources/js/components/Common/CustomDatepicker.vue b/resources/js/components/Common/CustomDatepicker.vue
index 121ffb5d..29197947 100644
--- a/resources/js/components/Common/CustomDatepicker.vue
+++ b/resources/js/components/Common/CustomDatepicker.vue
@@ -34,7 +34,7 @@ const datepickerRef = ref<InstanceType<typeof Datepicker>>()
         <div class="flex gap-4">
           <button class="text-sm font-semibold rounded-md" @click="() => datepickerRef?.toggleMenu()">Anuluj</button>
           <button
-            class="bg-primary text-white text-sm font-bold py-2 px-3 rounded-md duration-200 hover:bg-primary-950"
+            class="bg-primary text-white text-sm font-bold py-2 px-3 rounded-md duration-200 hover:bg-primary-dark"
             @click="() => datepickerRef?.selectDate()"
           >
             Wybierz
@@ -83,7 +83,7 @@ const datepickerRef = ref<InstanceType<typeof Datepicker>>()
 }
 
 .dp__btn:hover {
-  @apply fill-primary-950 text-primary-950 stroke-primary-950
+  @apply fill-primary-dark text-primary-dark stroke-primary-dark
 }
 
 .dp__overlay {
diff --git a/resources/js/components/Common/CustomInput.vue b/resources/js/components/Common/CustomInput.vue
index c9d5986e..acc84dcb 100644
--- a/resources/js/components/Common/CustomInput.vue
+++ b/resources/js/components/Common/CustomInput.vue
@@ -44,7 +44,7 @@ const model = defineModel<string>()
         @blur="isFocused=false"
       >
 
-      <div v-if="slots.default" class="flex flex-1 items-center justify-center stroke-primary/100">
+      <div v-if="slots.default" class="flex flex-1 items-center justify-center text-primary">
         <slot />
       </div>
     </div>
diff --git a/resources/js/components/Common/CustomRadio.vue b/resources/js/components/Common/CustomRadio.vue
new file mode 100644
index 00000000..922a1764
--- /dev/null
+++ b/resources/js/components/Common/CustomRadio.vue
@@ -0,0 +1,47 @@
+<script setup lang="ts">
+withDefaults(defineProps<{
+  disabled?: boolean
+  checked?: boolean
+  name?: string
+  size?: number
+}>(), {
+  name: undefined,
+  size: 1,
+})
+const emit = defineEmits<{ change: [] }>()
+</script>
+
+<template>
+  <div>
+    <input
+      type="radio"
+      :name="name"
+      :disabled
+      :checked
+      :style="{ width: `${size}rem`, height: `${size}rem` }"
+      @change.prevent="emit('change')"
+    >
+  </div>
+</template>
+
+<style>
+input[type="radio"] {
+  flex-shrink: 0;
+  -webkit-appearance: none;
+  appearance: none;
+  background-color: transparent;
+  font: inherit;
+  color: currentColor;
+  border-style: solid;
+  border-color: currentColor;
+  border-radius: 50%;
+  display: grid;
+  place-content: center;
+  transition: 120ms border ease-in-out;
+  border-width: .1rem;
+}
+
+input[type="radio"]:checked {
+  border-width: .4rem;
+}
+</style>
diff --git a/resources/js/components/Common/Divider.vue b/resources/js/components/Common/Divider.vue
index 48f731cd..3da9c662 100644
--- a/resources/js/components/Common/Divider.vue
+++ b/resources/js/components/Common/Divider.vue
@@ -1,7 +1,18 @@
+<script setup lang="ts">
+const slots = defineSlots()
+</script>
+
 <template>
-  <div class="relative w-full flex items-center ">
-    <div class="w-10 border-t border-primary" />
+  <div class="w-full flex flex-col 2xs:flex-row 2xs:items-center px-5 xs:px-0">
+    <div class="xs:mx-4 w-0 xs:w-7 border-t border-primary" />
+
     <slot />
-    <div class="w-full border-t border-primary" />
+    <div v-if="slots.default" class="xs:mx-4 flex-1 w-full border-t border-transparent xs:border-primary" />
+
+    <slot name="center" />
+    <div v-if="slots.center" class="xs:mx-4 flex-1 w-full border-t border-transparent xs:border-primary" />
+
+    <slot name="right" />
+    <div v-if="slots.right" class="xs:mx-4 w-0 xs:w-7 border-t border-primary" />
   </div>
 </template>
diff --git a/resources/js/components/Common/Dropdown.vue b/resources/js/components/Common/Dropdown.vue
index 3f878ad2..1798117c 100644
--- a/resources/js/components/Common/Dropdown.vue
+++ b/resources/js/components/Common/Dropdown.vue
@@ -29,7 +29,7 @@ function pick(option: Option) {
         <div
           v-if="pointerPosition"
           class="absolute top-0"
-          :class="{ 
+          :class="{
             'left-5': pointerPosition==='left',
             'right-5': pointerPosition==='right',
             'left-1/2': pointerPosition==='center'
@@ -40,11 +40,11 @@ function pick(option: Option) {
         </div>
         <ul class="py-0.5 text-sm text-gray-700 dark:text-gray-200" aria-labelledby="dropdownDefaultButton">
           <li v-for="option of options" :key="option.key">
-            <a 
+            <a
               id="menu-item-0" href="#"
               class="truncate block py-2 px-3 m-1 text-sm text-gray-700 rounded-lg hover-focus:bg-primary/5 hover-focus:text-primary transition-colors outline-none"
               role="menuitem"
-              @click="pick(option)"
+              @click="pick(option); isVisible = false"
             >
               {{ option.text }}
             </a>
diff --git a/resources/js/components/Common/FormButton.vue b/resources/js/components/Common/FormButton.vue
index 9802801a..7093c7f1 100644
--- a/resources/js/components/Common/FormButton.vue
+++ b/resources/js/components/Common/FormButton.vue
@@ -26,6 +26,7 @@ function onProcessing(isProcessing:boolean) {
 
 <template>
   <RequestWrapper
+    :class="{ 'w-full flex justify-center' : large }"
     :href="href"
     :method="method"
     :data="data"
@@ -54,7 +55,7 @@ function onProcessing(isProcessing:boolean) {
     <ButtonFrame
       :disabled="disabled || processing"
       :class="buttonClass"
-      :small :extra-small :text
+      :small :extra-small :large :text :icon
     >
       <slot />
     </ButtonFrame>
diff --git a/resources/js/components/Common/Header.vue b/resources/js/components/Common/Header.vue
index 6ffab634..6ce80978 100644
--- a/resources/js/components/Common/Header.vue
+++ b/resources/js/components/Common/Header.vue
@@ -3,6 +3,7 @@ import FormButton from '@/components/Common/FormButton.vue'
 import { TransitionRoot, Dialog, TransitionChild, DialogPanel, DialogTitle } from '@headlessui/vue'
 import { Bars3Icon, XMarkIcon } from '@heroicons/vue/24/outline'
 import { ref } from 'vue'
+import LogoIcon from '@/components/Icons/LogoIcon.vue'
 
 defineProps<{ pages: Page[], user?: User, appName: string, title?: string }>()
 const open = ref<boolean>(false)
@@ -14,10 +15,7 @@ const isSelected = (page: Page) => page.href === window.location.pathname
     <nav class="flex w-full items-center justify-between p-4">
       <div class="flex gap-x-6 items-center">
         <a href="/">
-          <svg class="size-10" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-            <path d="M7.02484 14.3074C6.60832 14.3074 6.3744 13.828 6.63076 13.4997L15.3851 2.28913C15.7308 1.84642 16.4312 2.22227 16.2534 2.75511L13.6884 10.4434C13.6668 10.5082 13.715 10.575 13.7832 10.575H16.4951C16.9018 10.575 17.1384 11.0347 16.902 11.3656L9.30015 22.0091C8.96935 22.4723 8.24533 22.1111 8.41638 21.5683L10.6633 14.4375C10.6836 14.373 10.6355 14.3074 10.5679 14.3074H7.02484Z" fill="#262C89" />
-            <path fill-rule="evenodd" clip-rule="evenodd" d="M12.2545 17.8224V6.2803L15.3847 2.28313C15.731 1.84101 16.4307 2.21751 16.2525 2.75005L13.6885 10.4136C13.6668 10.4784 13.715 10.5453 13.7834 10.5453H16.4935C16.9005 10.5453 17.137 11.0056 16.9 11.3365L12.2545 17.8224Z" fill="#6566C2" />
-          </svg>
+          <LogoIcon />
         </a>
         <span v-if="pages.length <= 0" class="font-semibold leading-6 text-gray-900">{{ title }}</span>
         <div v-else class="flex gap-6">
@@ -25,7 +23,7 @@ const isSelected = (page: Page) => page.href === window.location.pathname
             v-for="item in pages"
             :key="item.title"
             :href="item.href"
-            class="hidden sm:block font-semibold leading-6 text-gray-900 transition-colors duration-200 hover:text-primary-800"
+            class="hidden sm:block font-semibold leading-6 text-gray-900 transition-colors duration-200 hover:text-primary-bright"
             :class="{ 'text-primary': isSelected(item) }"
           >
             {{ item.title }}
diff --git a/resources/js/components/Common/LinkButton.vue b/resources/js/components/Common/LinkButton.vue
index 2c2778e4..b9cf32df 100644
--- a/resources/js/components/Common/LinkButton.vue
+++ b/resources/js/components/Common/LinkButton.vue
@@ -9,12 +9,18 @@ defineProps<{
 </script>
 
 <template>
-  <a :href="href">
+  <a v-if="!disabled" :href="href" :class="{ 'w-full flex justify-center' : large }">
     <ButtonFrame
       :class="buttonClass"
-      :disabled :small :extra-small :text
+      :disabled :small :extra-small :large :text :icon
     >
       <slot />
     </ButtonFrame>
   </a>
+
+  <p v-if="disabled" :class="{ 'w-full flex justify-center' : large }">
+    <ButtonFrame :class="buttonClass" :disabled :small :extra-small :text :icon>
+      <slot />
+    </ButtonFrame>
+  </p>
 </template>
diff --git a/resources/js/components/Common/NoContent.vue b/resources/js/components/Common/NoContent.vue
new file mode 100644
index 00000000..88d16e6e
--- /dev/null
+++ b/resources/js/components/Common/NoContent.vue
@@ -0,0 +1,14 @@
+<script setup lang="ts">
+withDefaults(defineProps<{ title?: string, description?: string }>(), {
+  title: 'Brak danych',
+  description: 'Wygląda na to, że nic tu jeszcze nie ma. Kliknij przycisk poniżej, aby dodać tu trochę treści.',
+})
+</script>
+
+<template>
+  <div class="flex flex-col gap-1 p-5 bg-white/70 border-2 rounded-xl shadow-sm">
+    <h1 class="text-xl text-primary font-bold">{{ title }}</h1>
+    <p class="mb-1 text-gray-500">{{ description }}</p>
+    <slot />
+  </div>
+</template>
diff --git a/resources/js/components/Common/Pagination.vue b/resources/js/components/Common/Pagination.vue
new file mode 100644
index 00000000..d372f2d5
--- /dev/null
+++ b/resources/js/components/Common/Pagination.vue
@@ -0,0 +1,21 @@
+<script setup lang="ts" generic="T">
+import LinkButton from '@/components/Common/LinkButton.vue'
+
+defineProps<{ data: Pagination<T>, query: string }>()
+</script>
+
+<template>
+  <div class="p-2 flex items-center gap-1 justify-between">
+    <LinkButton :disabled="!data.links.prev" :href="data.links.prev + (query ?? '')" icon>
+      {{ '<' }}
+    </LinkButton>
+
+    <div class="text-nowrap text-center min-w-20">
+      {{ data.meta.from ?? 0 }} - {{ data.meta.to ?? 0 }}
+    </div>
+
+    <LinkButton :disabled="!data.links.next" :href="data.links.next + (query ?? '')" icon>
+      {{ '>' }}
+    </LinkButton>
+  </div>
+</template>
diff --git a/resources/js/components/Common/Searchbar.vue b/resources/js/components/Common/Searchbar.vue
index 2e15541a..c21cefc8 100644
--- a/resources/js/components/Common/Searchbar.vue
+++ b/resources/js/components/Common/Searchbar.vue
@@ -43,7 +43,7 @@ function onOptionClick(option:T) {
         :class="{ 'ring-inset ring-2 ring-[#7e76b8]' : isFocused, 'ring-red' : error }"
       >
         <div class="h-full items-center justify-center px-3">
-          <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" class="size-5 stroke-primary/30" :class="{'!stroke-primary/60': isFocused}">
+          <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" class="size-5 text-primary/30" :class="{'!text-primary/60': isFocused}">
             <path stroke-linecap="round" stroke-linejoin="round" d="m21 21-5.197-5.197m0 0A7.5 7.5 0 1 0 5.196 5.196a7.5 7.5 0 0 0 10.607 10.607Z" />
           </svg>
         </div>
diff --git a/resources/js/components/Common/ThemeSwitch.vue b/resources/js/components/Common/ThemeSwitch.vue
new file mode 100644
index 00000000..27e7fd2c
--- /dev/null
+++ b/resources/js/components/Common/ThemeSwitch.vue
@@ -0,0 +1,39 @@
+<script setup lang="ts">
+import { computed } from 'vue'
+
+const isThemeTauron = computed(() => localStorage.getItem('theme') !== 'theme-witelon')
+
+function toggleTheme(checked?:boolean) {
+  document.documentElement.classList.remove(checked ? 'theme-witelon' : 'theme-tauron')
+  document.documentElement.classList.add(checked ? 'theme-tauron' : 'theme-witelon')
+  localStorage.setItem('theme', checked ? 'theme-tauron' : 'theme-witelon')
+}
+</script>
+
+<template>
+  <label class="inline-flex items-center cursor-pointer">
+    <input type="checkbox" class="sr-only peer" :checked="isThemeTauron" @click="(event: any) => toggleTheme(event.currentTarget.checked)">
+    <div class="
+      relative
+      w-11
+      h-6
+      bg-primary
+      peer-focus:outline-none
+      peer-focus:ring-2
+      rounded-full
+      
+      after:bg-white
+      after:content-['']
+      after:start-0.5
+      after:absolute after:top-0.5
+      after:border
+      after:rounded-full
+      after:size-5
+      peer-checked:after:translate-x-full
+      rtl:peer-checked:after:-translate-x-full
+      after:transition-all
+      "
+    />
+    <span class="ms-3 text-sm font-medium text-gray-500">Zmień skórkę</span>
+  </label>
+</template>
diff --git a/resources/js/components/Common/ZipCodeInput.vue b/resources/js/components/Common/ZipCodeInput.vue
new file mode 100644
index 00000000..7a40e545
--- /dev/null
+++ b/resources/js/components/Common/ZipCodeInput.vue
@@ -0,0 +1,42 @@
+<script setup lang="ts">
+import vDynamicInputWidth from '@/Helpers/vDynamicInputWidth'
+import {nextTick} from 'vue'
+
+const zipCode = defineModel<string>({ required: true })
+
+defineProps<{
+  editing: boolean
+  name: string
+  error?: string
+}>()
+
+function handleInput() {
+  nextTick(() => {
+    let value = zipCode.value.replace(/[^0-9-]/g, '')
+
+    if (value.length > 2 && value[2] !== '-') {
+      value = value.slice(0, 2) + '-' + value.slice(2).replace('-', '')
+    }
+
+    zipCode.value = value.substring(0, 6)
+  })
+}
+</script>
+
+<template>
+  <input
+    v-model="zipCode"
+    v-dynamic-input-width
+    type="text"
+    :name="name"
+    autocomplete="off"
+    class="text-md transition-none h-fit w-full outline-none font-bold border-b border-transparent bg-transparent focus:border-b-primary"
+    :class="{
+      'border-b-primary/30 hover:border-b-primary/60 text-primary text-center' : editing,
+      'border-b-red' : !!error,
+    }"
+    :disabled="!editing"
+    @input="handleInput"
+  >
+</template>
+
diff --git a/resources/js/components/Crud/CrudItem.vue b/resources/js/components/Crud/CrudItem.vue
index 2a10f504..a6d4809b 100644
--- a/resources/js/components/Crud/CrudItem.vue
+++ b/resources/js/components/Crud/CrudItem.vue
@@ -1,4 +1,4 @@
-<script setup lang="ts" generic="T extends Sortable & { id: string | number }">
+<script setup lang="ts" generic="T extends { id: string | number }">
 import useRequestResolution from '@/Helpers/RequestResolution'
 import InputWrapper from '@/components/QuizzesPanel/InputWrapper.vue'
 import RequestWrapper from '@/components/Common/RequestWrapper.vue'
diff --git a/resources/js/components/Crud/CrudNewItem.vue b/resources/js/components/Crud/CrudNewItem.vue
index 584d5689..64980945 100644
--- a/resources/js/components/Crud/CrudNewItem.vue
+++ b/resources/js/components/Crud/CrudNewItem.vue
@@ -38,7 +38,7 @@ const { processing, errors } = useRequestResolution()
       <div class="flex flex-col md:flex-row pl-5 gap-5 h-fit">
         <button
           title="Anuluj"
-          @click="() => { }"
+          @click="emit('done')"
         >
           <XMarkIcon class="icon" />
         </button>
diff --git a/resources/js/components/Crud/CrudPage.vue b/resources/js/components/Crud/CrudPage.vue
index e0b83be4..9016b8c3 100644
--- a/resources/js/components/Crud/CrudPage.vue
+++ b/resources/js/components/Crud/CrudPage.vue
@@ -1,19 +1,26 @@
-<script setup lang="ts" generic="T extends Sortable & { id: string | number }, N extends Omit<T, 'createdAt' | 'id' | 'updatedAt'>">
+<script setup lang="ts" generic="T extends { id: string | number }, N">
 import { PlusCircleIcon } from '@heroicons/vue/20/solid'
 import { ArrowsUpDownIcon } from '@heroicons/vue/24/outline'
 import { vAutoAnimate } from '@formkit/auto-animate'
 import Expand from '@/components/Common/Expand.vue'
 import Dropdown from '@/components/Common/Dropdown.vue'
 import {type Errors} from '@inertiajs/core'
-import {useSorter} from '@/Helpers/Sorter'
-import {ref} from 'vue'
+import {ref, watch} from 'vue'
 import Button from '@/components/Common/Button.vue'
 import CrudNewItem from '@/components/Crud/CrudNewItem.vue'
 import CrudItem from '@/components/Crud/CrudItem.vue'
+import {useSorter} from '@/Helpers/Sorter'
+import SearchBar from '@/components/Crud/SearchBar.vue'
+import Pagination from '@/components/Common/Pagination.vue'
+import {useParams} from '@/Helpers/Params'
+import NoContent from '@/components/Common/NoContent.vue'
 
 const props = defineProps<{
-  items: T[]
-  options:  SortOptionConstructor[]
+  items: Pagination<T>
+  options: SortOption[]
+  customQueries?: () => string[]
+  customSearch?: (text: string | undefined) => string | undefined
+  displaySearchInLowerCase?: boolean
   resourceName: string
   newButtonText: string
   newItemData: N
@@ -30,24 +37,43 @@ const slots = defineSlots<{
   newItem: (scope: { newItemMode: boolean }) => any
   itemActions: (scope: { item: T, editMode: (enabled: boolean) => void }) => any
   itemData: (scope: { item: T, editing: boolean, errors: Errors }) => any
+  noContent: (scope: { search: boolean }) => any
 }>()
 
-const [items, options] = useSorter(props.resourceName, () => props.items, props.options)
+const pagination = props.items
 const newItemMode = ref(false)
+const params = useParams()
+const searchValue = ref(params.search)
+
+function handleSearch(text: string | undefined) {
+  if (props.customSearch) {
+    searchValue.value = props.customSearch(text)
+  }
+  else {
+    searchValue.value = text
+  }
+}
+
+const isSearchbarEmpty = ref(!params.search)
+watch(() => props.items.data, () => {
+  isSearchbarEmpty.value = !searchValue.value
+})
+
+const [query, options] = useSorter(props.options, searchValue, props.customQueries)
 </script>
 
 <template>
   <div class="flex flex-col w-full pb-3">
-    <div data-name="toolbar" class="flex xs:flex-row px-4 gap-1 sm:gap-2" :class="{ 'flex-col': mobileNav }">
+    <div data-name="toolbar" class="flex xs:flex-row px-4 gap-2" :class="{ 'flex-col': mobileNav }">
       <Dropdown pointer-position="left" class-btn="rounded-lg" class="mr-auto" :options="options" title="Sortuj">
-        <div class="flex gap-2 hover:bg-primary/5 hover:text-primary duration-200 p-2 rounded-lg">
+        <div class="flex gap-2 hover:bg-primary/5 hover:text-primary duration-200 p-2 rounded-lg h-fit">
           <ArrowsUpDownIcon class="size-6" />
           <span class="hidden sm:block">Sortuj</span>
         </div>
       </Dropdown>
 
       <slot name="actions">
-        <Expand />
+        <Expand class="hidden md:block" />
       </slot>
 
       <Button
@@ -62,6 +88,11 @@ const newItemMode = ref(false)
       </Button>
     </div>
 
+    <div class="flex w-full px-4 mt-2 justify-between gap-2">
+      <SearchBar class="w-full" :default-value="displaySearchInLowerCase ? params.search?.toLowerCase() : params.search" @search="handleSearch" />
+      <Pagination v-if="items.data.length > 0" :data="pagination" :query="query" />
+    </div>
+
     <div v-auto-animate class="flex flex-col gap-4 p-4">
       <template v-if="newItemMode">
         <slot name="newItem" :new-item-mode="newItemMode">
@@ -77,9 +108,8 @@ const newItemMode = ref(false)
         </slot>
       </template>
 
-
-      <slot v-for="item of items" :key="item.id" name="item" :item="item">
-        <CrudItem v-if="!slots.item" :item="item" :resource-name="resourceName" :deletable="deletable">
+      <slot v-for="item of items.data" :key="item.id" name="item" :item="item">
+        <CrudItem :item="item" :resource-name="resourceName" :deletable="deletable">
           <template #deleteMessage="data">
             <slot name="deleteMessage" v-bind="data" />
           </template>
@@ -92,11 +122,27 @@ const newItemMode = ref(false)
             <slot name="itemActions" :item="item" :edit-mode="editMode" />
           </template>
 
-          <template #data="data">
+          <template v-if="!!slots.itemData" #data="data">
             <slot name="itemData" v-bind="data" />
           </template>
         </CrudItem>
       </slot>
+
+      <template v-if="items.data.length === 0 && !!slots.noContent">
+        <slot name="noContent" :search="!isSearchbarEmpty">
+          <NoContent :description="!isSearchbarEmpty ? `Wygląda na to że nie mamy tego czego szukasz.` : undefined">
+            <div v-if="isSearchbarEmpty">
+              <Button class="rounded-xl" button-class="pl-3 font-bold" @click="newItemMode = true">
+                <PlusCircleIcon class="size-6 text-white" /> {{ newButtonText }}
+              </Button>
+            </div>
+          </NoContent>
+        </slot>
+      </template>
+    </div>
+
+    <div v-if="items.data.length > 0" class="flex justify-center">
+      <Pagination :data="pagination" :query="query" />
     </div>
   </div>
 </template>
diff --git a/resources/js/components/Crud/SearchBar.vue b/resources/js/components/Crud/SearchBar.vue
new file mode 100644
index 00000000..9f68628d
--- /dev/null
+++ b/resources/js/components/Crud/SearchBar.vue
@@ -0,0 +1,39 @@
+<script setup lang="ts">
+import {ref} from 'vue'
+import { MagnifyingGlassIcon } from '@heroicons/vue/24/outline'
+import { useDebounceFn } from '@vueuse/core'
+
+const props = defineProps<{ defaultValue?: string }>()
+const text = ref(props.defaultValue)
+const emit = defineEmits<{ search: [value:string|undefined] }>()
+const input = ref<HTMLInputElement>()
+
+function handleKeyUp(e: KeyboardEvent) {
+  if (e.key === 'Enter') {
+    emit('search', text.value)
+  }
+}
+
+const handleInput = useDebounceFn(() => {
+  emit('search', text.value)
+}, 500)
+</script>
+
+<template>
+  <div class="flex gap-1 bg-white/70 text-primary duration-200 p-1 rounded-xl w-full border border-primary/5">
+    <input
+      ref="input"
+      v-model="text"
+      type="text"
+      autocomplete="off"
+      placeholder="Szukaj"
+      class="pl-2 transition-none size-full outline-none text-primary placeholder:text-primary/60 text-left rounded-lg bg-transparent"
+      @keyup="handleKeyUp"
+      @input="handleInput"
+    >
+
+    <div title="Szukaj" class="flex gap-2 hover:bg-primary/5 hover:text-primary duration-200 p-2 rounded-lg cursor-pointer" @click="emit('search', text);">
+      <MagnifyingGlassIcon class="size-5 stroke-2" />
+    </div>
+  </div>
+</template>
diff --git a/resources/js/components/Dashboard/QuizItem.vue b/resources/js/components/Dashboard/QuizItem.vue
new file mode 100644
index 00000000..c51b87f8
--- /dev/null
+++ b/resources/js/components/Dashboard/QuizItem.vue
@@ -0,0 +1,20 @@
+<script setup lang="ts">
+import dayjs from 'dayjs'
+
+const props = defineProps<{
+  title: string
+  time?: string
+}>()
+</script>
+
+<template>
+  <div class="flex flex-col gap-5 2xs:flex-row 2xs:items-center rounded-xl bg-white shadow border p-5 justify-between">
+    <div class="flex flex-col gap-2">
+      <p class="font-bold text-lg text-primary">{{ title }}</p>
+      <p class="text-gray-600 text-sm">{{ props.time ? dayjs(props.time).fromNow() : '' }}</p>
+    </div>
+    <div class="flex pr-1 justify-center w-full 2xs:w-fit ">
+      <slot />
+    </div>
+  </div>
+</template>
diff --git a/resources/js/components/Home/AuthBanner.vue b/resources/js/components/Home/AuthBanner.vue
index 3bd1e561..c800ada3 100644
--- a/resources/js/components/Home/AuthBanner.vue
+++ b/resources/js/components/Home/AuthBanner.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { ref, onMounted, onUnmounted } from 'vue'
+import LogoIcon from '@/components/Icons/LogoIcon.vue'
 
 const isHidden = ref(false)
 const props = defineProps<{isLogin?:boolean}>()
@@ -31,7 +32,6 @@ function gotoLoginSection() {
   isLoginRef.value = true
   gotoAuthSection()
 }
-
 </script>
 
 <template>
@@ -42,14 +42,12 @@ function gotoLoginSection() {
     >
       <div class="justify-center flex-1 hidden lg:flex" />
       <div class="hidden lg:justify-center flex-1 xs:flex">
-        <svg class="size-10" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-          <path d="M7.02484 14.3074C6.60832 14.3074 6.3744 13.828 6.63076 13.4997L15.3851 2.28913C15.7308 1.84642 16.4312 2.22227 16.2534 2.75511L13.6884 10.4434C13.6668 10.5082 13.715 10.575 13.7832 10.575H16.4951C16.9018 10.575 17.1384 11.0347 16.902 11.3656L9.30015 22.0091C8.96935 22.4723 8.24533 22.1111 8.41638 21.5683L10.6633 14.4375C10.6836 14.373 10.6355 14.3074 10.5679 14.3074H7.02484Z" fill="#262C89" /><path fill-rule="evenodd" clip-rule="evenodd" d="M12.2545 17.8224V6.2803L15.3847 2.28313C15.731 1.84101 16.4307 2.21751 16.2525 2.75005L13.6885 10.4136C13.6668 10.4784 13.715 10.5453 13.7834 10.5453H16.4935C16.9005 10.5453 17.137 11.0056 16.9 11.3365L12.2545 17.8224Z" fill="#6566C2" />
-        </svg>
+        <LogoIcon />
       </div>
       <div class="flex justify-end flex-1 gap-6 items-center">
         <b><button class="text-sm text-primary" @click="gotoLoginSection">Logowanie</button></b>
         <button
-          class="flex-none rounded-lg bg-primary px-3.5 py-3 text-sm font-bold text-white shadow-sm hover:bg-primary-950 duration-200 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-gray-900"
+          class="flex-none rounded-lg bg-primary px-3.5 py-3 text-sm font-bold text-white shadow-sm hover:bg-primary-dark duration-200 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-gray-900"
           @click="gotoRegisterSection"
         >
           Rejestracja
diff --git a/resources/js/components/Home/GeneralSection.vue b/resources/js/components/Home/GeneralSection.vue
index 87beaaf9..02379cde 100644
--- a/resources/js/components/Home/GeneralSection.vue
+++ b/resources/js/components/Home/GeneralSection.vue
@@ -3,21 +3,17 @@ import InformationButton from '@/components/Home/InformationButton.vue'
 </script>
 
 <template>
-  <section class="w-full flex flex-col overflow-hidden">
-    <div data-name="left" class="flex flex-col justify-center w-full gap-10 p-10 pb-16">
-      <img class="h-40 object-contain" src="@/../assets/header-logo.png" alt="logo nagłówka">
-      <InformationButton />
-    </div>
+  <section class="w-full flex flex-col items-center gap-10 p-10">
+    <img class="h-40 object-contain" src="@/../assets/header-logo.png" alt="logo nagłówka">
 
-    <div data-name="right" class="p-16 flex flex-col size-full">
-      <h1 class="text-center text-[1.5rem] font-bold">SPONSORZY</h1>
-      <div class="mx-auto mt-10 grid max-w-lg grid-cols-4 items-center gap-x-8 gap-y-10 sm:grid-cols-6">
-        <img class="cursor-pointer duration-200 hover:scale-110 col-span-2 max-h-12 w-full object-contain" src="https://tailwindui.com/img/logos/158x48/transistor-logo-gray-900.svg" alt="Transistor" width="158" height="48">
-        <img class="cursor-pointer duration-200 hover:scale-110 col-span-2 max-h-12 w-full object-contain" src="https://tailwindui.com/img/logos/158x48/reform-logo-gray-900.svg" alt="Reform" width="158" height="48">
-        <img class="cursor-pointer duration-200 hover:scale-110 col-span-2 max-h-12 w-full object-contain" src="https://tailwindui.com/img/logos/158x48/tuple-logo-gray-900.svg" alt="Tuple" width="158" height="48">
-        <img class="cursor-pointer duration-200 hover:scale-110 col-span-2 max-h-12 w-full object-contain sm:col-start-2" src="https://tailwindui.com/img/logos/158x48/savvycal-logo-gray-900.svg" alt="SavvyCal" width="158" height="48">
-        <img class="cursor-pointer duration-200 hover:scale-110 col-span-2 col-start-2 max-h-12 w-full object-contain sm:col-start-auto" src="https://tailwindui.com/img/logos/158x48/statamic-logo-gray-900.svg" alt="Statamic" width="158" height="48">
-      </div>
-    </div>
+    <InformationButton />
+
+    <h1 class="text-center text-[1.5rem] font-bold mt-20">SPONSOR</h1>
+
+    <img
+      class="w-fit rounded cursor-pointer duration-200 hover:scale-110 object-contain max-h-48"
+      src="https://www.tauron.pl/-/media/layout/logo_tlo.ashx"
+      alt="Tauron"
+    >
   </section>
 </template>
diff --git a/resources/js/components/Home/InformationButton.vue b/resources/js/components/Home/InformationButton.vue
index c42f9c4f..700dbaf7 100644
--- a/resources/js/components/Home/InformationButton.vue
+++ b/resources/js/components/Home/InformationButton.vue
@@ -7,7 +7,7 @@ const isInformationVisible = ref(false)
 
 <template>
   <div class="flex h-12 justify-center items-center">
-    <button class="text-primary text-2xl font-bold duration-200 hover:text-primary-800 hover:scale-105" @click="isInformationVisible = true">
+    <button class="text-primary text-2xl font-bold duration-200 hover:text-primary-bright hover:scale-105" @click="isInformationVisible = true">
       INFORMACJE O KONKURSIE
     </button>
   </div>
diff --git a/resources/js/components/Home/LoginForm.vue b/resources/js/components/Home/LoginForm.vue
index 120fde43..a85aee29 100644
--- a/resources/js/components/Home/LoginForm.vue
+++ b/resources/js/components/Home/LoginForm.vue
@@ -20,7 +20,7 @@ function submit() {
 
     <div class="flex flex-col gap-2">
       <CustomInput v-model="form.password" label="Hasło" :error="errors.password" name="password" type="password" />
-      <a href="/auth/forgot-password" class="duration-200 font-semibold leading-6 text-primary hover:text-primary-950 text-sm">Nie pamiętam hasła</a>
+      <a href="/auth/forgot-password" class="duration-200 font-semibold leading-6 text-primary hover:text-primary-dark text-sm">Nie pamiętam hasła</a>
     </div>
 
     <div>
@@ -28,7 +28,7 @@ function submit() {
         :disabled="form.processing"
         type="submit"
         class="rounded-lg text-md flex w-full justify-center bg-primary p-3 font-bold text-white
-        transition hover:bg-primary-950 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary
+        transition hover:bg-primary-dark focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary
         disabled:opacity-70"
       >
         Zaloguj się
diff --git a/resources/js/components/Home/RegisterForm.vue b/resources/js/components/Home/RegisterForm.vue
index 4cd8f1ab..076998db 100644
--- a/resources/js/components/Home/RegisterForm.vue
+++ b/resources/js/components/Home/RegisterForm.vue
@@ -16,7 +16,7 @@ const filteredSchoolOptions = computed(() =>
   ),
 )
 const form = useForm({
-  name: '',
+  firstname: '',
   surname: '',
   email: '',
   password: '',
@@ -31,7 +31,7 @@ function submit() {
 <template>
   <form class="row-start-1 col-start-1 space-y-6" @submit.prevent="submit">
     <div class="flex flex-col gap-6 sm:flex-row">
-      <CustomInput v-model="form.name" label="Imię" :error="errors.name" name="name" type="name" />
+      <CustomInput v-model="form.firstname" label="Imię" :error="errors.firstname" name="firstname" type="name" />
       <CustomInput v-model="form.surname" label="Nazwisko" :error="errors.surname" name="surname" type="surname" />
     </div>
 
@@ -44,7 +44,7 @@ function submit() {
     />
 
     <CustomInput v-model="form.email" label="E-mail" :error="errors.email" name="email" type="email" />
-
+    `
     <PasswordInput v-model="form.password" :error="errors.password" />
 
     <label class="mx-2 mt-4 flex flex-row items-center gap-4">
@@ -57,11 +57,11 @@ function submit() {
     </label>
 
     <div>
-      <button 
+      <button
         :disabled="form.processing"
         type="submit"
         class="rounded-lg text-md flex w-full justify-center bg-primary p-3 font-bold text-white
-        transition hover:bg-primary-950 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary
+        transition hover:bg-primary-dark focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary
         disabled:opacity-70"
       >
         Zarejestruj się
diff --git a/resources/js/components/Icons/ExapnsionToggleDynamicIcon.vue b/resources/js/components/Icons/ExpansionToggleDynamicIcon.vue
similarity index 100%
rename from resources/js/components/Icons/ExapnsionToggleDynamicIcon.vue
rename to resources/js/components/Icons/ExpansionToggleDynamicIcon.vue
diff --git a/resources/js/components/Icons/LogoIcon.vue b/resources/js/components/Icons/LogoIcon.vue
new file mode 100644
index 00000000..3861a5ad
--- /dev/null
+++ b/resources/js/components/Icons/LogoIcon.vue
@@ -0,0 +1,8 @@
+<template>
+  <div>
+    <svg class="size-10" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <path d="M7.02484 14.3074C6.60832 14.3074 6.3744 13.828 6.63076 13.4997L15.3851 2.28913C15.7308 1.84642 16.4312 2.22227 16.2534 2.75511L13.6884 10.4434C13.6668 10.5082 13.715 10.575 13.7832 10.575H16.4951C16.9018 10.575 17.1384 11.0347 16.902 11.3656L9.30015 22.0091C8.96935 22.4723 8.24533 22.1111 8.41638 21.5683L10.6633 14.4375C10.6836 14.373 10.6355 14.3074 10.5679 14.3074H7.02484Z" fill="#E4007D" />
+      <path fill-rule="evenodd" clip-rule="evenodd" d="M12.2545 17.8224V6.2803L15.3847 2.28313C15.731 1.84101 16.4307 2.21751 16.2525 2.75005L13.6885 10.4136C13.6668 10.4784 13.715 10.5453 13.7834 10.5453H16.4935C16.9005 10.5453 17.137 11.0056 16.9 11.3365L12.2545 17.8224Z" fill="#FF17A1" />
+    </svg>
+  </div>
+</template>
diff --git a/resources/js/components/Profile/UserDataSection.vue b/resources/js/components/Profile/UserDataSection.vue
index 574854c1..90de139e 100644
--- a/resources/js/components/Profile/UserDataSection.vue
+++ b/resources/js/components/Profile/UserDataSection.vue
@@ -8,7 +8,7 @@ defineProps<{ user: User }>()
     <div class="flex flex-col sm:grid sm:grid-cols-2 gap-4">
       <div class="w-full rounded-lg overflow-hidden bg-white/30 flex flex-col">
         <b class="bg-primary w-full text-white p-2 px-3">Imię</b>
-        <p class="p-4 text-[1.1rem] border-2 border-t-0 h-full rounded-b-lg border-primary/30">{{ user.name }}</p>
+        <p class="p-4 text-[1.1rem] border-2 border-t-0 h-full rounded-b-lg border-primary/30">{{ user.firstname }}</p>
       </div>
       <div class="w-full rounded-lg overflow-hidden bg-white/30 flex flex-col">
         <b class="bg-primary w-full text-white p-2 px-3">Nazwisko</b>
diff --git a/resources/js/components/QuizResult/AnswerResult.vue b/resources/js/components/QuizResult/AnswerResult.vue
new file mode 100644
index 00000000..3f4ef7f8
--- /dev/null
+++ b/resources/js/components/QuizResult/AnswerResult.vue
@@ -0,0 +1,28 @@
+<script setup lang="ts">
+import CustomRadio from '@/components/Common/CustomRadio.vue'
+
+defineProps<{
+  checked?: boolean
+  correct?: boolean
+  revealAnswers?: boolean
+}>()
+</script>
+
+<template>
+  <label 
+    class="flex gap-2.5" 
+    :class="{
+      'text-red': !correct && checked && revealAnswers,
+      'text-green-700': correct && revealAnswers,
+      'text-primary': !correct && !checked || !revealAnswers,
+      'font-semibold': checked,
+    }"
+  >
+    <CustomRadio
+      class="mt-1"
+      disabled
+      :checked="checked"
+    />
+    <slot />
+  </label>
+</template>
diff --git a/resources/js/components/QuizResult/QuestionResult.vue b/resources/js/components/QuizResult/QuestionResult.vue
new file mode 100644
index 00000000..a679f73f
--- /dev/null
+++ b/resources/js/components/QuizResult/QuestionResult.vue
@@ -0,0 +1,25 @@
+<script setup lang="ts">
+import AnswerResult from '@/components/QuizResult/AnswerResult.vue'
+
+defineProps<{ index: number, question: UserQuestion, questionsTotal: number, hasRanking: boolean }>()
+</script>
+
+<template>
+  <div class="rounded-xl bg-white shadow border flex flex-col justify-between gap-5 p-5 pb-6">
+    <div class="flex flex-col gap-3">
+      <b class="text-primary text-lg">Pytanie: {{ index + 1 }}/{{ questionsTotal }}</b>
+      <p class="font-medium">{{ question.text }}</p>
+    </div>
+
+    <form class="flex flex-col gap-5">
+      <AnswerResult
+        v-for="answer in question.answers" :key="answer.id"
+        :checked="question.selectedAnswer === answer.id"
+        :correct="answer.correct"
+        :reveal-answers="hasRanking"
+      >
+        {{ answer.text }}
+      </AnswerResult>
+    </form>
+  </div>
+</template>
diff --git a/resources/js/components/QuizzesPanel/InputWrapper.vue b/resources/js/components/QuizzesPanel/InputWrapper.vue
index 9399f3bd..967d1bae 100644
--- a/resources/js/components/QuizzesPanel/InputWrapper.vue
+++ b/resources/js/components/QuizzesPanel/InputWrapper.vue
@@ -1,14 +1,9 @@
 <script setup lang="ts">
-defineProps<{
-  label?:string
-  error?:string
-  hideError?:boolean
-  hideContent?:boolean
-}>()
+defineProps<{ label?:string, error?:string, hideError?:boolean, hideContent?:boolean }>()
 </script>
 
 <template>
-  <div class="flex flex-1 flex-col">
+  <div class="flex flex-1 flex-col min-h-6.5">
     <label v-if="label" class="flex flex-1 flex-col 2xs:flex-row 2xs:gap-1">
       {{ label }}
       <b v-if="hideContent" aria-label="brak danych">-</b>
diff --git a/resources/js/components/QuizzesPanel/QuestionComponent.vue b/resources/js/components/QuizzesPanel/QuestionComponent.vue
index af813cdd..7a794af8 100644
--- a/resources/js/components/QuizzesPanel/QuestionComponent.vue
+++ b/resources/js/components/QuizzesPanel/QuestionComponent.vue
@@ -2,7 +2,7 @@
 import { computed, ref } from 'vue'
 import { DocumentDuplicateIcon, PlusCircleIcon, TrashIcon } from '@heroicons/vue/24/outline'
 import { vAutoAnimate } from '@formkit/auto-animate'
-import ExapnsionToggleDynamicIcon from '@/components/Icons/ExapnsionToggleDynamicIcon.vue'
+import ExpansionToggleDynamicIcon from '@/components/Icons/ExpansionToggleDynamicIcon.vue'
 import AnswerComponent from '@/components/QuizzesPanel/AnswerComponent.vue'
 import getKey from '@/Helpers/KeysManager'
 
@@ -22,7 +22,7 @@ function addAnswer() {
 }
 
 function deleteAnswer(currentAnswer: Answer) {
-  question.value.answers = question.value.answers.filter((answer:Answer) => answer !== currentAnswer)
+  question.value.answers = question.value.answers.filter(answer => answer !== currentAnswer)
 }
 
 function setCorrectAnswer(currentAnswer: Answer) {
@@ -33,15 +33,15 @@ function setCorrectAnswer(currentAnswer: Answer) {
 </script>
 
 <template>
-  <div 
-    v-auto-animate 
-    class="flex flex-col gap-5 p-5 w-full rounded-lg border border-primary/30" 
+  <div
+    v-auto-animate
+    class="flex flex-col gap-5 p-5 w-full rounded-lg border border-primary/30"
     :class="{ 'border-red': error }"
   >
     <div class="flex flex-col gap-1.5">
       <div class="flex justify-between">
         <b class="text-lg">Pytanie {{ `${index+1}/${questionsTotal}` }}</b>
-        
+
         <div v-if="editing" class="flex gap-5">
           <button title="Skopiuj pytanie" @click="emit('copy', question)">
             <DocumentDuplicateIcon class="icon slide-up-animation" />
@@ -52,18 +52,18 @@ function setCorrectAnswer(currentAnswer: Answer) {
           </button>
         </div>
       </div>
-      
+
       <span v-if="!editing">{{ question.text }}</span>
       <textarea v-else v-model="question.text" placeholder="Wpisz pytanie" class="h-12 w-full bg-transparent outline-none border-b border-primary/30 focus:border-primary/60" />
     </div>
-      
+
     <button
       v-if="hasAnswers"
-      class="flex gap-1.5 font-bold text-primary hover:text-primary-800 items-center text-percentage-105"
+      class="flex gap-1.5 font-bold text-primary hover:text-primary-bright items-center text-percentage-105"
       @click="answersPaneExpanded = !answersPaneExpanded"
     >
       Odpowiedzi
-      <ExapnsionToggleDynamicIcon class="size-3.5 stroke-[4]" :expanded="answersPaneExpanded" />
+      <ExpansionToggleDynamicIcon class="size-3.5 stroke-[4]" :expanded="answersPaneExpanded" />
     </button>
 
     <template v-if="answersPaneExpanded && hasAnswers">
diff --git a/resources/js/components/QuizzesPanel/QuizComponent.vue b/resources/js/components/QuizzesPanel/QuizComponent.vue
index 88bbd12d..3037d847 100644
--- a/resources/js/components/QuizzesPanel/QuizComponent.vue
+++ b/resources/js/components/QuizzesPanel/QuizComponent.vue
@@ -5,14 +5,14 @@ import { PlusCircleIcon } from '@heroicons/vue/24/outline'
 import QuestionComponent from '@/components/QuizzesPanel/QuestionComponent.vue'
 import QuizHeader from '@/components/QuizzesPanel/QuizHeader.vue'
 import QuizNavbar from '@/components/QuizzesPanel/QuizNavbar.vue'
-import ExapnsionToggleDynamicIcon from '@/components/Icons/ExapnsionToggleDynamicIcon.vue'
+import ExpansionToggleDynamicIcon from '@/components/Icons/ExpansionToggleDynamicIcon.vue'
 import getKey from '@/Helpers/KeysManager'
 import useRequestResolution from '@/Helpers/RequestResolution'
 import { formatDate } from '@/Helpers/Format'
 import InputWrapper from '@/components/QuizzesPanel/InputWrapper.vue'
 
 const currentTime = inject<Ref<number>>('currentTime')
-const props = defineProps<{ quiz:Quiz, showArchivedQuizzes:boolean }>()
+const props = defineProps<{ quiz:Quiz }>()
 const quiz = ref<Quiz>(JSON.parse(JSON.stringify(props.quiz)))
 const selected = ref(false)
 const editing = ref(false)
@@ -21,7 +21,7 @@ const { processing, errors } = useRequestResolution()
 const startTimeReached = computed<boolean>(() =>
   !!quiz.value.scheduledAt &&
   !!currentTime?.value &&
-  Date.parse(quiz.value.scheduledAt) > currentTime.value,
+  Date.parse(quiz.value.scheduledAt) < currentTime.value,
 )
 
 watch(startTimeReached, quizHasStarted => {
@@ -45,7 +45,6 @@ function deleteQuestion(idx:number, question:Question) {
   if (errors.value[`questions.${idx}.text`]) {
     errors.value[`questions.${idx}.text`] = ''
   }
-
 }
 
 function toggleSelection(isSelected:boolean) {
@@ -60,7 +59,6 @@ function toggleEditing(isEditing:boolean){
 
 <template>
   <div
-    v-if="!(archived && showArchivedQuizzes)"
     v-auto-animate
     class="flex flex-col gap-5 p-5 bg-white/70 border-2 rounded-xl shadow-sm"
   >
@@ -72,7 +70,7 @@ function toggleEditing(isEditing:boolean){
 
     <div class="flex justify-between">
       <button :disabled="editing" class="h-7 disabled:opacity-50" @click="toggleSelection(!selected)">
-        <ExapnsionToggleDynamicIcon class="text-primary stroke-4 w-4" :expanded="selected" />
+        <ExpansionToggleDynamicIcon class="text-primary stroke-4 w-4" :expanded="selected" />
       </button>
 
       <QuizHeader
@@ -89,7 +87,7 @@ function toggleEditing(isEditing:boolean){
         :locked="quiz.state === 'locked'"
         :archived="archived"
         :editing="editing"
-        :start-time-reached="startTimeReached"
+        :start-time-not-reached="!startTimeReached"
         @toggle-editing="toggleEditing"
         @cancel-changes="quiz = JSON.parse(JSON.stringify(props.quiz)); errors={}"
       />
diff --git a/resources/js/components/QuizzesPanel/QuizHeader.vue b/resources/js/components/QuizzesPanel/QuizHeader.vue
index 4561d93d..894f54df 100644
--- a/resources/js/components/QuizzesPanel/QuizHeader.vue
+++ b/resources/js/components/QuizzesPanel/QuizHeader.vue
@@ -16,9 +16,9 @@ const quiz = defineModel<Quiz>({ required: true })
 <template>
   <div class="flex flex-col gap-1 w-full px-2">
     <InputWrapper
+      :hide-content="!quiz.title && !editing"
       :error="errors.title"
       :hide-error="!editing"
-      :hide-content="!quiz.title && !editing"
     >
       <input
         v-model="quiz.title"
@@ -41,9 +41,9 @@ const quiz = defineModel<Quiz>({ required: true })
     >
       <InputWrapper
         label="Rozpoczęcie testu:"
+        :hide-content="!quiz.scheduledAt && !editing"
         :error="errors.scheduled_at"
         :hide-error="!editing"
-        :hide-content="!quiz.scheduledAt && !editing"
       >
         <b v-if="!editing" class="whitespace-nowrap">{{ formatDate(quiz.scheduledAt) }}</b>
         <CustomDatepicker
@@ -61,9 +61,9 @@ const quiz = defineModel<Quiz>({ required: true })
     >
       <InputWrapper
         label="Czas trwania testu (min):"
+        :hide-content="!quiz.duration && !editing"
         :error="errors.duration"
         :hide-error="!editing"
-        :hide-content="!quiz.duration && !editing"
       >
         <b v-if="!editing">{{ quiz.duration }}</b>
         <input
diff --git a/resources/js/components/QuizzesPanel/QuizNavbar.vue b/resources/js/components/QuizzesPanel/QuizNavbar.vue
index 45b13c2d..36c324cc 100644
--- a/resources/js/components/QuizzesPanel/QuizNavbar.vue
+++ b/resources/js/components/QuizzesPanel/QuizNavbar.vue
@@ -1,8 +1,7 @@
 <script setup lang="ts">
 import { computed, ref } from 'vue'
-import { CheckIcon, CloudArrowUpIcon, DocumentDuplicateIcon, PencilIcon, TrashIcon, UserPlusIcon, UsersIcon, XMarkIcon } from '@heroicons/vue/24/outline'
+import { CheckIcon, CloudArrowUpIcon, DocumentDuplicateIcon, PencilIcon, PlayIcon, TrashIcon, UserPlusIcon, UsersIcon, XMarkIcon } from '@heroicons/vue/24/outline'
 import { CloudArrowDownIcon } from '@heroicons/vue/20/solid'
-import {type Errors} from '@inertiajs/core'
 import RequestWrapper from '@/components/Common/RequestWrapper.vue'
 import { formatDate } from '@/Helpers/Format'
 import WarningMessageBox from '@/components/Common/WarningMessageBox.vue'
@@ -12,44 +11,58 @@ const props = defineProps<{
   unlocked:boolean
   locked:boolean
   editing:boolean
-  startTimeReached:boolean
+  startTimeNotReached:boolean
 }>()
 const quiz = defineModel<Quiz>({ required: true })
 const emit = defineEmits<{ toggleEditing:[editing:boolean], cancelChanges:[] }>()
 const showDeleteMessage = ref(false)
-const publishValidation = computed<{ validated: boolean, error: string }>(
-  () => {
-    const validations: Record<string, boolean> = {
-      hasCorrectAnswers: questionsHaveOneCorrectAnswer(),
-      hasQuestions: quiz.value.questions.length > 0,
-      duration: !!quiz.value.duration,
-      startTimeReached: props.startTimeReached,
-    }
-    const errors: Errors = {
-      hasCorrectAnswers: 'Pytanie nie zawiera zaznaczonej prawidłowej odpowiedzi.',
-      hasQuestions: 'Test nie zawiera żadnego pytania.',
-      duration: 'Czas trwania testu nie jest ustawiony.',
-      startTimeReached: 'Czas rozpoczęcia testu upłynął.',
-    }
-    const validationOutcome = { validated: true,  error: ''}
-    for (const key in validations) {
-      validationOutcome.validated &&= validations[key]
-      if (!validations[key])
-        validationOutcome.error = errors[key]
-    }
-    return validationOutcome
-  },
-)
 
-function questionsHaveOneCorrectAnswer() {
-  return quiz.value.questions.every(
+const questionsHaveOneCorrectAnswer = computed(
+  ()=> quiz.value.questions.every(
     (question: Question) => {
       const correctIdx = question.answers.findIndex(answer => answer.correct)
       return correctIdx !== -1 && question.answers.slice(correctIdx+1).every(
         (answer:Answer) => !answer.correct,
       )
     },
-  )
+  ),
+)
+
+const assertions = computed<Record<string, [boolean, string]>>(()=>({
+  hasCorrectAnswers: [questionsHaveOneCorrectAnswer.value, 'Żadne pytanie nie zawiera zaznaczonej prawidłowej odpowiedzi.'],
+  hasQuestions: [quiz.value.questions.length > 0, 'Test nie zawiera żadnego pytania.'],
+  duration: [!!quiz.value.duration, 'Czas trwania testu nie jest ustawiony.'],
+  startTimeNotReached: [props.startTimeNotReached, 'Czas rozpoczęcia testu upłynął.'],
+}))
+
+const publishValidation = computed(
+  () => validation(
+    assertions.value.hasCorrectAnswers,
+    assertions.value.hasQuestions,
+    assertions.value.duration,
+    assertions.value.startTimeNotReached,
+  ),
+)
+
+const quizDemoValidation = computed(
+  () => validation(
+    assertions.value.hasCorrectAnswers,
+    assertions.value.hasQuestions,
+    assertions.value.duration,
+  ),
+)
+
+function validation(...assertionPairs: Array<[boolean, string]>): { validated: boolean, error: string } {
+  const validationOutcome = { validated: true, error: '' }
+
+  for (const [isValid, errorMsg] of assertionPairs) {
+    validationOutcome.validated &&= isValid
+    if (!isValid && !validationOutcome.error) {
+      validationOutcome.error = errorMsg
+    }
+  }
+
+  return validationOutcome
 }
 
 function sanitizeData() {
@@ -119,13 +132,27 @@ function sanitizeData() {
       <DocumentDuplicateIcon class="icon slide-up-animation" />
     </RequestWrapper>
 
-    <button v-if="!archived" title="Usuń test" @click="showDeleteMessage = true">
+    <button v-if="!archived && !locked" title="Usuń test" @click="showDeleteMessage = true">
       <TrashIcon class="icon slide-up-animation text-red hover:text-red-500" />
     </button>
 
+    <RequestWrapper
+      v-if="!editing"
+      :href="`/admin/quizzes/${quiz.id}`"
+      :title="!quizDemoValidation.validated ? `Nie można wyświetlić demonstracji testu. ${quizDemoValidation.error}` : 'Włącz demonstrację testu'"
+      :disabled="!quizDemoValidation.validated"
+    >
+      <PlayIcon
+        class="w-7.5 h-7.5 text-primary stroke-2"
+        :class="{
+          'opacity-50': !quizDemoValidation.validated,
+          'hover:text-primary-800 slide-up-animation': quizDemoValidation.validated
+        }"
+      />
+    </RequestWrapper>
+
     <RequestWrapper
       v-if="!editing && unlocked"
-      class="rounded-xl"
       method="post"
       :href="`/admin/quizzes/${quiz.id}/lock`"
       :title="!publishValidation.validated ? `Nie można opublikować testu. ${publishValidation.error}` : 'Udostępnij test publicznie'"
@@ -134,7 +161,10 @@ function sanitizeData() {
     >
       <CloudArrowUpIcon
         class="w-7.5 h-7.5 text-primary stroke-2"
-        :class="{ 'opacity-50': !publishValidation.validated, 'hover:text-primary-800': publishValidation.validated }"
+        :class="{
+          'opacity-50': !publishValidation.validated,
+          'hover:text-primary-bright slide-up-animation': publishValidation.validated
+        }"
       />
     </RequestWrapper>
 
diff --git a/resources/js/components/UserQuiz/QuizPage.vue b/resources/js/components/UserQuiz/QuizPage.vue
new file mode 100644
index 00000000..63daff6e
--- /dev/null
+++ b/resources/js/components/UserQuiz/QuizPage.vue
@@ -0,0 +1,157 @@
+<script setup lang="ts">
+import { computed, ref, watch } from 'vue'
+import { useTimer } from '@/Helpers/Timer'
+import { useWindowScroll } from '@vueuse/core'
+import { Head } from '@inertiajs/vue3'
+import { calcSecondsLeftToDate } from '@/Helpers/Time'
+import { type Method } from '@inertiajs/core'
+
+import Divider from '@/components/Common/Divider.vue'
+import Banner from '@/components/Common/Banner.vue'
+import Button from '@/components/Common/Button.vue'
+import MessageBox from '@/components/Common/MessageBox.vue'
+import UserQuestion from '@/components/UserQuiz/UserQuestion.vue'
+import FormButton from '@/components/Common/FormButton.vue'
+
+const props = defineProps<{ userQuiz: UserQuiz, requestCloseQuiz: { method:Method, href:string } }>()
+const questions = ref(props.userQuiz.questions)
+const emit = defineEmits<{ answer: [question: UserQuestion, selectedAnswer: number] }>()
+
+const allQuestionsAnswered = computed(
+  () => questions.value.every(question => question.selectedAnswer !== undefined),
+)
+
+const timeout = ref(false)
+const timeoutMessage = ref(false)
+const timeoutWarningMessage = ref(false)
+const emptyAnswerMessage = ref(false)
+
+const scroll = useWindowScroll()
+const showDuration = ref(false)
+const durationInMilliseconds = calcSecondsLeftToDate(props.userQuiz.closedAt) * 1000
+const fiveMinutesInMilliseconds = 300000
+
+watch(scroll.y, v => showDuration.value = v > 150)
+
+if (durationInMilliseconds > fiveMinutesInMilliseconds) {
+  const duration = durationInMilliseconds - fiveMinutesInMilliseconds
+  if (duration < 2147483647)
+    setTimeout(() => timeoutWarningMessage.value = true, durationInMilliseconds - fiveMinutesInMilliseconds)
+}
+
+const timeLeft = useTimer(props.userQuiz.closedAt, () => {
+  timeout.value = true
+  timeoutMessage.value = true
+})
+
+function handleAnswer(question: UserQuestion, selectedAnswer: number) {
+  question.selectedAnswer = selectedAnswer
+  emit('answer', question, selectedAnswer)
+}
+</script>
+
+<template>
+  <Head :title="userQuiz.title" />
+  
+  <Banner
+    class="bg-white !text-primary border-b font-semibold"
+    :message="timeLeft"
+    :show="showDuration"
+  />
+
+  <Divider>
+    <template #default>
+      <h1 class="font-bold text-lg text-primary whitespace-nowrap">
+        {{ userQuiz.title }}
+      </h1>
+    </template>
+
+    <template v-if="timeLeft" #right>
+      <p class="text-primary font-semibold whitespace-nowrap">
+        {{ timeLeft }}
+      </p>
+    </template>
+  </Divider>
+
+  <div class="flex flex-col p-5 gap-5 max-w-6xl">
+    <UserQuestion
+      v-for="(question, index) in questions" :key="question.id"
+      :index="index"
+      :question="question"
+      :questions-total="questions.length"
+      :timeout
+      @answer="handleAnswer"
+    />
+
+    <div v-if="!timeout" class="h-80 mx-5 flex flex-col gap-8 items-center justify-center">
+      <p class="font-semibold text-primary text-xl text-center">To już wszystkie pytania. Czy chcesz oddać test?</p>
+      
+      <FormButton
+        v-if="allQuestionsAnswered" 
+        large
+        :href="requestCloseQuiz.href" 
+        :method="requestCloseQuiz.method"
+      >
+        Oddaj test
+      </FormButton>
+      
+      <Button
+        v-else
+        large 
+        @click="emptyAnswerMessage = true"
+      >
+        Oddaj test
+      </Button>
+    </div>
+
+    <div v-else class="h-80 mx-5 flex flex-col gap-8 items-center justify-center">
+      <p class="font-semibold text-primary text-xl text-center">Czas przewidziany na ten test dobiegł końca. <br> Twój test został przesłany do ocenienia</p>
+      
+      <FormButton 
+        large
+        :href="requestCloseQuiz.href" 
+        :method="requestCloseQuiz.method"
+      >
+        Podsumowanie
+      </FormButton>
+    </div>
+  </div>
+
+  <MessageBox :open="emptyAnswerMessage" @close="emptyAnswerMessage = false">
+    <template #title>Pytania bez odpowiedzi</template>
+
+    <template #message>Nie udzielono odpowiedzi na wszystkie pytania, czy na pewno chcesz oddać test?</template>
+
+    <template #buttons>
+      <Button small text @click="emptyAnswerMessage = false">Wróć</Button>
+
+      <FormButton 
+        small
+        :href="requestCloseQuiz.href" 
+        :method="requestCloseQuiz.method"
+      >
+        Oddaj mimo to
+      </FormButton>
+    </template>
+  </MessageBox>
+
+  <MessageBox :open="timeoutMessage" @close="timeoutMessage = false">
+    <template #title>Koniec czasu</template>
+
+    <template #message>Czas przewidziany na ten test dobiegł końca. Możliwość udzielania dalszych odpowiedzi została zablokowana.</template>
+
+    <template #buttons>
+      <Button small @click="timeoutMessage = false">Ok</Button>
+    </template>
+  </MessageBox>
+
+  <MessageBox :open="timeoutWarningMessage" @close="timeoutWarningMessage = false">
+    <template #title>Zbliża się koniec czasu</template>
+
+    <template #message>Pozostało 5 minut do końca testu.</template>
+
+    <template #buttons>
+      <Button small @click="timeoutWarningMessage = false">Ok</Button>
+    </template>
+  </MessageBox>
+</template>
diff --git a/resources/js/components/UserQuiz/UserAnswer.vue b/resources/js/components/UserQuiz/UserAnswer.vue
new file mode 100644
index 00000000..39dcf886
--- /dev/null
+++ b/resources/js/components/UserQuiz/UserAnswer.vue
@@ -0,0 +1,27 @@
+<script setup lang="ts">
+import CustomRadio from '@/components/Common/CustomRadio.vue'
+
+defineProps<{
+  answer: { id: number, text: string }
+  timeout: boolean
+  checked: boolean
+}>()
+const emit = defineEmits<{ change: [answerId: number] }>()
+</script>
+
+<template>
+  <label
+    class="flex gap-2.5 text-gray-900"
+    :class="timeout ? 'cursor-not-allowed' : 'cursor-pointer'"
+    :title="timeout ? 'Czas przewidziany na ten test dobiegł końca' : undefined"
+  >
+    <CustomRadio
+      class="mt-1 text-primary"
+      :class="timeout ? 'cursor-not-allowed' : 'cursor-pointer'"
+      :disabled="timeout"
+      :checked
+      @change="emit('change', answer.id)"
+    />
+    {{ answer.text }}
+  </label>
+</template>
diff --git a/resources/js/components/UserQuiz/UserQuestion.vue b/resources/js/components/UserQuiz/UserQuestion.vue
new file mode 100644
index 00000000..4883b909
--- /dev/null
+++ b/resources/js/components/UserQuiz/UserQuestion.vue
@@ -0,0 +1,26 @@
+<script setup lang="ts">
+import UserAnswer from '@/components/UserQuiz/UserAnswer.vue'
+
+defineProps<{ index: number, question: UserQuestion, questionsTotal: number, timeout: boolean }>()
+const emit = defineEmits<{ answer: [question: UserQuestion, answerId: number] }>()
+</script>
+
+<template>
+  <div class="rounded-xl bg-white shadow border flex flex-col justify-between gap-5 p-5 pb-6">
+    <div class="flex flex-col gap-3">
+      <b class="text-primary text-lg">Pytanie: {{ index + 1 }}/{{ questionsTotal }}</b>
+      <p class="font-medium">{{ question.text }}</p>
+    </div>
+
+    <form class="flex flex-col gap-5">
+      <UserAnswer
+        v-for="answer in question.answers"
+        :key="answer.id"
+        :answer="answer"
+        :checked="question.selectedAnswer === answer.id"
+        :timeout="timeout"
+        @change="answerId => emit('answer', question, answerId)"
+      />
+    </form>
+  </div>
+</template>
diff --git a/resources/views/emails/auth/reset-password.blade.php b/resources/views/emails/auth/reset-password.blade.php
index f9aeb8a8..6e23e5ba 100644
--- a/resources/views/emails/auth/reset-password.blade.php
+++ b/resources/views/emails/auth/reset-password.blade.php
@@ -5,7 +5,7 @@
     a { text-decoration: none; }
     p { margin: 48px 0; line-height: 24px; }
     table { width: 100%; border-spacing: 0; }
-    .button { background-color: #262C89; color: white; padding: 16px 80px; border-radius: 12px; }
+    .button { background-color: #E4007D; color: white; padding: 16px 80px; border-radius: 12px; }
 </style>
 
 <div style="font-family: sans-serif; color: #3D4852; padding: 0 48px;">
@@ -14,18 +14,18 @@
     </div>
 
     <div>
-        <h2>Cześć, {{ $user->name }}!</h2>
+        <h2>Cześć, {{ $user->firstname }}!</h2>
 
         <p>Otrzymaliśmy prośbę o zresetowanie hasła do Twojego konta. Kliknij poniższy przycisk, aby zresetować swoje hasło.</p>
-        
+
         <table style="margin: 24px auto;"><tr><td style="text-align: center;">
             <b><a class="button" href="{{ $url }}">Zresetuj hasło</a></b>
         </td></tr></table>
 
-        <p style="margin-top: 16px; ">Pozdrawiamy,<br><span style="color: #262C89;">{{ config('app.name') }}</span></p>
+        <p style="margin-top: 16px; ">Pozdrawiamy,<br><span style="color: #E4007D;">{{ config('app.name') }}</span></p>
 
         <hr style="border: 1px solid #e8ebf1">
-        
+
         <table><tr><td style="padding-top: 32px; text-align: center;">
             © 2024 {{ config('app.name') }}. Wszelkie prawa zastrzeżone.
         </td></tr></table>
diff --git a/resources/views/emails/auth/verify.blade.php b/resources/views/emails/auth/verify.blade.php
index 9fd5011a..f3e8dd70 100644
--- a/resources/views/emails/auth/verify.blade.php
+++ b/resources/views/emails/auth/verify.blade.php
@@ -5,7 +5,7 @@
     a { text-decoration: none; }
     p { margin: 48px 0; line-height: 24px; }
     table { width: 100%; border-spacing: 0; }
-    .button { background-color: #262C89; color: white; padding: 16px 80px; border-radius: 12px; }
+    .button { background-color: #E4007D; color: white; padding: 16px 80px; border-radius: 12px; }
 </style>
 
 <div style="font-family: sans-serif; color: #3D4852; padding: 0 48px;">
@@ -14,20 +14,20 @@
     </div>
 
     <div>
-        <h2>Cześć, {{ $user->name }}!</h2>
+        <h2>Cześć, {{ $user->firstname }}!</h2>
 
         <p>Otrzymaliśmy prośbę o wysłanie linku aktywacyjnego do Twojego konta. Kliknij poniższy przycisk, aby zweryfikować swój adres e-mail.</p>
-        
+
         <table style="margin: 24px auto;"><tr><td style="text-align: center;">
             <b><a class="button" href="{{ $url }}">Zweryfikuj e-mail</a></b>
         </td></tr></table>
 
         <p>Jeśli prośba nie została zainicjonowana przez Ciebie, możesz zignorować tę wiadomość.</p>
 
-        <p style="margin-top: 16px; ">Pozdrawiamy,<br><span style="color: #262C89;">{{ config('app.name') }}</span></p>
+        <p style="margin-top: 16px; ">Pozdrawiamy,<br><span style="color: #E4007D;">{{ config('app.name') }}</span></p>
 
         <hr style="border: 1px solid #e8ebf1">
-        
+
         <table><tr><td style="padding-top: 32px; text-align: center;">
             © 2024 {{ config('app.name') }}. Wszelkie prawa zastrzeżone.
         </td></tr></table>
diff --git a/resources/views/errors/403.blade.php b/resources/views/errors/403.blade.php
new file mode 100644
index 00000000..e75ffabd
--- /dev/null
+++ b/resources/views/errors/403.blade.php
@@ -0,0 +1 @@
+@extends('errors.404')
diff --git a/resources/views/errors/404.blade.php b/resources/views/errors/404.blade.php
new file mode 100644
index 00000000..4eedb600
--- /dev/null
+++ b/resources/views/errors/404.blade.php
@@ -0,0 +1,8 @@
+@extends('errors.minimal')
+
+@php
+  $code = '404';
+  $message = 'Strona nie istnieje';
+  $description = 'Przepraszamy, nie mogliśmy znaleźć strony, której szukasz.';
+  $link = ['url' => '/', 'text' => 'Wróć na stronę główną'];
+@endphp
diff --git a/resources/views/errors/500.blade.php b/resources/views/errors/500.blade.php
new file mode 100644
index 00000000..58e8807d
--- /dev/null
+++ b/resources/views/errors/500.blade.php
@@ -0,0 +1,7 @@
+@extends('errors.minimal')
+
+@php
+  $code = '500';
+  $message = 'Wystąpił błąd serwera';
+  $description = 'Wystąpił nieoczekiwany problem po stronie serwera, który uniemożliwił przetworzenie Twojego żądania. Prosimy spróbować ponownie później.';
+@endphp
diff --git a/resources/views/errors/minimal.blade.php b/resources/views/errors/minimal.blade.php
new file mode 100644
index 00000000..b5392f29
--- /dev/null
+++ b/resources/views/errors/minimal.blade.php
@@ -0,0 +1,52 @@
+@php
+  $code = $code ?? 'Błąd';
+  $message = $message ?? 'Błąd';
+  $description = $description ?? 'Wystąpił nieoczekiwany błąd. Prosimy spróbować ponownie później.';
+@endphp
+
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>{{ $code }} - {{ $message }}</title>
+  <style>
+    @import url('https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900&display=swap');
+
+    * { margin: 0; padding: 0; }
+    html, body { height: 100%; }
+    body { display: flex; justify-content: center; align-items: center; font-family: 'Poppins', sans-serif; color: #333; position: relative;  max-width: 48rem; margin:auto }
+    h1 { font-size: 3rem; margin-bottom: 1rem; color: #E4007D; }
+    p { font-size: 1rem; margin-bottom: 2rem }
+    b { font-size: 1.2rem; margin-bottom: 2rem; font-weight: bold }
+    a { text-decoration: none; background-color: #E4007D; color: white; font-size: rem; font-weight: 600; padding: .6rem 1rem; border-radius: .8rem; }
+    .container { display: flex; flex-direction: column; align-items: center; text-align: center }
+    .bg-overlay { position: fixed; top: 0; left: 0; right: 0; bottom: 0; background-color: rgba(255, 255, 255, 0.6); z-index: -10 }
+    .blur-background { position: fixed; width: 58.33%; height: 100%; opacity: 0.7; filter: blur(48px); z-index: -10 }
+    .gradient-bg {
+      width: 100%;
+      height: 100%;
+      background: linear-gradient(to right, #ff80b5, #3b82f6);
+      opacity: 0.3;
+      clip-path: polygon(
+        75% 42%, 98% 74%, 100% 35%, 93% 0%, 86% 0%, 75% 27%, 59% 55%, 50% 57%, 47% 44%, 
+        48% 17%, 25% 54%, 0% 28%, 12% 75%, 25% 54%, 67% 100%, 75% 42%
+      );
+    }
+  </style>
+</head>
+<body>
+  <div class="bg-overlay"></div>
+  <div class="blur-background" style="margin-top: 2rem;">
+    <div class="gradient-bg"></div>
+  </div>
+  <div class="container">
+    <b>{{ $code }}</b>
+    <h1>{{ $message }}</h1>
+    <p>{{ $description }}</p>
+    @isset($link)
+      <a href="{{ $link['url'] }}">{{ $link['text'] }}</a>
+    @endisset
+  </div>
+</body>
+</html>
diff --git a/routes/web.php b/routes/web.php
index aef2feac..619cf0b8 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -3,7 +3,6 @@
 declare(strict_types=1);
 
 use App\Http\Controllers\AdminController;
-use App\Http\Controllers\AnswerRecordController;
 use App\Http\Controllers\AuthenticateSessionController;
 use App\Http\Controllers\ContestController;
 use App\Http\Controllers\EmailVerifyController;
@@ -12,11 +11,12 @@
 use App\Http\Controllers\QuestionAnswerController;
 use App\Http\Controllers\QuizController;
 use App\Http\Controllers\QuizQuestionController;
-use App\Http\Controllers\QuizSubmissionController;
 use App\Http\Controllers\RankingController;
 use App\Http\Controllers\RegisterUserController;
 use App\Http\Controllers\SchoolsController;
 use App\Http\Controllers\UserController;
+use App\Http\Controllers\UserQuestionController;
+use App\Http\Controllers\UserQuizController;
 use App\Http\Middleware\EnsureQuizIsNotAlreadyStarted;
 use App\Models\Answer;
 use App\Models\Question;
@@ -41,6 +41,7 @@
 
 Route::group(["prefix" => "admin", "middleware" => ["auth", "role:admin|super_admin"]], function (): void {
     Route::get("/quizzes", [QuizController::class, "index"])->name("admin.quizzes.index");
+    Route::get("/quizzes/{quiz}", [QuizController::class, "show"])->name("admin.quizzes.demo");
     Route::post("/quizzes", [QuizController::class, "store"])->name("admin.quizzes.store");
     Route::patch("/quizzes/{quiz}", [QuizController::class, "update"])->can("update,quiz")->name("admin.quizzes.update");
     Route::delete("/quizzes/{quiz}", [QuizController::class, "destroy"])->can("delete,quiz")->name("admin.quizzes.destroy");
@@ -89,12 +90,12 @@
 
 Route::middleware(["auth", "verified"])->group(function (): void {
     Route::post("/quizzes/{quiz}/assign", [QuizController::class, "assign"])->can("assign,quiz")->name("quizzes.assign");
-    Route::post("/quizzes/{quiz}/start", [QuizController::class, "createSubmission"])->middleware(EnsureQuizIsNotAlreadyStarted::class)->can("submit,quiz")->name("quizzes.start");
+    Route::post("/quizzes/{quiz}/start", [QuizController::class, "createUserQuiz"])->middleware(EnsureQuizIsNotAlreadyStarted::class)->can("submit,quiz")->name("quizzes.start");
     Route::get("/quizzes/{quiz}/ranking", [RankingController::class, "indexUser"])->can("viewUserRanking,quiz")->name("quizzes.ranking");
-    Route::get("/submissions/{quizSubmission}/", [QuizSubmissionController::class, "show"])->can("view,quizSubmission")->name("submissions.show");
-    Route::post("/submissions/{quizSubmission}/close", [QuizSubmissionController::class, "close"])->can("close,quizSubmission")->name("submissions.close");
-    Route::get("/submissions/{quizSubmission}/result", [QuizSubmissionController::class, "result"])->can("result,quizSubmission")->name("submissions.result");
-    Route::patch("/answers/{answerRecord}/{answer}", [AnswerRecordController::class, "answer"])->can("answer,answerRecord,answer")->name("answers.answer");
+    Route::get("/quizzes/{userQuiz}/", [UserQuizController::class, "show"])->can("view,userQuiz")->name("userQuizzes.show");
+    Route::post("/quizzes/{userQuiz}/close", [UserQuizController::class, "close"])->can("close,userQuiz")->name("userQuizzes.close");
+    Route::get("/quizzes/{userQuiz}/result", [UserQuizController::class, "result"])->can("result,userQuiz")->name("userQuizzes.result");
+    Route::patch("/questions/{userQuestion}/{answer}", [UserQuestionController::class, "answer"])->can("answer,userQuestion,answer")->name("questions.answer");
     Route::get("/dashboard", [ContestController::class, "create"])->name("dashboard");
     Route::get("/profile", [ProfileUserController::class, "create"])->name("profile");
     Route::patch("/profile/password", [ProfileUserController::class, "update"])->name("profile.password.update");
diff --git a/tailwind.config.js b/tailwind.config.js
index 9650311f..05a7e2da 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -49,91 +49,40 @@ module.exports = {
             },
             colors: {
                 'primary': {
-                    'DEFAULT': '#262c89',
-                    '50': '#ecf3ff',
-                    '100': '#dde8ff',
-                    '200': '#c2d5ff',
-                    '300': '#9db9ff',
-                    '400': '#7691ff',
-                    '500': '#556aff',
-                    '600': '#373ff4',
-                    '700': '#2a2fd8',
-                    '800': '#252bae',
-                    '900': '#262c89',
-                    '950': '#141647',
-                },
-                'secondary': {
-                    'DEFAULT': '#c9cefc',
-                    '50': '#eff0fe',
-                    '100': '#e1e5fe',
-                    '200': '#c9cefc',
-                    '300': '#a8aef9',
-                    '400': '#8585f4',
-                    '500': '#7268ec',
-                    '600': '#634cdf',
-                    '700': '#563dc5',
-                    '800': '#46349f',
-                    '900': '#363765',
-                    '950': '#241d49',
-                },
-                'accent': {
-                    'DEFAULT': '#6566C2',
-                    '50': '#f2f5fb',
-                    '100': '#e7ecf8',
-                    '200': '#d3dbf2',
-                    '300': '#b8c3e9',
-                    '400': '#9aa6df',
-                    '500': '#8189d3',
-                    '600': '#6566c2',
-                    '700': '#5757ab',
-                    '800': '#48488b',
-                    '900': '#40426f',
-                    '950': '#252541',
-                },
-                'rose': {
-                    'DEFAULT': '#f70279',
-                    '50': '#fff0f9',
-                    '100': '#ffe3f5',
-                    '200': '#ffc7eb',
-                    '300': '#ff99d9',
-                    '400': '#ff59be',
-                    '500': '#ff29a2',
-                    '600': '#f70279',
-                    '700': '#dd0061',
-                    '800': '#b60050',
-                    '900': '#970445',
-                    '950': '#5e0025',
+                    'DEFAULT': 'rgb(var(--color-primary))',
+                    'bright': 'rgb(var(--color-primary-bright))',
+                    'dark': 'rgb(var(--color-primary-dark))',
                 },
                 'red': {
                     'DEFAULT': '#ff0000',
-                    '50': '#fff0f0',
-                    '100': '#ffdddd',
-                    '200': '#ffc0c0',
-                    '300': '#ff9494',
-                    '400': '#ff5757',
                     '500': '#ff2323',
-                    '600': '#ff0000',
-                    '700': '#d70000',
-                    '800': '#b10303',
-                    '900': '#920a0a',
-                    '950': '#500000',
                 },
-                "gradient":{"start":"#9198e5", "end":"#1f0843"},
+                "gradient": {
+                    "start":"#9198e5",
+                    "end":"#1f0843"
+                },
             }
         },
     },
     plugins: [
-        plugin(function ({ addComponents, addVariant }) {
+        plugin(function ({ addComponents, addVariant, addBase }) {
             addVariant('hover-focus', ['&:hover', '&:focus']);
+            addBase({
+              ':root': {
+                '--color-primary': '228 0 125',
+                '--color-primary-bright': '245 13 147',
+                '--color-primary-dark': '176 4 96',
+              },
+            });
             addComponents({
                 '.icon': {
-                  '@apply size-6 stroke-2 text-primary hover:text-primary-800 transition-colors duration-200':{},
+                  '@apply size-6 stroke-2 text-primary hover:text-primary-bright transition-colors duration-200':{},
                 },
                 '.slide-up-animation' : {
                     '@apply hover:-translate-y-1 h-full transition-transform ease-in duration-150':{},
                 },
                 '.icon-button': {
-                  '@apply flex gap-2 w-fit font-bold text-primary hover:text-primary-800 text-percentage-105':{},
+                  '@apply flex gap-2 w-fit font-bold text-primary hover:text-primary-bright text-percentage-105':{},
                 }
             })
         }),
diff --git a/tests/Feature/AdminTest.php b/tests/Feature/AdminTest.php
index efd6f632..3db08b97 100644
--- a/tests/Feature/AdminTest.php
+++ b/tests/Feature/AdminTest.php
@@ -77,7 +77,7 @@ public function testSuperAdminCanAddAdmin(): void
         $school = School::factory()->create();
         $this->actingAs($this->superAdmin)
             ->post("/admin/admins", [
-                "name" => "Admin Name",
+                "firstname" => "Admin Name",
                 "surname" => "Admin Surname",
                 "email" => "adminexample@admin.com",
                 "password" => "password",
@@ -86,7 +86,7 @@ public function testSuperAdminCanAddAdmin(): void
             ->assertRedirect("/admin/admins");
 
         $this->assertDatabaseHas("users", [
-            "name" => "Admin Name",
+            "firstname" => "Admin Name",
             "surname" => "Admin Surname",
             "email" => "adminexample@admin.com",
         ]);
@@ -97,7 +97,7 @@ public function testAdminCannotAddAdmin(): void
         $school = School::factory()->create();
         $this->actingAs($this->admin)
             ->post("/admin/admins", [
-                "name" => "Admin Name",
+                "firstname" => "Admin Name",
                 "surname" => "Admin Surname",
                 "email" => "adminexample@admin.com",
                 "password" => "password",
@@ -106,7 +106,7 @@ public function testAdminCannotAddAdmin(): void
             ->assertForbidden();
 
         $this->assertDatabaseMissing("users", [
-            "name" => "Admin Name",
+            "firstname" => "Admin Name",
             "surname" => "Admin Surname",
             "email" => "adminexample@admin.com",
         ]);
@@ -144,7 +144,7 @@ public function testSuperAdminCanEditAdmin(): void
         $this->actingAs($this->superAdmin)
             ->from("/admin/admins/{$admin->id}/edit")
             ->patch("/admin/admins/{$admin->id}", [
-                "name" => "New Name",
+                "firstname" => "New Name",
                 "surname" => "New Surname",
                 "email" => "new@email.com",
                 "school_id" => $admin->school_id,
@@ -153,7 +153,7 @@ public function testSuperAdminCanEditAdmin(): void
 
         $this->assertDatabaseHas("users", [
             "id" => $admin->id,
-            "name" => "New Name",
+            "firstname" => "New Name",
             "surname" => "New Surname",
             "email" => "new@email.com",
             "school_id" => $admin->school_id,
@@ -168,7 +168,7 @@ public function testAdminCannotEditAdmin(): void
         $this->actingAs($this->admin)
             ->from("/admin/admins/{$admin->id}/edit")
             ->patch("/admin/admins/{$admin->id}", [
-                "name" => "New Name",
+                "firstname" => "New Name",
                 "surname" => "New Surname",
                 "email" => "new@email.com",
                 "school_id" => $admin->school_id,
@@ -176,7 +176,7 @@ public function testAdminCannotEditAdmin(): void
             ->assertForbidden();
 
         $this->assertDatabaseMissing("users", [
-            "name" => "New Name",
+            "firstname" => "New Name",
         ]);
     }
 
@@ -188,7 +188,7 @@ public function testSuperAdminCannotEditAdminWithInvalidData(): void
         $response = $this->actingAs($this->superAdmin)
             ->from("/admin/admins/{$admin->id}/edit")
             ->patch("/admin/admins/{$admin->id}", [
-                "name" => "",
+                "firstname" => "",
                 "surname" => "",
                 "email" => "invalidMail",
                 "school_id" => 999,
@@ -198,14 +198,14 @@ public function testSuperAdminCannotEditAdminWithInvalidData(): void
 
         $this->assertDatabaseHas("users", [
             "id" => $admin->id,
-            "name" => $admin->name,
+            "firstname" => $admin->firstname,
             "surname" => $admin->surname,
             "email" => $admin->email,
             "school_id" => $admin->school_id,
         ]);
 
         $response->assertSessionHasErrors([
-            "name",
+            "firstname",
             "surname",
             "email",
             "school_id",
diff --git a/tests/Feature/AuthenticateSessionTest.php b/tests/Feature/AuthenticateSessionTest.php
index e4078dd9..d61b9b4f 100644
--- a/tests/Feature/AuthenticateSessionTest.php
+++ b/tests/Feature/AuthenticateSessionTest.php
@@ -20,7 +20,7 @@ public function testUserCanLogin(): void
             "email" => "test@example.com",
             "password" => "goodPassword",
         ])
-            ->assertRedirect("/dashboard");
+            ->assertRedirect("/");
     }
 
     public function testUserCanNotLoginWithWrongPassword(): void
@@ -66,7 +66,7 @@ public function testUnverifiedUserCanLogin(): void
             "email" => "test@example.com",
             "password" => "goodPassword",
         ])
-            ->assertRedirect("/dashboard");
+            ->assertRedirect("/");
     }
 
     public function testUnverifiedUserIsRedirectedToVerifyEmail(): void
diff --git a/tests/Feature/TestGetSchoolDataService.php b/tests/Feature/GetSchoolDataServiceTest.php
similarity index 92%
rename from tests/Feature/TestGetSchoolDataService.php
rename to tests/Feature/GetSchoolDataServiceTest.php
index 1949ed05..87b7ea0c 100644
--- a/tests/Feature/TestGetSchoolDataService.php
+++ b/tests/Feature/GetSchoolDataServiceTest.php
@@ -15,7 +15,7 @@
 use Saloon\Http\Faking\MockResponse;
 use Tests\TestCase;
 
-class TestGetSchoolDataService extends TestCase
+class GetSchoolDataServiceTest extends TestCase
 {
     use RefreshDatabase;
 
@@ -118,9 +118,11 @@ public function testFetchSchoolsWithAlreadyFetchedData(): void
         ]);
 
         $this->connector->withMockClient($mockClient);
-        $this->service->getSchools(Voivodeship::LOWER_SILESIA, [SchoolType::TECHNIKUM]);
-        $this->service->getSchools(Voivodeship::LOWER_SILESIA, [SchoolType::TECHNIKUM]);
+        $result1 = $this->service->getSchools(Voivodeship::LOWER_SILESIA, [SchoolType::TECHNIKUM]);
+        $result2 = $this->service->getSchools(Voivodeship::LOWER_SILESIA, [SchoolType::TECHNIKUM]);
 
         $this->assertDatabaseCount("schools", 2);
+        $this->assertSame($result1, 2);
+        $this->assertSame($result2, 0);
     }
 }
diff --git a/tests/Feature/QuizSubmissionTest.php b/tests/Feature/QuizSubmissionTest.php
deleted file mode 100644
index 8b114522..00000000
--- a/tests/Feature/QuizSubmissionTest.php
+++ /dev/null
@@ -1,153 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Tests\Feature;
-
-use App\Models\Answer;
-use App\Models\Question;
-use App\Models\Quiz;
-use App\Models\QuizSubmission;
-use App\Models\User;
-use Carbon\Carbon;
-use Illuminate\Foundation\Testing\RefreshDatabase;
-use Inertia\Testing\AssertableInertia as Assert;
-use Tests\TestCase;
-
-class QuizSubmissionTest extends TestCase
-{
-    use RefreshDatabase;
-
-    protected User $user;
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        $this->user = User::factory()->create();
-    }
-
-    public function testUserCanViewSingleSubmission(): void
-    {
-        $quiz = Quiz::factory()->create();
-        $questions = Question::factory()->count(2)->create(["quiz_id" => $quiz->id]);
-
-        foreach ($questions as $question) {
-            $answers = Answer::factory()->count(4)->create(["question_id" => $question->id]);
-            $question->correctAnswer()->associate($answers[2]);
-            $question->save();
-        }
-
-        $submission = $quiz->createSubmission($this->user);
-
-        $this->assertDatabaseCount("quizzes", 1);
-        $this->assertDatabaseCount("questions", 2);
-        $this->assertDatabaseCount("answers", 8);
-        $this->assertDatabaseCount("quiz_submissions", 1);
-        $this->assertDatabaseCount("answer_records", 2);
-
-        $this->actingAs($this->user)
-            ->get("/submissions/{$submission->id}")
-            ->assertInertia(
-                fn(Assert $page) => $page
-                    ->component("User/Quiz")
-                    ->where("submission.name", $quiz->title)
-                    ->count("submission.answers", 2)
-                    ->count("submission.answers.0.answers", 4)
-                    ->missing("submission.answers.0.answers.2.correct")
-                    ->count("submission.answers.1.answers", 4)
-                    ->missing("submission.answers.1.answers.2.correct"),
-            );
-    }
-
-    public function testUserCannotViewSubmissionThatIsNotHis(): void
-    {
-        $submission = QuizSubmission::factory()->create();
-
-        $this->actingAs($this->user)
-            ->get("/submissions/{$submission->id}")
-            ->assertStatus(403);
-    }
-
-    public function testUserCanSeeSubmissionResult(): void
-    {
-        $quiz = Quiz::factory()->create();
-        $quiz->ranking_published_at = Carbon::now();
-        $quiz->save();
-
-        Question::factory()->count(2)->create(["quiz_id" => $quiz->id]);
-        $submission = $quiz->createSubmission($this->user);
-        $submission->closed_at = Carbon::now();
-        $submission->save();
-
-        $this->actingAs($this->user)
-            ->get("/submissions/{$submission->id}/result")
-            ->assertInertia(
-                fn(Assert $page) => $page
-                    ->component("User/QuizResult")
-                    ->where("submission.name", $quiz->title)
-                    ->count("submission.answers", 2)
-                    ->where("hasRanking", true),
-            );
-    }
-
-    public function testUserCannotSeeSubmissionResultThatNotExisted(): void
-    {
-        $this->actingAs($this->user)
-            ->get("/submissions/0/result")
-            ->assertStatus(404);
-    }
-
-    public function testUserCannotSeeSubmissionResultThatIsNotHis(): void
-    {
-        $submission = QuizSubmission::factory()->closed()->create();
-
-        $this->actingAs($this->user)
-            ->get("/submissions/{$submission->id}/result")
-            ->assertStatus(403);
-    }
-
-    public function testUserCannotSeeSubmissionResultThatIsNotClosed(): void
-    {
-        $submission = QuizSubmission::factory()->create(["user_id" => $this->user->id]);
-
-        $this->actingAs($this->user)
-            ->get("/submissions/{$submission->id}/result")
-            ->assertStatus(403);
-    }
-
-    public function testUserCanCloseSubmission(): void
-    {
-        $submission = QuizSubmission::factory()->create(["user_id" => $this->user->id]);
-
-        $this->actingAs($this->user)
-            ->post("/submissions/{$submission->id}/close")
-            ->assertRedirect("/submissions/{$submission->id}/result")
-            ->assertSessionHas(["status" => "Test został oddany."]);
-    }
-
-    public function testUserCannotCloseSubmissionThatNotExisted(): void
-    {
-        $this->actingAs($this->user)
-            ->post("/submissions/0/close")
-            ->assertStatus(404);
-    }
-
-    public function testUserCannotCloseSubmissionThatIsNotHis(): void
-    {
-        $submission = QuizSubmission::factory()->create();
-
-        $this->actingAs($this->user)
-            ->post("/submissions/{$submission->id}/close")
-            ->assertStatus(403);
-    }
-
-    public function testUserCannotCloseClosedSubmission(): void
-    {
-        $submission = QuizSubmission::factory()->closed()->create(["user_id" => $this->user->id]);
-
-        $this->actingAs($this->user)
-            ->post("/submissions/{$submission->id}/close")
-            ->assertStatus(403);
-    }
-}
diff --git a/tests/Feature/QuizTest.php b/tests/Feature/QuizTest.php
index 82699e86..7462051e 100644
--- a/tests/Feature/QuizTest.php
+++ b/tests/Feature/QuizTest.php
@@ -7,8 +7,8 @@
 use App\Models\Answer;
 use App\Models\Question;
 use App\Models\Quiz;
-use App\Models\QuizSubmission;
 use App\Models\User;
+use App\Models\UserQuiz;
 use Carbon\Carbon;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Inertia\Testing\AssertableInertia as Assert;
@@ -50,9 +50,9 @@ public function testAdminCanViewQuizzes(): void
             ->assertInertia(
                 fn(Assert $page) => $page
                     ->component("Admin/Quizzes")
-                    ->has("quizzes", 2)
-                    ->has("quizzes.0.questions", 5)
-                    ->has("quizzes.1.questions", 5),
+                    ->has("quizzes.data", 2)
+                    ->has("quizzes.data.0.questions", 5)
+                    ->has("quizzes.data.1.questions", 5),
             );
     }
 
@@ -479,24 +479,24 @@ public function testUserCanStartQuiz(): void
             ->from("/")
             ->post("/quizzes/{$quiz->id}/start");
 
-        $submission = QuizSubmission::query()->where([
+        $userQuiz = UserQuiz::query()->where([
             "user_id" => $this->user->id,
             "quiz_id" => $quiz->id,
         ])->firstOrFail();
 
-        $response->assertRedirect("/submissions/$submission->id/");
+        $response->assertRedirect("/quizzes/$userQuiz->id/");
     }
 
     public function testUserCannotStartAlreadyStartedQuiz(): void
     {
-        $submission = QuizSubmission::factory()->create(["user_id" => $this->user->id]);
+        $userQuiz = UserQuiz::factory()->create(["user_id" => $this->user->id]);
 
         $this->actingAs($this->user)
             ->from("/")
-            ->post("/quizzes/{$submission->quiz->id}/start")
-            ->assertRedirect("/submissions/{$submission->id}/");
+            ->post("/quizzes/{$userQuiz->quiz->id}/start")
+            ->assertRedirect("/quizzes/{$userQuiz->id}/");
 
-        $this->assertDatabaseCount("quiz_submissions", 1);
+        $this->assertDatabaseCount("user_quizzes", 1);
     }
 
     public function testUserCannotStartUnlockedQuiz(): void
@@ -508,7 +508,7 @@ public function testUserCannotStartUnlockedQuiz(): void
             ->post("/quizzes/{$quiz->id}/start")
             ->assertStatus(403);
 
-        $this->assertDatabaseCount("quiz_submissions", 0);
+        $this->assertDatabaseCount("user_quizzes", 0);
     }
 
     public function testUserCannotAccessToCrud(): void
@@ -581,7 +581,7 @@ public function testUserCannotAssignThemselvesToQuizWithPastScheduledTime(): voi
 
     public function testUserCannotAssignThemselvesToStartedQuiz(): void
     {
-        $quiz = QuizSubmission::factory()->create(["user_id" => $this->user->id])->quiz;
+        $quiz = UserQuiz::factory()->create(["user_id" => $this->user->id])->quiz;
 
         $this->actingAs($this->user)
             ->from("/")
diff --git a/tests/Feature/RankingTest.php b/tests/Feature/RankingTest.php
index cb73899c..92e19795 100644
--- a/tests/Feature/RankingTest.php
+++ b/tests/Feature/RankingTest.php
@@ -5,8 +5,8 @@
 namespace Tests\Feature;
 
 use App\Models\Quiz;
-use App\Models\QuizSubmission;
 use App\Models\User;
+use App\Models\UserQuiz;
 use Database\Seeders\UserQuizSeeder;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Inertia\Testing\AssertableInertia as Assert;
@@ -33,39 +33,39 @@ protected function setUp(): void
         $this->admin = User::factory()->admin()->create();
 
         $this->quiz = $this->seeder->quiz;
-        $this->seeder->createSubmissionForUser($this->user, 2);
+        $this->seeder->createUserQuizForUser($this->user, 2);
 
         $this->unlockedQuiz = Quiz::factory()->create();
     }
 
     public function testUserHasPointsInAnsweredQuiz(): void
     {
-        $quizSubmission = QuizSubmission::where("user_id", $this->user->id)->first();
+        $userQuiz = UserQuiz::where("user_id", $this->user->id)->first();
 
-        $quizSubmission->refresh();
+        $userQuiz->refresh();
 
-        $this->assertGreaterThanOrEqual(0, $quizSubmission->points);
-        $this->assertLessThanOrEqual($quizSubmission->maxPoints, $quizSubmission->points);
+        $this->assertGreaterThanOrEqual(0, $userQuiz->points);
+        $this->assertLessThanOrEqual($userQuiz->maxPoints, $userQuiz->points);
     }
 
     public function testUserPointsAreCalculatedCorrectly(): void
     {
         $user2 = User::factory()->create();
-        $this->seeder->createSubmissionForUser($user2, 3);
+        $this->seeder->createUserQuizForUser($user2, 3);
 
-        $quizSubmission1 = QuizSubmission::where("user_id", $this->user->id)
+        $userQuiz1 = UserQuiz::where("user_id", $this->user->id)
             ->where("quiz_id", $this->quiz->id)
             ->first();
 
-        $quizSubmission2 = QuizSubmission::where("user_id", $user2->id)
+        $userQuiz2 = UserQuiz::where("user_id", $user2->id)
             ->where("quiz_id", $this->quiz->id)
             ->first();
 
-        $quizSubmission1->refresh();
-        $quizSubmission2->refresh();
+        $userQuiz1->refresh();
+        $userQuiz2->refresh();
 
-        $userScore = $quizSubmission1->points;
-        $user2Score = $quizSubmission2->points;
+        $userScore = $userQuiz1->points;
+        $user2Score = $userQuiz2->points;
 
         $this->assertEquals(2, $userScore);
         $this->assertEquals(3, $user2Score);
@@ -174,12 +174,12 @@ public function testUserCannotViewUnpublishedQuizRankingHeParticipated(): void
 
     public function testUserCannotViewPublishedQuizRankingHeDidNotParticipated(): void
     {
-        $userWithoutSubmissions = User::factory()->create();
+        $userWithoutUserQuizzes = User::factory()->create();
 
         $this->quiz->ranking_published_at = now();
         $this->quiz->save();
 
-        $this->actingAs($userWithoutSubmissions)
+        $this->actingAs($userWithoutUserQuizzes)
             ->get("/quizzes/{$this->quiz->id}/ranking")
             ->assertForbidden();
     }
diff --git a/tests/Feature/RegisterUserTest.php b/tests/Feature/RegisterUserTest.php
index 96857346..789b1346 100644
--- a/tests/Feature/RegisterUserTest.php
+++ b/tests/Feature/RegisterUserTest.php
@@ -19,7 +19,7 @@ public function testUserCanRegister(): void
         $school = School::factory()->create();
 
         $this->post("/auth/register", [
-            "name" => "Test",
+            "firstname" => "Test",
             "surname" => "Test",
             "email" => "test@gmail.com",
             "password" => "123456890",
@@ -28,7 +28,7 @@ public function testUserCanRegister(): void
             ->assertRedirect("/email/verify");
 
         $this->assertDatabaseHas("users", [
-            "name" => "Test",
+            "firstname" => "Test",
             "surname" => "Test",
             "email" => "test@gmail.com",
             "school_id" => $school->id,
@@ -47,7 +47,7 @@ public function testUserIsRedirectedToEmailVerifyIfEmailIsAlreadyTakenViaRegiste
         ]);
 
         $this->post("/auth/register", [
-            "name" => "Test",
+            "firstname" => "Test",
             "surname" => "Test",
             "email" => "test@gmail.com",
             "password" => "123456890",
@@ -63,7 +63,7 @@ public function testUserCanNotRegisterWithWrongSchoolIndex(): void
         $school = School::factory()->create();
 
         $this->post("/auth/register", [
-            "name" => "Test",
+            "firstname" => "Test",
             "surname" => "Test",
             "email" => "test@gmail.com",
             "password" => "123456890",
@@ -79,7 +79,7 @@ public function testUserCanNotRegisterWithTooLongEmail(): void
         $school = School::factory()->create();
 
         $this->post("/auth/register", [
-            "name" => "Test",
+            "firstname" => "Test",
             "surname" => "Test",
             "email" => $longMail . "@gmail.com",
             "password" => "123456890",
@@ -94,7 +94,7 @@ public function testUserCanNotRegisterWithWrongEmailDomain(): void
         $school = School::factory()->create();
 
         $this->post("/auth/register", [
-            "name" => "Test",
+            "firstname" => "Test",
             "surname" => "Test",
             "email" => "test@gmail.pl",
             "password" => "123456890",
@@ -110,14 +110,14 @@ public function testUserCanNotRegisterWithTooLongName(): void
         $school = School::factory()->create();
 
         $this->post("/auth/register", [
-            "name" => $longName,
+            "firstname" => $longName,
             "surname" => "Test",
             "email" => "test@gmail.com",
             "password" => "123456890",
             "school_id" => $school->id,
         ])
             ->assertRedirect("/")
-            ->assertSessionHasErrors(["name" => "Pole imię nie może być dłuższe niż 255 znaków."]);
+            ->assertSessionHasErrors(["firstname" => "Pole imię nie może być dłuższe niż 255 znaków."]);
     }
 
     public function testUserCanNotRegisterWithTooLongSurname(): void
@@ -126,7 +126,7 @@ public function testUserCanNotRegisterWithTooLongSurname(): void
         $school = School::factory()->create();
 
         $this->post("/auth/register", [
-            "name" => "Test",
+            "firstname" => "Test",
             "surname" => $longSurname,
             "email" => "test@gmail.com",
             "password" => "123456890",
@@ -141,7 +141,7 @@ public function testUserCanNotRegisterWithTooShortPassword(): void
         $school = School::factory()->create();
 
         $this->post("/auth/register", [
-            "name" => "Test",
+            "firstname" => "Test",
             "surname" => "Test",
             "email" => "test@gmail.com",
             "password" => "123",
diff --git a/tests/Feature/ResetPasswordTest.php b/tests/Feature/ResetPasswordTest.php
index a413e7a7..3450f9d2 100644
--- a/tests/Feature/ResetPasswordTest.php
+++ b/tests/Feature/ResetPasswordTest.php
@@ -45,7 +45,7 @@ public function testUserCanResetPasswordWithValidToken(): void
             "password" => "newPassword",
         ]);
 
-        $loginResponse->assertRedirect("/dashboard");
+        $loginResponse->assertRedirect("/");
         $this->assertAuthenticated();
         Event::assertDispatched(PasswordReset::class);
     }
diff --git a/tests/Feature/SchoolTest.php b/tests/Feature/SchoolTest.php
index d619ab03..7aba0345 100644
--- a/tests/Feature/SchoolTest.php
+++ b/tests/Feature/SchoolTest.php
@@ -43,7 +43,7 @@ public function testAdminCanCreateSchool(): void
         $data = [
             "name" => "test",
             "city" => "Moria",
-            "regon" => "356855674",
+            "regon" => "743428671",
             "street" => "example",
             "building_number" => "3",
             "zip_code" => "00-120",
@@ -74,7 +74,7 @@ public function testAdminCanEditSchool(): void
             ->patch("/admin/schools/{$school->id}", [
                 "name" => "test",
                 "city" => "Moria",
-                "regon" => "356855674",
+                "regon" => "743428671",
                 "street" => "example",
                 "building_number" => "3",
                 "apartment_number" => "2A",
@@ -86,7 +86,7 @@ public function testAdminCanEditSchool(): void
             "id" => $school->id,
             "name" => "test",
             "city" => "Moria",
-            "regon" => "356855674",
+            "regon" => "743428671",
             "street" => "example",
             "building_number" => "3",
             "apartment_number" => "2A",
@@ -174,6 +174,7 @@ public function testAdminCanCheckFetchingProgress(): void
             ->get("/admin/schools/status")
             ->assertJson([
                 "done" => true,
+                "count" => 0,
             ]);
 
         $this->actingAs($this->admin)
@@ -188,6 +189,7 @@ public function testAdminCanCheckFetchingProgress(): void
             ->get("/admin/schools/status")
             ->assertJson([
                 "done" => false,
+                "count" => 0,
             ]);
     }
 }
diff --git a/tests/Feature/AnswerRecordTest.php b/tests/Feature/UserQuestionTest.php
similarity index 56%
rename from tests/Feature/AnswerRecordTest.php
rename to tests/Feature/UserQuestionTest.php
index 28204211..f3b51f53 100644
--- a/tests/Feature/AnswerRecordTest.php
+++ b/tests/Feature/UserQuestionTest.php
@@ -6,11 +6,12 @@
 
 use App\Models\Answer;
 use App\Models\User;
+use App\Models\UserQuiz;
 use Carbon\Carbon;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Tests\TestCase;
 
-class AnswerRecordTest extends TestCase
+class UserQuestionTest extends TestCase
 {
     use RefreshDatabase;
 
@@ -19,23 +20,23 @@ class AnswerRecordTest extends TestCase
     protected function setUp(): void
     {
         parent::setUp();
-
+        UserQuiz::truncate();
         $this->user = User::factory()->create();
     }
 
     public function testUserCanAnswerQuestion(): void
     {
         $answer = Answer::factory()->locked()->create();
-        $submission = $answer->question->quiz->createSubmission($this->user);
-        $record = $submission->answerRecords[0];
+        $userQuiz = $answer->question->quiz->createUserQuiz($this->user);
+        $userQuestion = $userQuiz->userQuestions[0];
 
         $this->actingAs($this->user)
             ->from("/")
-            ->patch("/answers/{$record->id}/{$answer->id}")
+            ->patch("/questions/{$userQuestion->id}/{$answer->id}")
             ->assertRedirect("/");
 
-        $this->assertDatabaseHas("answer_records", [
-            "id" => $record->id,
+        $this->assertDatabaseHas("user_questions", [
+            "id" => $userQuestion->id,
             "answer_id" => $answer->id,
         ]);
     }
@@ -45,7 +46,7 @@ public function testUserCannotAnswerQuestionThatNotExisted(): void
         $answer = Answer::factory()->locked()->create();
 
         $this->actingAs($this->user)
-            ->patch("/answers/0/{$answer->id}")
+            ->patch("/questions/0/{$answer->id}")
             ->assertStatus(404);
     }
 
@@ -53,36 +54,36 @@ public function testUserCannotAnswerQuestionThatIsNotTheirs(): void
     {
         $user = User::factory()->create();
         $answer = Answer::factory()->locked()->create();
-        $submission = $answer->question->quiz->createSubmission($user);
-        $record = $submission->answerRecords[0];
+        $userQuiz = $answer->question->quiz->createUserQuiz($user);
+        $userQuestion = $userQuiz->userQuestions[0];
 
         $this->actingAs($this->user)
             ->from("/")
-            ->patch("/answers/{$record->id}/{$answer->id}")
+            ->patch("/questions/{$userQuestion->id}/{$answer->id}")
             ->assertStatus(403);
 
-        $this->assertDatabaseMissing("answer_records", [
-            "id" => $record->id,
+        $this->assertDatabaseMissing("user_questions", [
+            "id" => $userQuestion->id,
             "answer_id" => $answer->id,
         ]);
     }
 
-    public function testUserCannotAnswerQuestionThatBelongsToClosedSubmission(): void
+    public function testUserCannotAnswerQuestionThatBelongsToClosedUserQuiz(): void
     {
         $answer = Answer::factory()->locked()->create();
-        $submission = $answer->question->quiz->createSubmission($this->user);
-        $record = $submission->answerRecords[0];
+        $userQuiz = $answer->question->quiz->createUserQuiz($this->user);
+        $userQuestion = $userQuiz->userQuestions[0];
 
-        $submission->closed_at = Carbon::now();
-        $submission->save();
+        $userQuiz->closed_at = Carbon::now();
+        $userQuiz->save();
 
         $this->actingAs($this->user)
             ->from("/")
-            ->patch("/answers/{$record->id}/{$answer->id}")
+            ->patch("/questions/{$userQuestion->id}/{$answer->id}")
             ->assertStatus(403);
 
-        $this->assertDatabaseMissing("answer_records", [
-            "id" => $record->id,
+        $this->assertDatabaseMissing("user_questions", [
+            "id" => $userQuestion->id,
             "answer_id" => $answer->id,
         ]);
     }
@@ -90,16 +91,16 @@ public function testUserCannotAnswerQuestionThatBelongsToClosedSubmission(): voi
     public function testUserCannotAnswerQuestionWithAnswerThatNotExist(): void
     {
         $answer = Answer::factory()->locked()->create();
-        $submission = $answer->question->quiz->createSubmission($this->user);
-        $record = $submission->answerRecords[0];
+        $userQuiz = $answer->question->quiz->createUserQuiz($this->user);
+        $userQuestion = $userQuiz->userQuestions[0];
 
         $this->actingAs($this->user)
             ->from("/")
-            ->patch("/answers/{$submission->id}/4")
+            ->patch("/questions/{$userQuiz->id}/4")
             ->assertStatus(404);
 
-        $this->assertDatabaseMissing("answer_records", [
-            "id" => $record->id,
+        $this->assertDatabaseMissing("user_questions", [
+            "id" => $userQuestion->id,
             "answer_id" => $answer->id,
         ]);
     }
@@ -107,18 +108,18 @@ public function testUserCannotAnswerQuestionWithAnswerThatNotExist(): void
     public function testUserCannotAnswerQuestionWithAnswerNotAssignedToIt(): void
     {
         $answer = Answer::factory()->locked()->create();
-        $submission = $answer->question->quiz->createSubmission($this->user);
-        $record = $submission->answerRecords[0];
+        $userQuiz = $answer->question->quiz->createUserQuiz($this->user);
+        $userQuestion = $userQuiz->userQuestions[0];
 
         $answer1 = Answer::factory()->locked()->create();
 
         $this->actingAs($this->user)
             ->from("/")
-            ->patch("/answers/{$submission->id}/{$answer1->id}")
+            ->patch("/questions/{$userQuiz->id}/{$answer1->id}")
             ->assertStatus(403);
 
-        $this->assertDatabaseMissing("answer_records", [
-            "id" => $record->id,
+        $this->assertDatabaseMissing("user_questions", [
+            "id" => $userQuestion->id,
             "answer_id" => $answer1->id,
         ]);
     }
diff --git a/tests/Feature/UserQuizTest.php b/tests/Feature/UserQuizTest.php
new file mode 100644
index 00000000..95a27067
--- /dev/null
+++ b/tests/Feature/UserQuizTest.php
@@ -0,0 +1,153 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Feature;
+
+use App\Models\Answer;
+use App\Models\Question;
+use App\Models\Quiz;
+use App\Models\User;
+use App\Models\UserQuiz;
+use Carbon\Carbon;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Inertia\Testing\AssertableInertia as Assert;
+use Tests\TestCase;
+
+class UserQuizTest extends TestCase
+{
+    use RefreshDatabase;
+
+    protected User $user;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->user = User::factory()->create();
+    }
+
+    public function testUserCanViewSingleUserQuiz(): void
+    {
+        $quiz = Quiz::factory()->create();
+        $questions = Question::factory()->count(2)->create(["quiz_id" => $quiz->id]);
+
+        foreach ($questions as $question) {
+            $answers = Answer::factory()->count(4)->create(["question_id" => $question->id]);
+            $question->correctAnswer()->associate($answers[2]);
+            $question->save();
+        }
+
+        $userQuiz = $quiz->createUserQuiz($this->user);
+
+        $this->assertDatabaseCount("quizzes", 1);
+        $this->assertDatabaseCount("questions", 2);
+        $this->assertDatabaseCount("answers", 8);
+        $this->assertDatabaseCount("user_quizzes", 1);
+        $this->assertDatabaseCount("user_questions", 2);
+
+        $this->actingAs($this->user)
+            ->get("/quizzes/{$userQuiz->id}")
+            ->assertInertia(
+                fn(Assert $page) => $page
+                    ->component("User/Quiz")
+                    ->where("userQuiz.title", $quiz->title)
+                    ->count("userQuiz.questions", 2)
+                    ->count("userQuiz.questions.0.answers", 4)
+                    ->missing("userQuiz.questions.0.answers.2.correct")
+                    ->count("userQuiz.questions.1.answers", 4)
+                    ->missing("userQuiz.questions.1.answers.2.correct"),
+            );
+    }
+
+    public function testUserCannotViewUserQuizThatIsNotHis(): void
+    {
+        $userQuiz = UserQuiz::factory()->create();
+
+        $this->actingAs($this->user)
+            ->get("/quizzes/{$userQuiz->id}")
+            ->assertStatus(403);
+    }
+
+    public function testUserCanSeeUserQuizResult(): void
+    {
+        $quiz = Quiz::factory()->create();
+        $quiz->ranking_published_at = Carbon::now();
+        $quiz->save();
+
+        Question::factory()->count(2)->create(["quiz_id" => $quiz->id]);
+        $userQuiz = $quiz->createUserQuiz($this->user);
+        $userQuiz->closed_at = Carbon::now();
+        $userQuiz->save();
+
+        $this->actingAs($this->user)
+            ->get("/quizzes/{$userQuiz->id}/result")
+            ->assertInertia(
+                fn(Assert $page) => $page
+                    ->component("User/QuizResult")
+                    ->where("userQuiz.title", $quiz->title)
+                    ->count("userQuiz.questions", 2)
+                    ->where("hasRanking", true),
+            );
+    }
+
+    public function testUserCannotSeeUserQuizResultThatNotExisted(): void
+    {
+        $this->actingAs($this->user)
+            ->get("/quizzes/0/result")
+            ->assertStatus(404);
+    }
+
+    public function testUserCannotSeeUserQuizResultThatIsNotHis(): void
+    {
+        $userQuiz = UserQuiz::factory()->closed()->create();
+
+        $this->actingAs($this->user)
+            ->get("/quizzes/{$userQuiz->id}/result")
+            ->assertStatus(403);
+    }
+
+    public function testUserCannotSeeUserQuizResultThatIsNotClosed(): void
+    {
+        $userQuiz = UserQuiz::factory()->create(["user_id" => $this->user->id]);
+
+        $this->actingAs($this->user)
+            ->get("/quizzes/{$userQuiz->id}/result")
+            ->assertStatus(403);
+    }
+
+    public function testUserCanCloseUserQuiz(): void
+    {
+        $userQuiz = UserQuiz::factory()->create(["user_id" => $this->user->id]);
+
+        $this->actingAs($this->user)
+            ->post("/quizzes/{$userQuiz->id}/close")
+            ->assertRedirect("/quizzes/{$userQuiz->id}/result")
+            ->assertSessionHas(["status" => "Test został oddany."]);
+    }
+
+    public function testUserCannotCloseUserQuizThatNotExisted(): void
+    {
+        $this->actingAs($this->user)
+            ->post("/quizzes/0/close")
+            ->assertStatus(404);
+    }
+
+    public function testUserCannotCloseUserQuizThatIsNotHis(): void
+    {
+        $userQuiz = UserQuiz::factory()->create();
+
+        $this->actingAs($this->user)
+            ->post("/quizzes/{$userQuiz->id}/close")
+            ->assertStatus(403);
+    }
+
+    public function testUserCannotCloseClosedUserQuiz(): void
+    {
+        $userQuiz = UserQuiz::factory()->closed()->create(["user_id" => $this->user->id]);
+
+        $this->actingAs($this->user)
+            ->post("/quizzes/{$userQuiz->id}/close")
+            ->assertStatus(403);
+    }
+}
diff --git a/tests/Feature/UserTest.php b/tests/Feature/UserTest.php
index f5be41fd..28b94216 100644
--- a/tests/Feature/UserTest.php
+++ b/tests/Feature/UserTest.php
@@ -103,7 +103,7 @@ public function testAdminCanEditUser(): void
         $this->actingAs($this->admin)
             ->from("/admin/users/{$user->id}")
             ->patch("/admin/users/{$user->id}", [
-                "name" => "New Name",
+                "firstname" => "New Name",
                 "surname" => "New Surname",
                 "email" => "new@email.com",
                 "school_id" => $user->school_id,
@@ -112,7 +112,7 @@ public function testAdminCanEditUser(): void
 
         $this->assertDatabaseHas("users", [
             "id" => $user->id,
-            "name" => "New Name",
+            "firstname" => "New Name",
             "surname" => "New Surname",
             "email" => "new@email.com",
             "school_id" => $user->school_id,
@@ -127,7 +127,7 @@ public function testSuperAdminCanEditUser(): void
         $this->actingAs($this->superAdmin)
             ->from("/admin/users/{$user->id}")
             ->patch("/admin/users/{$user->id}", [
-                "name" => "New Name",
+                "firstname" => "New Name",
                 "surname" => "New Surname",
                 "email" => "new@email.com",
                 "school_id" => $user->school_id,
@@ -136,7 +136,7 @@ public function testSuperAdminCanEditUser(): void
 
         $this->assertDatabaseHas("users", [
             "id" => $user->id,
-            "name" => "New Name",
+            "firstname" => "New Name",
             "surname" => "New Surname",
             "email" => "new@email.com",
             "school_id" => $user->school_id,
@@ -151,7 +151,7 @@ public function testAdminCannotEditUserWithInvalidData(): void
         $response = $this->actingAs($this->admin)
             ->from("/admin/users/{$user->id}")
             ->patch("/admin/users/{$user->id}", [
-                "name" => "",
+                "firstname" => "",
                 "surname" => "",
                 "email" => "invalidMail",
                 "school_id" => 999,
@@ -161,14 +161,14 @@ public function testAdminCannotEditUserWithInvalidData(): void
 
         $this->assertDatabaseHas("users", [
             "id" => $user->id,
-            "name" => $user->name,
+            "firstname" => $user->firstname,
             "surname" => $user->surname,
             "email" => $user->email,
             "school_id" => $user->school_id,
         ]);
 
         $response->assertSessionHasErrors([
-            "name",
+            "firstname",
             "surname",
             "email",
             "school_id",
@@ -187,7 +187,7 @@ public function testAdminCannotEditUserMailThatHasBeenTaken(): void
         $response = $this->actingAs($this->admin)
             ->from("/admin/users/{$user->id}")
             ->patch("/admin/users/{$user->id}", [
-                "name" => $user->name,
+                "firstname" => $user->name,
                 "surname" => $user->surname,
                 "email" => "taken@email.com",
                 "school_id" => $user->school_id,
@@ -219,7 +219,7 @@ public function testAdminCannotEditAnotherAdmin(): void
 
         $this->actingAs($this->admin)
             ->patch("/admin/users/{$anotherAdmin->id}", [
-                "name" => "New Name",
+                "firstname" => "New Name",
                 "surname" => "New Surname",
                 "email" => "new@email.com",
                 "school_id" => $anotherAdmin->school_id,
@@ -234,7 +234,7 @@ public function testSuperAdminCanEditAnotherAdmin(): void
 
         $this->actingAs($this->superAdmin)
             ->patch("/admin/users/{$anotherAdmin->id}", [
-                "name" => "New Name",
+                "firstname" => "New Name",
                 "surname" => "New Surname",
                 "email" => "new@email.com",
                 "school_id" => $anotherAdmin->school_id,
@@ -253,7 +253,7 @@ public function testSuperAdminCanAnonymizeUser(): void
 
         $this->assertDatabaseHas("users", [
             "id" => $user->id,
-            "name" => "Anonymous",
+            "firstname" => "Anonymous",
             "surname" => "User",
             "email" => "anonymous" . $user->id . "@email",
             "is_anonymized" => true,
@@ -284,7 +284,7 @@ public function testAdminAndSuperAdminCannotEditAnonymizedUser(): void
         $this->actingAs($this->admin)
             ->from("/admin/users/{$user->id}")
             ->patch("/admin/users/{$user->id}", [
-                "name" => "New Name",
+                "firstname" => "New Name",
                 "surname" => "New Surname",
                 "email" => "new@email.com",
                 "school_id" => $user->school_id,
@@ -292,13 +292,13 @@ public function testAdminAndSuperAdminCannotEditAnonymizedUser(): void
             ->assertForbidden();
 
         $this->assertDatabaseMissing("users", [
-            "name" => "New Name",
+            "firstname" => "New Name",
         ]);
 
         $this->actingAs($this->superAdmin)
             ->from("/admin/users/{$user->id}")
             ->patch("/admin/users/{$user->id}", [
-                "name" => "New Name",
+                "firstname" => "New Name",
                 "surname" => "New Surname",
                 "email" => "new@email.com",
                 "school_id" => $user->school_id,
@@ -306,7 +306,7 @@ public function testAdminAndSuperAdminCannotEditAnonymizedUser(): void
             ->assertForbidden();
 
         $this->assertDatabaseMissing("users", [
-            "name" => "New Name",
+            "firstname" => "New Name",
         ]);
     }
 
diff --git a/tests/Unit/ExampleTest.php b/tests/Unit/ExampleTest.php
deleted file mode 100644
index bb5cb02c..00000000
--- a/tests/Unit/ExampleTest.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Tests\Unit;
-
-use PHPUnit\Framework\TestCase;
-
-class ExampleTest extends TestCase
-{
-    public function testThatTrueIsTrue(): void
-    {
-        $this->assertTrue(true);
-    }
-}
diff --git a/tests/Unit/RegonRuleTest.php b/tests/Unit/RegonRuleTest.php
new file mode 100644
index 00000000..a3efaeac
--- /dev/null
+++ b/tests/Unit/RegonRuleTest.php
@@ -0,0 +1,77 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Unit;
+
+use App\Rules\Regon;
+use Illuminate\Support\Facades\Lang;
+use PHPUnit\Framework\TestCase;
+
+class RegonRuleTest extends TestCase
+{
+    public function testValidShortRegon(): void
+    {
+        Lang::shouldReceive("get");
+
+        $this->assertTrue($this->validateRegon("304608090"));
+        $this->assertTrue($this->validateRegon("743428671"));
+    }
+
+    public function testShortRegonWithInvalidChecksum(): void
+    {
+        Lang::shouldReceive("get")->with("validation.custom.regon.invalid_checksum");
+
+        $this->assertFalse($this->validateRegon("304608091"));
+    }
+
+    public function testShortRegonWithInvalidLength(): void
+    {
+        Lang::shouldReceive("get")->with("validation.custom.regon.invalid_length");
+
+        $this->assertFalse($this->validateRegon("12345"));
+    }
+
+    public function testValidLongRegon(): void
+    {
+        Lang::shouldReceive("get");
+
+        $this->assertTrue($this->validateRegon("30460809063960"));
+        $this->assertTrue($this->validateRegon("74342867138461"));
+    }
+
+    public function testLongRegonWithInvalidChecksum(): void
+    {
+        Lang::shouldReceive("get")->with("validation.custom.regon.invalid_checksum");
+
+        $this->assertFalse($this->validateRegon("30460809163960"));
+        $this->assertFalse($this->validateRegon("30460809063961"));
+    }
+
+    public function testLongRegonWithInvalidLength(): void
+    {
+        Lang::shouldReceive("get")->with("validation.custom.regon.invalid_length");
+
+        $this->assertFalse($this->validateRegon("1234567851"));
+    }
+
+    public function testNonNumericRegon(): void
+    {
+        Lang::shouldReceive("get")->with("validation.custom.regon.digits_only");
+
+        $this->assertFalse($this->validateRegon("abcdefghi"));
+        $this->assertFalse($this->validateRegon("12345abc9"));
+    }
+
+    protected function validateRegon(string $value): bool
+    {
+        $failed = false;
+        $rule = new Regon();
+
+        $rule->validate("regon", $value, function ($err) use (&$failed): void {
+            $failed = true;
+        });
+
+        return !$failed;
+    }
+}
diff --git a/tests/Unit/SortHelperTest.php b/tests/Unit/SortHelperTest.php
new file mode 100644
index 00000000..6e03c326
--- /dev/null
+++ b/tests/Unit/SortHelperTest.php
@@ -0,0 +1,181 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Unit;
+
+use App\Helpers\SortHelper;
+use Illuminate\Container\Container;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Http\Request;
+use Illuminate\Pagination\LengthAwarePaginator;
+use Illuminate\Support\Facades\Lang;
+use Mockery;
+use Mockery\MockInterface;
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpKernel\Exception\HttpException;
+
+class SortHelperTest extends TestCase
+{
+    private Container $originalContainer;
+
+    /** @var MockInterface<Container> */
+    private MockInterface $container;
+
+    protected function setUp(): void
+    {
+        $this->originalContainer = Container::getInstance();
+        $this->container = Mockery::mock(Container::class);
+        Container::setInstance($this->container);
+    }
+
+    protected function tearDown(): void
+    {
+        Mockery::close();
+        Container::setInstance($this->originalContainer);
+    }
+
+    public function testGetSortParametersReturnsDefaultValues(): void
+    {
+        $request = Request::create("/", "GET");
+
+        $helper = new SortHelper($request);
+        $result = $helper->getSortParameters();
+
+        $this->assertSame(["id", "desc"], $result);
+    }
+
+    public function testGetSortParameters(): void
+    {
+        $request = Request::create("/?order=desc&sort=name", "GET");
+
+        $helper = new SortHelper($request);
+        $result = $helper->getSortParameters();
+
+        $this->assertSame(["name", "desc"], $result);
+    }
+
+    public function testSort(): void
+    {
+        $request = Request::create("/?sort=name&order=asc", "GET");
+
+        $builderMock = Mockery::mock(Builder::class);
+        $builderMock->shouldReceive("orderBy")->with("name", "asc")->once()->andReturnSelf();
+
+        $helper = new SortHelper($request);
+        $result = $helper->sort($builderMock, ["name", "email"], []);
+
+        $this->assertSame($builderMock, $result);
+    }
+
+    public function testSortIgnoresIgnoredFields(): void
+    {
+        $request = Request::create("/?sort=ignored_field&order=asc", "GET");
+
+        $builderMock = Mockery::mock(Builder::class);
+        $builderMock->shouldNotReceive("orderBy");
+
+        $helper = new SortHelper($request);
+        $result = $helper->sort($builderMock, ["name", "email"], ["ignored_field"]);
+
+        $this->assertSame($builderMock, $result);
+    }
+
+    public function testSortAppliesOrderBy(): void
+    {
+        $request = Request::create("/?sort=email&order=desc", "GET");
+
+        $builderMock = Mockery::mock(Builder::class);
+        $builderMock->shouldReceive("orderBy")->with("email", "desc")->once()->andReturnSelf();
+
+        $helper = new SortHelper($request);
+        $result = $helper->sort($builderMock, ["name", "email"], ["ignored_field"]);
+
+        $this->assertSame($builderMock, $result);
+    }
+
+    public function testSortThrowsExceptionForUnsupportedField(): void
+    {
+        Lang::shouldReceive("get")
+            ->with("validation.custom.sorting.unsupported_field", ["attribute" => "invalid_field"]);
+
+        $this->container->shouldReceive("abort")->once()->andThrow(HttpException::class, 400);
+        $this->expectException(HttpException::class);
+
+        $request = Request::create("/?sort=invalid_field&order=asc", "GET");
+        $builderMock = Mockery::mock(Builder::class);
+
+        $helper = new SortHelper($request);
+        $result = $helper->sort($builderMock, ["name", "email"], []);
+
+        $this->assertSame($builderMock, $result);
+    }
+
+    public function testSearch(): void
+    {
+        $request = Request::create("/?search=test", "GET");
+
+        $builderMock = Mockery::mock(Builder::class);
+        $builderMock->shouldReceive("where")->with("name", "ilike", "%test%")->once()->andReturnSelf();
+
+        $helper = new SortHelper($request);
+        $result = $helper->search($builderMock, "name");
+
+        $this->assertSame($builderMock, $result);
+    }
+
+    public function testSearchDoesNothingIfNoSearchText(): void
+    {
+        $request = Request::create("/", "GET");
+
+        $builderMock = Mockery::mock(Builder::class);
+        $builderMock->shouldNotReceive("where");
+
+        $helper = new SortHelper($request);
+        $result = $helper->search($builderMock, "name");
+
+        $this->assertSame($builderMock, $result);
+    }
+
+    public function testPaginateUsesDefaultLimit(): void
+    {
+        $request = Request::create("/", "GET");
+
+        $paginatorMock = Mockery::mock(LengthAwarePaginator::class);
+        $builderMock = Mockery::mock(Builder::class);
+        $builderMock->shouldReceive("paginate")->with(50)->once()->andReturn($paginatorMock);
+
+        $helper = new SortHelper($request);
+        $result = $helper->paginate($builderMock);
+
+        $this->assertSame($paginatorMock, $result);
+    }
+
+    public function testPaginateUsesCustomLimit(): void
+    {
+        $request = Request::create("/?limit=255", "GET");
+
+        $paginatorMock = Mockery::mock(LengthAwarePaginator::class);
+        $builderMock = Mockery::mock(Builder::class);
+        $builderMock->shouldReceive("paginate")->with(255)->once()->andReturn($paginatorMock);
+
+        $helper = new SortHelper($request);
+        $result = $helper->paginate($builderMock);
+
+        $this->assertSame($paginatorMock, $result);
+    }
+
+    public function testPaginateFallbacksToDefaultForInvalidLimit(): void
+    {
+        $request = Request::create("/?limit=-255", "GET");
+
+        $paginatorMock = Mockery::mock(LengthAwarePaginator::class);
+        $builderMock = Mockery::mock(Builder::class);
+        $builderMock->shouldReceive("paginate")->with(50)->once()->andReturn($paginatorMock);
+
+        $helper = new SortHelper($request);
+        $result = $helper->paginate($builderMock);
+
+        $this->assertSame($paginatorMock, $result);
+    }
+}