diff --git a/Makefile b/Makefile
index ef642d79..5a004854 100644
--- a/Makefile
+++ b/Makefile
@@ -54,6 +54,9 @@ test-specific:
 fix:
 	@docker compose --file ${DOCKER_COMPOSE_FILE} exec --user "${CURRENT_USER_ID}:${CURRENT_USER_GROUP_ID}" ${DOCKER_COMPOSE_APP_CONTAINER} bash -c 'composer csf'
 
+lintf:
+	@docker compose --file ${DOCKER_COMPOSE_FILE} exec --user "${CURRENT_USER_ID}:${CURRENT_USER_GROUP_ID}" ${DOCKER_COMPOSE_APP_CONTAINER} bash -c 'npm run lintf'
+
 analyse:
 	@docker compose --file ${DOCKER_COMPOSE_FILE} exec --user "${CURRENT_USER_ID}:${CURRENT_USER_GROUP_ID}" ${DOCKER_COMPOSE_APP_CONTAINER} bash -c 'composer analyse'
 
diff --git a/app/DTO/SchoolDTO.php b/app/DTO/SchoolDTO.php
index b383df15..459dd885 100644
--- a/app/DTO/SchoolDTO.php
+++ b/app/DTO/SchoolDTO.php
@@ -8,6 +8,7 @@ class SchoolDTO
 {
     public function __construct(
         public string $name,
+        public string $regon,
         public string $city,
         public string $street,
         public string $buildingNumber,
@@ -19,6 +20,7 @@ public static function createFromArray(array $data): self
     {
         $member = new self(
             $data["nazwa"],
+            $data["regon"],
             $data["miejscowosc"],
             $data["ulica"],
             $data["numerBudynku"],
@@ -28,4 +30,17 @@ public static function createFromArray(array $data): self
 
         return $member;
     }
+
+    public function toArray(): array
+    {
+        return [
+            "name" => $this->name,
+            "regon" => $this->regon,
+            "city" => $this->city,
+            "street" => $this->street,
+            "building_number" => $this->buildingNumber,
+            "apartment_number" => $this->apartmentNumber,
+            "zip_code" => $this->zipCode,
+        ];
+    }
 }
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..a58abc23
--- /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", "asc") === "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/QuizController.php b/app/Http/Controllers/QuizController.php
index a3206301..f0d42ac9 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,11 +21,12 @@
 
 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)]);
     }
@@ -104,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->whereNull("locked_at")->orWhereDate("scheduled_at", ">", Carbon::now());
+        }
+
+        return $query;
+    }
 }
diff --git a/app/Http/Controllers/SchoolsController.php b/app/Http/Controllers/SchoolsController.php
index 9f7ae7b1..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
@@ -34,7 +42,8 @@ public function store(SchoolRequest $request): RedirectResponse
         School::query()->create($request->validated());
 
         return redirect()
-            ->back();
+            ->back()
+            ->with("status", "Szkoła została dodana.");
     }
 
     public function update(SchoolRequest $request, School $school): RedirectResponse
@@ -67,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);
     }
@@ -75,6 +85,7 @@ public function status(): JsonResponse
     {
         return response()->json([
             "done" => !$this->isFetching(),
+            "count" => (int)Cache::get("fetched_schools"),
         ]);
     }
 
@@ -95,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 6a1c635d..328a9322 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -50,7 +50,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/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 1c44b3b9..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;
 
@@ -14,18 +15,34 @@ public function authorize(): bool
         return true;
     }
 
+    public function prepareForValidation(): void
+    {
+        if ($this->has("buildingNumber")) {
+            $this->merge(["building_number" => $this->input("buildingNumber")]);
+        }
+
+        if ($this->has("apartmentNumber")) {
+            $this->merge(["apartment_number" => $this->input("apartmentNumber")]);
+        }
+
+        if ($this->has("zipCode")) {
+            $this->merge(["zip_code" => $this->input("zipCode")]);
+        }
+    }
+
     /**
      * @return array<string, ValidationRule|array|string>
      */
     public function rules(): array
     {
         return [
-            "name" => ["required", "string"],
-            "city" => ["required", "string"],
-            "street" => ["required", "string"],
-            "building_number" => ["required", "string"],
-            "apartment_number" => ["string"],
-            "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/SchoolResource.php b/app/Http/Resources/SchoolResource.php
index 5909daa3..eee4b506 100644
--- a/app/Http/Resources/SchoolResource.php
+++ b/app/Http/Resources/SchoolResource.php
@@ -17,7 +17,15 @@ public function toArray(Request $request): array
         return [
             "id" => $this->id,
             "name" => $this->name,
+            "regon" => $this->regon,
             "city" => $this->city,
+            "street" => $this->street,
+            "buildingNumber" => $this->building_number,
+            "apartmentNumber" => $this->apartment_number,
+            "zipCode" => $this->zip_code,
+            "numberOfStudents" => $this->users()->count(),
+            "createdAt" => $this->created_at,
+            "updatedAt" => $this->updated_at,
         ];
     }
 }
diff --git a/app/Http/Resources/UserResource.php b/app/Http/Resources/UserResource.php
index 941162c2..10bde42c 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 18b73ebf..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
diff --git a/app/Models/School.php b/app/Models/School.php
index 3524f74e..7c357a54 100644
--- a/app/Models/School.php
+++ b/app/Models/School.php
@@ -5,11 +5,14 @@
 namespace App\Models;
 
 use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 
 /**
  * @property int $id
+ * @property string $regon
  * @property string $name
  * @property string $city
  * @property string $street
@@ -18,6 +21,7 @@
  * @property string $zip_code
  * @property Carbon $created_at
  * @property Carbon $updated_at
+ * @property Collection<User> $users
  */
 class School extends Model
 {
@@ -25,10 +29,16 @@ class School extends Model
 
     protected $fillable = [
         "name",
+        "regon",
         "city",
         "street",
         "building_number",
         "apartment_number",
         "zip_code",
     ];
+
+    public function users(): HasMany
+    {
+        return $this->hasMany(User::class);
+    }
 }
diff --git a/app/Models/User.php b/app/Models/User.php
index d31b618a..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
@@ -40,7 +40,7 @@ class User extends Authenticatable implements MustVerifyEmail, CanResetPassword
     use HasRoles;
 
     protected $fillable = [
-        "name",
+        "firstname",
         "surname",
         "email",
         "school_id",
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 0575eef5..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,17 +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
     {
-        foreach ($schools as $school) {
-            School::firstOrCreate([
-                "name" => $school->name,
-                "city" => $school->city,
-                "street" => $school->street,
-                "building_number" => $school->buildingNumber,
-                "apartment_number" => $school->apartmentNumber,
-                "zip_code" => $school->zipCode,
-            ]);
+        $fetched = 0;
+
+        foreach ($schools as $dto) {
+            if (School::query()->where("regon", "=", $dto->regon)->doesntExist()) {
+                School::query()->create($dto->toArray());
+                ++$fetched;
+            }
         }
+
+        return $fetched;
     }
 }
diff --git a/database/factories/SchoolFactory.php b/database/factories/SchoolFactory.php
index bbbd7a75..0d121b9c 100644
--- a/database/factories/SchoolFactory.php
+++ b/database/factories/SchoolFactory.php
@@ -4,6 +4,7 @@
 
 namespace Database\Factories;
 
+use App\Helpers\RegonHelper;
 use App\Models\School;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
@@ -21,11 +22,12 @@ public function definition(): array
     {
         return [
             "name" => fake()->company(),
+            "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/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_08_113859_create_schools_table.php b/database/migrations/2024_08_08_113859_create_schools_table.php
index 1178a14b..67d89e7f 100644
--- a/database/migrations/2024_08_08_113859_create_schools_table.php
+++ b/database/migrations/2024_08_08_113859_create_schools_table.php
@@ -11,6 +11,7 @@ public function up(): void
     {
         Schema::create("schools", function (Blueprint $table): void {
             $table->bigIncrements("id")->unique();
+            $table->string("regon");
             $table->string("name");
             $table->string("city");
             $table->string("street");
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/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/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
new file mode 100644
index 00000000..61d3679d
--- /dev/null
+++ b/resources/js/Helpers/Sorter.ts
@@ -0,0 +1,43 @@
+import {computed, type Ref, ref, watch} from 'vue'
+import {router} from '@inertiajs/vue3'
+import {useParams} from '@/Helpers/Params'
+
+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)
+
+  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}`)
+    }
+
+    if (searchText?.value) {
+      query.push(`search=${searchText?.value}`)
+    }
+
+    if (customQueries) {
+      query.push(...customQueries())
+    }
+
+    return query.length > 0 ? '&' + query.join('&') : ''
+  })
+
+  watch(query, query =>
+    router.visit(
+      `?page=1${query}`, {
+        preserveState: true,
+        replace: true,
+      },
+    ),
+  )
+
+  return [query, options]
+}
diff --git a/resources/js/Helpers/vDynamicTextAreaHeight.ts b/resources/js/Helpers/vDynamicTextAreaHeight.ts
new file mode 100644
index 00000000..b213819f
--- /dev/null
+++ b/resources/js/Helpers/vDynamicTextAreaHeight.ts
@@ -0,0 +1,35 @@
+import { type DirectiveBinding } from 'vue'
+
+function initDynamicHeightCalc(input:HTMLTextAreaElement & { _calculateDynamicHeight:() => void }, binding?:DirectiveBinding<boolean>) {
+  input._calculateDynamicHeight = () => calculateDynamicHeight(input, binding)
+
+  document.fonts.addEventListener('loadingdone', input._calculateDynamicHeight)
+  input.addEventListener('transitionend', input._calculateDynamicHeight)
+
+  input._calculateDynamicHeight()
+  input.style.resize = 'none'
+}
+
+function calculateDynamicHeight(input:HTMLTextAreaElement, binding?:DirectiveBinding<boolean>){
+  if (binding?.value === false) {
+    return
+  }
+
+  // Reset the height to a minimal value to refresh scrollHeight.
+  // This ensures the textarea will shrink when text is removed.
+  input.style.height = '5px'
+  input.style.height = `${input.scrollHeight}px`
+}
+
+function removeDynamicHeightCalc(input:HTMLTextAreaElement & { _calculateDynamicHeight:() => void }) {
+  document.fonts.removeEventListener('loadingdone', input._calculateDynamicHeight)
+  input.removeEventListener('transitionend', input._calculateDynamicHeight)
+}
+
+const vDynamicInputHeight = {
+  mounted: initDynamicHeightCalc,
+  updated: calculateDynamicHeight,
+  unmounted: removeDynamicHeightCalc,
+}
+
+export default vDynamicInputHeight
diff --git a/resources/js/Layouts/BaseLayout.vue b/resources/js/Layouts/BaseLayout.vue
index 96abd0eb..13d691b2 100644
--- a/resources/js/Layouts/BaseLayout.vue
+++ b/resources/js/Layouts/BaseLayout.vue
@@ -13,13 +13,17 @@ 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 :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/Pages/Admin/QuizDemo.vue b/resources/js/Pages/Admin/QuizDemo.vue
index 0a3f0043..0d3bf0c0 100644
--- a/resources/js/Pages/Admin/QuizDemo.vue
+++ b/resources/js/Pages/Admin/QuizDemo.vue
@@ -1,13 +1,14 @@
 <script setup lang="ts">
-import QuizLayout from '@/Layouts/QuizLayout.vue'
+import QuizPage from '@/components/UserQuiz/QuizPage.vue'
 import { converter } from '@/Helpers/Converter'
+import {type PageProps} from '@/Types/PageProps'
 
-const props = defineProps<{ quiz: Quiz }>()
+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>
-  <QuizLayout
+  <QuizPage
     :user-quiz="converter.quiz.adminToUser(props.quiz)"
     :request-close-quiz="{ method: 'get', href: '/admin/quizzes/' }"
   />
diff --git a/resources/js/Pages/Admin/Quizzes.vue b/resources/js/Pages/Admin/Quizzes.vue
index 6f821868..9d3e89f1 100644
--- a/resources/js/Pages/Admin/Quizzes.vue
+++ b/resources/js/Pages/Admin/Quizzes.vue
@@ -1,57 +1,43 @@
 <script setup lang="ts">
-import { onMounted, provide, type Ref, ref, watch } from 'vue'
+import { provide, type Ref, ref } from 'vue'
 import { Head } from '@inertiajs/vue3'
-import dayjs from 'dayjs'
-import { vAutoAnimate } from '@formkit/auto-animate'
-import { ArrowsUpDownIcon } from '@heroicons/vue/24/outline'
-import { PlusCircleIcon } from '@heroicons/vue/20/solid'
 import Expand from '@/components/Common/Expand.vue'
-import FormButton from '@/components/Common/FormButton.vue'
 import QuizComponent from '@/components/QuizzesPanel/QuizComponent.vue'
-import Dropdown from '@/components/Common/Dropdown.vue'
 import ArchiveDynamicIcon from '@/components/Icons/ArchiveDynamicIcon.vue'
 import useCurrentTime from '@/Helpers/CurrentTime'
-import { keysWrapper } from '@/Helpers/KeysManager'
+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())
-const props = defineProps<{ quizzes:Quiz[] }>()
-const quizzes = ref<Quiz[]>(props.quizzes)
-const sorter = ref<(a:Quiz, b:Quiz) => number>()
-const showArchivedQuizzes = ref<boolean>(true)
-const options = keysWrapper([
-  { text: 'Po nazwie (A–Z)', action: () => setQuizzesSorter('name') },
-  { text: 'Po nazwie (Z–A)', action: () => setQuizzesSorter('name', true) },
-  { text: 'Od najnowszych' , action: () => setQuizzesSorter('creationDate', true) },
-  { text: 'Od najstarszych', action: () => setQuizzesSorter('creationDate') },
-  { text: 'Od najnowszych zmienionych', action: () => setQuizzesSorter('modificationDate', true) },
-  { text: 'Od najstarszych zmienionych', action: () => setQuizzesSorter('modificationDate') },
-])
 
-onMounted(() => {
-  const savedSorter = sessionStorage.getItem('quizzesSorterPreference')
-  const [type, desc] = savedSorter ? JSON.parse(savedSorter) : ['modificationDate', true]
-  setQuizzesSorter(type, desc)
-})
+defineProps<{ quizzes: Pagination<Quiz> } & PageProps>()
+
+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: 'Od najpóźniej zmienionych', key: 'updated_at' },
+  { text: 'Od najwcześniej zmienionych', key: 'updated_at', desc: true },
+]
 
-watch(
-  [() => props.quizzes, sorter],
-  ([newQuizzes, sorter]) => {
-    quizzes.value = newQuizzes
-    quizzes.value.sort(sorter)
-  },
-  { immediate: true },
-)
+const params = useParams()
+const hideArchivedQuizzes = ref<boolean>(params.archived !== 'true')
 
-function setQuizzesSorter(type: 'name' | 'creationDate' | 'modificationDate', desc = false) {
-  sessionStorage.setItem('quizzesSorterPreference', JSON.stringify([type, desc]))
-  sorter.value = (a:Quiz, b:Quiz) => {
-    if (desc) [a, b] = [b, a]
-    return {
-      name: a.title.localeCompare(b.title),
-      creationDate: dayjs(a.createdAt).diff(dayjs(b.createdAt)),
-      modificationDate: dayjs(a.updatedAt).diff(dayjs(b.updatedAt)),
-    }[type]
+function customQueries(): string[] {
+  let query: string[] = []
+
+  if (!hideArchivedQuizzes.value) {
+    query.push(`archived=${true}`)
   }
+
+  return query
 }
 </script>
 
@@ -59,22 +45,23 @@ function setQuizzesSorter(type: 'name' | 'creationDate' | 'modificationDate', de
   <Head>
     <title>Testy - Panel administracyjny</title>
   </Head>
-  <div class="flex flex-col w-full pb-3">
-    <div data-name="toolbar" class="flex px-4 gap-1 sm:gap-2">
-      <Dropdown class-btn="rounded-lg" :options="options" title="Sortuj" pointer-position="left">
-        <div class="flex gap-2 hover:bg-primary/5 hover:text-primary duration-200 p-2 rounded-lg">
-          <ArrowsUpDownIcon class="size-6" />
-          <span class="hidden sm:block">Sortuj</span>
-        </div>
-      </Dropdown>
 
+  <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`"
+        :title="`${hideArchivedQuizzes ? '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"
+        @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 />
@@ -88,15 +75,28 @@ function setQuizzesSorter(type: 'name' | 'creationDate' | 'modificationDate', de
       >
         <PlusCircleIcon class="size-6 text-white" /> Dodaj test
       </FormButton>
-    </div>
+    </template>
 
-    <div v-auto-animate class="flex flex-col gap-4 p-4">
+    <template #item="{item}">
       <QuizComponent
-        v-for="quiz of quizzes"
-        :key="quiz.id"
-        :quiz="quiz"
-        :show-archived-quizzes="showArchivedQuizzes"
+        :quiz="item"
       />
-    </div>
-  </div>
+    </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 abcdcedc..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))
 
@@ -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 efb8d5a9..2e566d80 100644
--- a/resources/js/Pages/Admin/SchoolsPanel.vue
+++ b/resources/js/Pages/Admin/SchoolsPanel.vue
@@ -1,11 +1,163 @@
 <script setup lang="ts">
-import {Head} from '@inertiajs/vue3'
+import {Head, router} from '@inertiajs/vue3'
+import { ArrowUpCircleIcon } 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} 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'
+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: 'Od najpóźniej zmienionych', key: 'updated_at' },
+  { text: 'Od najwcześniej zmienionych', 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
+
+    return [done, count]
+  }
+  catch {
+    return [false, null]
+  }
+}
+
+setInterval(async () => {
+  if (!status.value) {
+    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)
+
+function startFetching() {
+  if (status.value) {
+    status.value = false
+    axios.post('/admin/schools/fetch')
+  }
+}
 </script>
 
 <template>
   <Head>
-    <title>Szkoły</title>
+    <title>Szkoły - Panel administracyjny</title>
   </Head>
 
-  Quizzes - CRUD
+  <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" />
+      <p>Trwa importowanie szkół.</p>
+    </div>
+  </Transition>
+
+  <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 />
+
+      <Button
+        :disabled="!status"
+        class="rounded-xl"
+        :class="{'cursor-pointer': status}"
+        @click="startFetching()"
+      >
+        <ArrowUpCircleIcon class="size-6 text-white" /> Importuj szkoły
+      </Button>
+    </template>
+
+    <template #deleteMessage="{item}">
+      <b class="text-[1.1rem] text-gray-900">Czy na pewno chcesz usunąć "{{ item.name }}"?</b>
+      <p class="text-gray-500">Szkoła zostanie usunięta bezpowrotnie.</p>
+    </template>
+
+    <template #title="{item, editing, errors}">
+      <InputWrapper
+        :error="errors.name"
+        :hide-error="!editing"
+        :hide-content="!item.name && !editing"
+      >
+        <textarea
+          v-model="item.name"
+          v-dynamic-text-area-height
+          name="name"
+          autocomplete="off"
+          :disabled="!editing"
+          placeholder=""
+          class="size-full xs:h-8 bg-transparent outline-none font-bold text-lg xs:mb-0"
+          :class="{
+            'border-b border-b-primary/30 duration-200 transition-colors hover:border-b-primary/60 text-primary' : editing,
+            'border-b-red' : errors.name
+          }"
+        />
+      </InputWrapper>
+    </template>
+
+    <template #itemData="data">
+      <div class="flex flex-col duration-200 min-h-6.5 gap-2" :class="{'text-sm text-gray-600': !data.editing}">
+        <p>Liczba uczniów: <b>{{ data.item.numberOfStudents }}</b></p>
+
+        <CrudInput
+          v-model="data.item.regon"
+          name="regon"
+          label="REGON:"
+          :editing="data.editing"
+          :error="data.errors.regon"
+        />
+
+        <AddressInput v-model="data.item" :errors="data.errors" :disabled="!data.editing" />
+      </div>
+    </template>
+  </CrudPage>
 </template>
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 de3447a0..9ecc8afe 100644
--- a/resources/js/Pages/User/Dashboard.vue
+++ b/resources/js/Pages/User/Dashboard.vue
@@ -6,11 +6,12 @@ import FormButton from '@/components/Common/FormButton.vue'
 import Divider from '@/components/Common/Divider.vue'
 import LinkButton from '@/components/Common/LinkButton.vue'
 import QuizItem from '@/components/Dashboard/QuizItem.vue'
+import {type PageProps} from '@/Types/PageProps'
 
 const props = defineProps<{
   userQuizzes: UserQuiz[]
   quizzes: Quiz[]
-}>()
+}& PageProps>()
 
 const isClosed = (quiz: Quiz) => (
   dayjs(quiz.scheduledAt).add(quiz.duration ?? 0, 'm').isBefore(Date.now()) ||
@@ -29,9 +30,9 @@ const history = computed(() => props.userQuizzes.filter(userQuiz => userQuiz.clo
     <Divider v-if="started.length > 0">
       <h1 class="font-bold text-lg text-primary whitespace-nowrap">Trwające konkursy</h1>
     </Divider>
-    <QuizItem 
-      v-for="quiz in started" 
-      :key="quiz.id" 
+    <QuizItem
+      v-for="quiz in started"
+      :key="quiz.id"
       :title="quiz.title"
       :time="quiz.scheduledAt"
     >
@@ -43,9 +44,9 @@ const history = computed(() => props.userQuizzes.filter(userQuiz => userQuiz.clo
     <Divider v-if="scheduled.length > 0 || started.length == 0">
       <h1 class="font-bold text-lg text-primary whitespace-nowrap">Nadchodzące konkursy</h1>
     </Divider>
-    <QuizItem 
-      v-for="quiz in scheduled" 
-      :key="quiz.id" 
+    <QuizItem
+      v-for="quiz in scheduled"
+      :key="quiz.id"
       :title="quiz.title"
       :time="quiz.scheduledAt"
     >
@@ -65,9 +66,9 @@ const history = computed(() => props.userQuizzes.filter(userQuiz => userQuiz.clo
     <Divider v-if="history.length > 0">
       <h1 class="font-bold text-lg text-primary whitespace-nowrap">Historia</h1>
     </Divider>
-    <QuizItem 
-      v-for="userQuiz in history" 
-      :key="userQuiz.id" 
+    <QuizItem
+      v-for="userQuiz in history"
+      :key="userQuiz.id"
       :title="userQuiz.title"
       :time="userQuiz.closedAt"
     >
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 2251b882..6b6c2eda 100644
--- a/resources/js/Pages/User/Quiz.vue
+++ b/resources/js/Pages/User/Quiz.vue
@@ -1,11 +1,12 @@
 <script setup lang="ts">
-import QuizLayout from '@/Layouts/QuizLayout.vue'
+import QuizPage from '@/components/UserQuiz/QuizPage.vue'
 import axios from 'axios'
 import { ref } from 'vue'
 import Button from '@/components/Common/Button.vue'
 import MessageBox from '@/components/Common/MessageBox.vue'
+import {type PageProps} from '@/Types/PageProps'
 
-defineProps<{ userQuiz: UserQuiz }>()
+defineProps<{ userQuiz: UserQuiz } & PageProps>()
 const networkErrorMessage = ref(false)
 
 function handleAnswer(question: UserQuestion, selectedAnswer: number) {
@@ -17,12 +18,12 @@ function handleAnswer(question: UserQuestion, selectedAnswer: number) {
 </script>
 
 <template>
-  <QuizLayout 
+  <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>
 
diff --git a/resources/js/Pages/User/QuizResult.vue b/resources/js/Pages/User/QuizResult.vue
index 048838dd..b69b162c 100644
--- a/resources/js/Pages/User/QuizResult.vue
+++ b/resources/js/Pages/User/QuizResult.vue
@@ -6,8 +6,9 @@ import {computed} from 'vue'
 import LinkButton from '@/components/Common/LinkButton.vue'
 import {Head} from '@inertiajs/vue3'
 import QuestionResult from '@/components/QuizResult/QuestionResult.vue'
+import {type PageProps} from '@/Types/PageProps'
 
-const props = defineProps<{ userQuiz: UserQuiz, hasRanking: boolean }>()
+const props = defineProps<{ userQuiz: UserQuiz, hasRanking: boolean } & PageProps>()
 const duration = secondsToHour(calcSecondsBetweenDates(props.userQuiz.closedAt, props.userQuiz.createdAt))
 const points = computed(() =>
   props.userQuiz.questions.filter(
@@ -18,7 +19,7 @@ const points = computed(() =>
 
 <template>
   <Head :title="`${userQuiz.title} - Wyniki`" />
-  
+
   <Divider>
     <template #default>
       <h1 class="font-bold text-lg text-primary whitespace-nowrap">
diff --git a/resources/js/Pages/User/Ranking.vue b/resources/js/Pages/User/Ranking.vue
index bdedcf85..b0552879 100644
--- a/resources/js/Pages/User/Ranking.vue
+++ b/resources/js/Pages/User/Ranking.vue
@@ -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/Address.d.ts b/resources/js/Types/Address.d.ts
new file mode 100644
index 00000000..78f6eeed
--- /dev/null
+++ b/resources/js/Types/Address.d.ts
@@ -0,0 +1,7 @@
+interface Address {
+  city: string
+  street: string
+  buildingNumber: string
+  apartmentNumber?: string
+  zipCode: string
+}
diff --git a/resources/js/Types/ButtonFrameProps.d.ts b/resources/js/Types/ButtonFrameProps.d.ts
index d78a3d7c..7cc2f6bf 100644
--- a/resources/js/Types/ButtonFrameProps.d.ts
+++ b/resources/js/Types/ButtonFrameProps.d.ts
@@ -4,4 +4,5 @@ export interface ButtonFrameProps {
   large?: boolean
   disabled?: boolean
   text?: boolean
+  icon?: boolean
 }
diff --git a/resources/js/Types/CRUD.d.ts b/resources/js/Types/CRUD.d.ts
new file mode 100644
index 00000000..1585e37f
--- /dev/null
+++ b/resources/js/Types/CRUD.d.ts
@@ -0,0 +1,5 @@
+interface CRUDActions {
+  update: string
+  new: string
+  delete?: string
+}
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/School.d.ts b/resources/js/Types/School.d.ts
index 60f23cd5..c02d4f47 100644
--- a/resources/js/Types/School.d.ts
+++ b/resources/js/Types/School.d.ts
@@ -1,5 +1,13 @@
 interface School {
   id: number
   name: string
+  regon: string
+  numberOfStudents: number
   city: string
+  street: string
+  buildingNumber: string
+  apartmentNumber?: string
+  zipCode: string
+  createdAt: string
+  updatedAt: string
 }
diff --git a/resources/js/Types/Sort.d.ts b/resources/js/Types/Sort.d.ts
new file mode 100644
index 00000000..ffbb14e3
--- /dev/null
+++ b/resources/js/Types/Sort.d.ts
@@ -0,0 +1,5 @@
+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 5e5bef13..dbc9c736 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/components/Common/AddressInput.vue b/resources/js/components/Common/AddressInput.vue
new file mode 100644
index 00000000..788a105d
--- /dev/null
+++ b/resources/js/components/Common/AddressInput.vue
@@ -0,0 +1,62 @@
+<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 })
+
+defineProps<{
+  errors: Errors
+  disabled?: boolean
+}>()
+</script>
+
+<template>
+  <CrudInput
+    v-model="address.street"
+    name="street"
+    label="Ulica:"
+    :error="errors.street"
+    :editing="!disabled"
+  />
+
+  <CrudInput
+    v-model="address.buildingNumber"
+    name="building_number"
+    label="Numer budynku:"
+    :error="errors.building_number"
+    :editing="!disabled"
+  />
+
+  <CrudInput
+    v-model="address.apartmentNumber"
+    name="apartment_number"
+    label="Numer lokalu:"
+    :error="errors.apartment_number"
+    :editing="!disabled"
+  />
+
+  <InputWrapper
+    :error="errors.zip_code"
+    :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"
+    name="city"
+    label="Miasto:"
+    :error="errors.city"
+    :editing="!disabled"
+  />
+</template>
diff --git a/resources/js/components/Common/Banner.vue b/resources/js/components/Common/Banner.vue
index 5d78863c..189787aa 100644
--- a/resources/js/components/Common/Banner.vue
+++ b/resources/js/components/Common/Banner.vue
@@ -1,38 +1,33 @@
 <script setup lang="ts">
 import { XMarkIcon } from '@heroicons/vue/20/solid'
-import { computed, watch } from 'vue'
+import { watch } from 'vue'
 
+const emit = defineEmits(['close'])
 const props = defineProps<{ show?: boolean, hideCloseButton?: boolean, message?:string }>()
-const model = defineModel<string>()
-const content = computed(() => model.value ?? props.message)
-
-if (props.message !== undefined && model.value !== undefined) {
-  throw new Error('You can only use either `message` or `v-model` in `Banner`')
-}
-
-function close() {
-  model.value = ''
-}
 
 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': !content || !show }"
+  <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"
   >
-    <p> {{ content }} </p>
+    <p> {{ message }} </p>
     <div class="flex flex-1 justify-end">
-      <button v-if="!message" 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 85760fa0..cab6ee73 100644
--- a/resources/js/components/Common/Button.vue
+++ b/resources/js/components/Common/Button.vue
@@ -9,7 +9,7 @@ const emit = defineEmits(['click'])
 
 <template>
   <button :class="{ 'w-full flex justify-center' : large }" :disabled :type="type" @click="emit('click')">
-    <ButtonFrame :disabled :small :extra-small :large :text>
+    <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 fbe5e43e..4875faa0 100644
--- a/resources/js/components/Common/ButtonFrame.vue
+++ b/resources/js/components/Common/ButtonFrame.vue
@@ -8,12 +8,13 @@ defineProps<ButtonFrameProps>()
   <div
     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,
+      '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-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,
+      'focus:rounded-xl text-black hover:text-primary-800 p-0 font-semibold': text,
+      'bg-primary text-white hover:bg-primary-950 py-2.5 font-bold': !text,
+      'rounded-xl px-4 py-2.5': !text && !icon,
       'opacity-50 pointer-events-none': disabled,
     }"
   >
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 7f8bb9a3..7093c7f1 100644
--- a/resources/js/components/Common/FormButton.vue
+++ b/resources/js/components/Common/FormButton.vue
@@ -55,7 +55,7 @@ function onProcessing(isProcessing:boolean) {
     <ButtonFrame
       :disabled="disabled || processing"
       :class="buttonClass"
-      :small :extra-small :large :text
+      :small :extra-small :large :text :icon
     >
       <slot />
     </ButtonFrame>
diff --git a/resources/js/components/Common/LinkButton.vue b/resources/js/components/Common/LinkButton.vue
index c378b74b..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" :class="{ 'w-full flex justify-center' : large }">
+  <a v-if="!disabled" :href="href" :class="{ 'w-full flex justify-center' : large }">
     <ButtonFrame
       :class="buttonClass"
-      :disabled :small :extra-small :large :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..78164267
--- /dev/null
+++ b/resources/js/components/Common/NoContent.vue
@@ -0,0 +1,15 @@
+<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-2xl mb-4 text-primary font-bold">{{ title }}</h1>
+    <p class="mb-8 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..6dab43f0
--- /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="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/WarningMessageBox.vue b/resources/js/components/Common/WarningMessageBox.vue
new file mode 100644
index 00000000..6ad7b6ac
--- /dev/null
+++ b/resources/js/components/Common/WarningMessageBox.vue
@@ -0,0 +1,35 @@
+<script lang="ts" setup>
+import MessageBox from '@/components/Common/MessageBox.vue'
+import { ExclamationTriangleIcon } from '@heroicons/vue/24/outline'
+
+defineProps<{
+  open: boolean
+  hideCancelButton?: boolean
+}>()
+
+const emit = defineEmits(['close'])
+
+</script>
+
+<template>
+  <MessageBox :open="open" @close="emit('close')">
+    <template #message>
+      <div class="flex gap-5">
+        <div class="bg-red/10 p-5 rounded-full h-fit">
+          <ExclamationTriangleIcon class="size-6 text-red" />
+        </div>
+        <div>
+          <slot name="message" />
+        </div>
+      </div>
+    </template>
+
+    <template #buttons>
+      <button v-if="!hideCancelButton" class="px-2 font-bold" @click="emit('close')">
+        Anuluj
+      </button>
+
+      <slot name="buttons" />
+    </template>
+  </MessageBox>
+</template>
diff --git a/resources/js/components/Common/ZipCodeInput.vue b/resources/js/components/Common/ZipCodeInput.vue
new file mode 100644
index 00000000..906cda3d
--- /dev/null
+++ b/resources/js/components/Common/ZipCodeInput.vue
@@ -0,0 +1,39 @@
+<script setup lang="ts">
+import vDynamicInputWidth from '@/Helpers/vDynamicInputWidth'
+
+const zipCode = defineModel<string>({ required: true })
+
+defineProps<{
+  editing: boolean
+  name: string
+  error?: string
+}>()
+
+function handleInput() {
+  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/CrudInput.vue b/resources/js/components/Crud/CrudInput.vue
new file mode 100644
index 00000000..6ee6fdb3
--- /dev/null
+++ b/resources/js/components/Crud/CrudInput.vue
@@ -0,0 +1,37 @@
+<script setup lang="ts" generic="T">
+import InputWrapper from '@/components/QuizzesPanel/InputWrapper.vue'
+import vDynamicInputWidth from '@/Helpers/vDynamicInputWidth'
+
+const value = defineModel<T>({ required: true })
+
+defineProps<{
+  editing: boolean
+  label?: string
+  name: string
+  error?: string
+}>()
+</script>
+
+<template>
+  <InputWrapper
+    :error="error"
+    :hide-error="!editing"
+    :hide-content="!value && !editing"
+    :label="label"
+    :class="{ 'hidden': !value && !editing }"
+  >
+    <input
+      v-model="value"
+      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"
+    >
+  </InputWrapper>
+</template>
diff --git a/resources/js/components/Crud/CrudItem.vue b/resources/js/components/Crud/CrudItem.vue
new file mode 100644
index 00000000..3935fca4
--- /dev/null
+++ b/resources/js/components/Crud/CrudItem.vue
@@ -0,0 +1,130 @@
+<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'
+import {ref} from 'vue'
+import { CheckIcon, PencilIcon, TrashIcon, XMarkIcon } from '@heroicons/vue/24/outline'
+import { vAutoAnimate } from '@formkit/auto-animate'
+import vDynamicInputWidth from '@/Helpers/vDynamicInputWidth'
+import WarningMessageBox from '@/components/Common/WarningMessageBox.vue'
+import {type Errors, type RequestPayload} from '@inertiajs/core'
+import { formatDate } from '@/Helpers/Format'
+
+const props = defineProps<{
+  item: T
+  resourceName: string
+  deletable?: boolean
+}>()
+
+defineSlots<{
+  deleteMessage: (scope: { item: T }) => any
+  actions: () => any
+  title: (scope: { item: T, editing: boolean, errors: Errors }) => any
+  data: (scope: { item: T, editing: boolean, errors: Errors }) => any
+}>()
+
+const item = ref<T>(JSON.parse(JSON.stringify(props.item)))
+const editing = ref(false)
+const { processing, errors } = useRequestResolution()
+const showDeleteMessage = ref(false)
+</script>
+
+<template>
+  <WarningMessageBox :open="showDeleteMessage" @close="showDeleteMessage = false">
+    <template #message>
+      <slot name="deleteMessage" :item="item as T" />
+    </template>
+
+    <template #buttons>
+      <RequestWrapper
+        class="bg-red font-bold text-white rounded-lg px-4 py-2"
+        title="Usuń"
+        method="delete"
+        :href="`/admin/${resourceName}/${item.id}`"
+        @click="showDeleteMessage = false"
+      >
+        Usuń
+      </RequestWrapper>
+    </template>
+  </WarningMessageBox>
+
+  <div v-auto-animate class="flex flex-col gap-1 p-5 bg-white/70 border-2 rounded-xl shadow-sm">
+    <Transition>
+      <div v-show="processing" class="absolute bg-white/50 backdrop-blur-md z-10 size-full left-0 flex items-center justify-center -mt-4 rounded-xl">
+        <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" />
+      </div>
+    </Transition>
+
+    <div class="flex justify-between">
+      <div class="size-full md:h-auto px-0">
+        <slot name="title" :item="item as T" :editing="editing" :errors="errors">
+          <InputWrapper
+            :has-content="!!item.name || editing"
+            :error="errors.name"
+            :show-error="editing"
+          >
+            <input
+              v-model="item.name"
+              v-dynamic-input-width
+              type="text"
+              name="name"
+              autocomplete="off"
+              class="w-full outline-none font-bold border-b border-transparent duration-200 transition-colors text-lg bg-transparent focus:border-b-primary"
+              :class="{
+                'border-b-primary/30 duration-200 transition-colors hover:border-b-primary/60 text-primary' : editing,
+                'border-b-red' : errors.name
+              }"
+              :disabled="!editing"
+            >
+          </InputWrapper>
+        </slot>
+
+        <div class="h-full md:hidden pt-1">
+          <slot name="data" :item="item as T" :editing="editing" :errors="errors" />
+        </div>
+      </div>
+
+      <div class="flex flex-col sm:flex-row pl-5 gap-5 h-fit">
+        <button v-if="!editing" title="Edytuj" @click="editing = true">
+          <PencilIcon class="icon slide-up-animation" />
+        </button>
+
+        <template v-if="!editing">
+          <slot name="actions" />
+        </template>
+
+        <template v-if="editing">
+          <button
+            title="Anuluj edycje"
+            @click="() => { item = JSON.parse(JSON.stringify(props.item)); editing = false; errors={} }"
+          >
+            <XMarkIcon class="icon" />
+          </button>
+
+          <RequestWrapper
+            title="Zapisz zmiany"
+            method="patch"
+            :href="`/admin/${resourceName}/${item.id}`"
+            :data="{ ...item as RequestPayload }"
+            @success="editing = false"
+          >
+            <CheckIcon class="icon" title="Zapisz zmiany" />
+          </RequestWrapper>
+        </template>
+
+        <button v-if="deletable" title="Usuń" @click="showDeleteMessage = true">
+          <TrashIcon class="icon slide-up-animation text-red hover:text-red-500" />
+        </button>
+      </div>
+    </div>
+
+    <div class="w-full hidden md:block">
+      <slot name="data" :item="item as T" :editing="editing" :errors="errors" />
+    </div>
+
+    <footer v-if="editing" class="flex flex-col justify-end text-right sm:flex-row gap-x-4">
+      <span class="text-gray-400 text-xs"> Utworzony: {{ formatDate(item.createdAt) }}</span>
+      <span class="text-gray-400 text-xs"> Ostatnio edytowany: {{ formatDate(item.updatedAt) }}</span>
+    </footer>
+  </div>
+</template>
diff --git a/resources/js/components/Crud/CrudNewItem.vue b/resources/js/components/Crud/CrudNewItem.vue
new file mode 100644
index 00000000..64980945
--- /dev/null
+++ b/resources/js/components/Crud/CrudNewItem.vue
@@ -0,0 +1,62 @@
+<script setup lang="ts" generic="T">
+import useRequestResolution from '@/Helpers/RequestResolution'
+import RequestWrapper from '@/components/Common/RequestWrapper.vue'
+import { CheckIcon, XMarkIcon } from '@heroicons/vue/24/outline'
+import { vAutoAnimate } from '@formkit/auto-animate'
+import {type Errors, type RequestPayload} from '@inertiajs/core'
+import {ref} from 'vue'
+
+const props = defineProps<{ resourceName: string, newItemData: T }>()
+const emit = defineEmits(['done'])
+const item = ref(props.newItemData)
+
+defineSlots<{
+  title: (scope: { item: T, editing: boolean, errors: Errors }) => any
+  data: (scope: { item: T, editing: boolean, errors: Errors }) => any
+}>()
+
+const { processing, errors } = useRequestResolution()
+</script>
+
+<template>
+  <div v-auto-animate class="flex flex-col gap-1 p-5 bg-white/70 border-2 rounded-xl shadow-sm">
+    <Transition>
+      <div v-show="processing" class="absolute bg-white/50 backdrop-blur-md z-10 size-full left-0 flex items-center justify-center -mt-4 rounded-xl">
+        <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" />
+      </div>
+    </Transition>
+
+    <div class="flex justify-between">
+      <div class="size-full md:h-auto px-0">
+        <slot name="title" :item="item as T" :editing="true" :errors="errors" />
+
+        <div class="h-full md:hidden pt-1">
+          <slot name="data" :item="item as T" :editing="true" :errors="errors" />
+        </div>
+      </div>
+
+      <div class="flex flex-col md:flex-row pl-5 gap-5 h-fit">
+        <button
+          title="Anuluj"
+          @click="emit('done')"
+        >
+          <XMarkIcon class="icon" />
+        </button>
+
+        <RequestWrapper
+          title="Zapisz"
+          method="post"
+          :href="`/admin/${resourceName}`"
+          :data="{ ...item as RequestPayload }"
+          @success="emit('done')"
+        >
+          <CheckIcon class="icon" title="Zapisz" />
+        </RequestWrapper>
+      </div>
+    </div>
+
+    <div class="w-full hidden md:block">
+      <slot name="data" :item="item as T" :editing="true" :errors="errors" />
+    </div>
+  </div>
+</template>
diff --git a/resources/js/components/Crud/CrudPage.vue b/resources/js/components/Crud/CrudPage.vue
new file mode 100644
index 00000000..25854322
--- /dev/null
+++ b/resources/js/components/Crud/CrudPage.vue
@@ -0,0 +1,148 @@
+<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 {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: Pagination<T>
+  options: SortOption[]
+  customQueries?: () => string[]
+  customSearch?: (text: string | undefined) => string | undefined
+  displaySearchInLowerCase?: boolean
+  resourceName: string
+  newButtonText: string
+  newItemData: N
+  deletable?: boolean
+  creatable?: boolean
+  mobileNav?: boolean
+}>()
+
+defineSlots<{
+  actions: () => any
+  title: (scope: { item: T, editing: boolean, errors: Errors }) => any
+  deleteMessage: (scope: { item: T }) => any
+  item: (scope: { item: T }) => any
+  newItem: (scope: { newItemMode: boolean }) => any
+  itemActions: (scope: { item: T }) => any
+  itemData: (scope: { item: T, editing: boolean, errors: Errors }) => any
+  noContent: (scope: { search: boolean }) => any
+}>()
+
+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 }">
+      <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">
+          <ArrowsUpDownIcon class="size-6" />
+          <span class="hidden sm:block">Sortuj</span>
+        </div>
+      </Dropdown>
+
+      <slot name="actions">
+        <Expand />
+      </slot>
+
+      <Button
+        v-if="creatable"
+        class="rounded-xl"
+        :class="{'cursor-pointer': !newItemMode}"
+        button-class="pl-3 font-bold"
+        :disabled="newItemMode"
+        @click="newItemMode = true"
+      >
+        <PlusCircleIcon class="size-6 text-white" /> {{ newButtonText }}
+      </Button>
+    </div>
+
+    <div class="flex w-full px-4 mt-2 justify-between gap-2">
+      <SearchBar class="w-full max-w-96" :default-value="displaySearchInLowerCase ? params.search?.toLowerCase() : params.search" @search="handleSearch" />
+      <Pagination :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">
+          <CrudNewItem :new-item-data="newItemData" :resource-name="resourceName" @done="newItemMode = false">
+            <template #title="data">
+              <slot name="title" v-bind="data as any" />
+            </template>
+
+            <template #data="data">
+              <slot name="itemData" v-bind="data as any" />
+            </template>
+          </CrudNewItem>
+        </slot>
+      </template>
+
+      <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>
+
+          <template #title="data">
+            <slot name="title" v-bind="data" />
+          </template>
+
+          <template #actions>
+            <slot name="itemActions" :item="item" />
+          </template>
+
+          <template #data="data">
+            <slot name="itemData" v-bind="data" />
+          </template>
+        </CrudItem>
+      </slot>
+
+      <template v-if="items.data.length === 0">
+        <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 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..38afbf54
--- /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 items-center text-gray-400 gap-1 rounded-xl h-10 bg-gray-100">
+    <input
+      ref="input"
+      v-model="text"
+      type="text"
+      autocomplete="off"
+      placeholder="Szukaj"
+      class="pl-2 transition-none size-full outline-none text-primary text-left rounded-xl 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-xl" @click="emit('search', text);">
+      <MagnifyingGlassIcon class="size-5" />
+    </div>
+  </div>
+</template>
diff --git a/resources/js/components/Home/RegisterForm.vue b/resources/js/components/Home/RegisterForm.vue
index 4cd8f1ab..2b83919b 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,7 +57,7 @@ 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
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/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/QuizzesPanel/QuestionComponent.vue b/resources/js/components/QuizzesPanel/QuestionComponent.vue
index 767ae42b..e14cfa7d 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'
 
@@ -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"
       @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 a5f92f8c..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)
@@ -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) {
@@ -54,13 +53,12 @@ function toggleSelection(isSelected:boolean) {
 
 function toggleEditing(isEditing:boolean){
   editing.value = isEditing
-  toggleSelection(isEditing) 
+  toggleSelection(isEditing)
 }
 </script>
 
 <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
@@ -104,7 +102,7 @@ function toggleEditing(isEditing:boolean){
     />
 
     <template v-if="selected">
-      <InputWrapper 
+      <InputWrapper
         v-for="(question, idx) of quiz.questions"
         :key="getKey(question)"
         :error="errors[`questions.${idx}.text`] ?? ''"
diff --git a/resources/js/components/QuizzesPanel/QuizNavbar.vue b/resources/js/components/QuizzesPanel/QuizNavbar.vue
index d4cccd11..ce98c57e 100644
--- a/resources/js/components/QuizzesPanel/QuizNavbar.vue
+++ b/resources/js/components/QuizzesPanel/QuizNavbar.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
 import { computed, ref } from 'vue'
-import { CheckIcon, CloudArrowUpIcon, DocumentDuplicateIcon, ExclamationTriangleIcon, PencilIcon, PlayIcon, 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 RequestWrapper from '@/components/Common/RequestWrapper.vue'
-import MessageBox from '@/components/Common/MessageBox.vue'
 import { formatDate } from '@/Helpers/Format'
+import WarningMessageBox from '@/components/Common/WarningMessageBox.vue'
 
 const props = defineProps<{
   archived:boolean
@@ -72,24 +72,13 @@ function sanitizeData() {
 </script>
 
 <template>
-  <MessageBox :open="showDeleteMessage" @close="showDeleteMessage = false">
+  <WarningMessageBox :open="showDeleteMessage" @close="showDeleteMessage = false">
     <template #message>
-      <div class="flex gap-5">
-        <div class="bg-red/10 p-5 rounded-full h-fit">
-          <ExclamationTriangleIcon class="size-6 text-red" />
-        </div>
-        <div>
-          <b class="text-[1.1rem] text-gray-900">Usunąć test "{{ quiz.title }}"?</b>
-          <p class="text-gray-500">Test zostanie usunięty bezpowrotnie.</p>
-        </div>
-      </div>
+      <b class="text-[1.1rem] text-gray-900">Usunąć test "{{ quiz.title }}"?</b>
+      <p class="text-gray-500">Test zostanie usunięty bezpowrotnie.</p>
     </template>
 
     <template #buttons>
-      <button class="px-2 font-bold" @click="showDeleteMessage = false">
-        Anuluj
-      </button>
-
       <RequestWrapper
         class="bg-red font-bold text-white rounded-lg px-4 py-2"
         title="Usuń test"
@@ -100,8 +89,8 @@ function sanitizeData() {
         Usuń
       </RequestWrapper>
     </template>
-  </MessageBox>
-  
+  </WarningMessageBox>
+
   <div class="flex gap-5 pl-5 h-fit">
     <a
       v-if="locked"
@@ -135,7 +124,7 @@ function sanitizeData() {
     </template>
 
     <RequestWrapper
-      v-if="!editing" 
+      v-if="!editing"
       title="Skopiuj test"
       method="post"
       :href="`/admin/quizzes/${quiz.id}/clone`"
@@ -143,10 +132,10 @@ 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}`"
diff --git a/resources/js/Layouts/QuizLayout.vue b/resources/js/components/UserQuiz/QuizPage.vue
similarity index 100%
rename from resources/js/Layouts/QuizLayout.vue
rename to resources/js/components/UserQuiz/QuizPage.vue
diff --git a/resources/views/emails/auth/reset-password.blade.php b/resources/views/emails/auth/reset-password.blade.php
index f9aeb8a8..aaefaa8d 100644
--- a/resources/views/emails/auth/reset-password.blade.php
+++ b/resources/views/emails/auth/reset-password.blade.php
@@ -14,10 +14,10 @@
     </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>
@@ -25,7 +25,7 @@
         <p style="margin-top: 16px; ">Pozdrawiamy,<br><span style="color: #262C89;">{{ 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..09cd9c20 100644
--- a/resources/views/emails/auth/verify.blade.php
+++ b/resources/views/emails/auth/verify.blade.php
@@ -14,10 +14,10 @@
     </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>
@@ -27,7 +27,7 @@
         <p style="margin-top: 16px; ">Pozdrawiamy,<br><span style="color: #262C89;">{{ 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/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/TestGetSchoolDataService.php b/tests/Feature/GetSchoolDataServiceTest.php
similarity index 86%
rename from tests/Feature/TestGetSchoolDataService.php
rename to tests/Feature/GetSchoolDataServiceTest.php
index 3c73b616..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;
 
@@ -46,6 +46,7 @@ public function testFetchSchools(): void
                         "numerBudynku" => "13",
                         "numerLokalu" => "1c",
                         "kodPocztowy" => "00-000",
+                        "regon" => "356855674",
                     ],
                     [
                         "id" => 2,
@@ -55,6 +56,7 @@ public function testFetchSchools(): void
                         "numerBudynku" => "20",
                         "numerLokalu" => "2c",
                         "kodPocztowy" => "00-000",
+                        "regon" => "356855675",
                     ],
                 ],
                 "hydra:view" => [],
@@ -71,6 +73,7 @@ public function testFetchSchools(): void
             "building_number" => "13",
             "apartment_number" => "1c",
             "zip_code" => "00-000",
+            "regon" => "356855674",
         ]);
 
         $this->assertDatabaseHas("schools", [
@@ -80,6 +83,7 @@ public function testFetchSchools(): void
             "building_number" => "20",
             "apartment_number" => "2c",
             "zip_code" => "00-000",
+            "regon" => "356855675",
         ]);
     }
 
@@ -96,6 +100,7 @@ public function testFetchSchoolsWithAlreadyFetchedData(): void
                         "numerBudynku" => "13",
                         "numerLokalu" => "1c",
                         "kodPocztowy" => "00-000",
+                        "regon" => "356855674",
                     ],
                     [
                         "id" => 2,
@@ -105,6 +110,7 @@ public function testFetchSchoolsWithAlreadyFetchedData(): void
                         "numerBudynku" => "20",
                         "numerLokalu" => "2c",
                         "kodPocztowy" => "00-000",
+                        "regon" => "356855675",
                     ],
                 ],
                 "hydra:view" => [],
@@ -112,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/QuizTest.php b/tests/Feature/QuizTest.php
index 715e1539..7462051e 100644
--- a/tests/Feature/QuizTest.php
+++ b/tests/Feature/QuizTest.php
@@ -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),
             );
     }
 
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/SchoolTest.php b/tests/Feature/SchoolTest.php
index 74988f5d..7aba0345 100644
--- a/tests/Feature/SchoolTest.php
+++ b/tests/Feature/SchoolTest.php
@@ -43,6 +43,7 @@ public function testAdminCanCreateSchool(): void
         $data = [
             "name" => "test",
             "city" => "Moria",
+            "regon" => "743428671",
             "street" => "example",
             "building_number" => "3",
             "zip_code" => "00-120",
@@ -73,6 +74,7 @@ public function testAdminCanEditSchool(): void
             ->patch("/admin/schools/{$school->id}", [
                 "name" => "test",
                 "city" => "Moria",
+                "regon" => "743428671",
                 "street" => "example",
                 "building_number" => "3",
                 "apartment_number" => "2A",
@@ -84,6 +86,7 @@ public function testAdminCanEditSchool(): void
             "id" => $school->id,
             "name" => "test",
             "city" => "Moria",
+            "regon" => "743428671",
             "street" => "example",
             "building_number" => "3",
             "apartment_number" => "2A",
@@ -171,6 +174,7 @@ public function testAdminCanCheckFetchingProgress(): void
             ->get("/admin/schools/status")
             ->assertJson([
                 "done" => true,
+                "count" => 0,
             ]);
 
         $this->actingAs($this->admin)
@@ -185,6 +189,7 @@ public function testAdminCanCheckFetchingProgress(): void
             ->get("/admin/schools/status")
             ->assertJson([
                 "done" => false,
+                "count" => 0,
             ]);
     }
 }
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..ed7ed74f
--- /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", "asc"], $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);
+    }
+}