diff --git a/app/Actions/ActivateSemesterAction.php b/app/Actions/ActivateSemesterAction.php
index d4a1afb..bceffd5 100644
--- a/app/Actions/ActivateSemesterAction.php
+++ b/app/Actions/ActivateSemesterAction.php
@@ -24,6 +24,10 @@ public function execute(Semester $semester): void
 
             $semester->update(["active" => !$semester->active]);
 
+            if ($semester->active) {
+                Semester::query()->whereNot("id", $semester->id)->update(["active" => false]);
+            }
+
             $this->db->commit();
         } catch (Exception $exception) {
             $this->db->rollBack();
diff --git a/app/DTOs/CoursePublicData.php b/app/DTOs/CoursePublicData.php
index f689701..c702a42 100644
--- a/app/DTOs/CoursePublicData.php
+++ b/app/DTOs/CoursePublicData.php
@@ -8,6 +8,7 @@
 use Keating\Enums\ClassType;
 use Keating\Enums\SemesterName;
 use Keating\Models\Course;
+use Keating\Models\CourseSemester;
 
 readonly class CoursePublicData
 {
@@ -40,7 +41,11 @@ public static function fromModel(Course $course, ?Collection $activeSemesters =
             typeAbbreviation: ClassType::abbreviationLabels()[$course->type],
             field: $course->field->name,
             fieldAbbreviation: $course->field->abbreviation,
-            active: $activeSemesters && ($activeSemesters->contains($course->getRomanizedSemester()) || $activeSemesters->contains($course->semester)),
+            active: CourseSemester::query()
+                ->join("semesters", "course_semester.semester_id", "=", "semesters.id")
+                ->where("semesters.active", true)
+                ->where("course_semester.course_id", $course->id)
+                ->count() > 0,
         );
     }
 }
diff --git a/app/DTOs/CourseSemesterData.php b/app/DTOs/CourseSemesterData.php
index f9cf7f2..5297d42 100644
--- a/app/DTOs/CourseSemesterData.php
+++ b/app/DTOs/CourseSemesterData.php
@@ -11,6 +11,7 @@
     public function __construct(
         public string $id,
         public string $course,
+        public string $courseId,
         public string $semester,
         public string $semesterId,
         public int $groupsCount,
@@ -21,6 +22,7 @@ public static function fromModel(CourseSemester $course): self
         return new self(
             id: $course->id,
             course: $course->course->name,
+            courseId: $course->course->id,
             semester: $course->semester->name,
             semesterId: $course->semester->id,
             groupsCount: $course->groups_count ?? $course->groups->count(),
diff --git a/app/Http/Controllers/Dashboard/CourseSemesterController.php b/app/Http/Controllers/Dashboard/CourseSemesterController.php
index 7ddfff9..13a8254 100644
--- a/app/Http/Controllers/Dashboard/CourseSemesterController.php
+++ b/app/Http/Controllers/Dashboard/CourseSemesterController.php
@@ -4,6 +4,7 @@
 
 namespace Keating\Http\Controllers\Dashboard;
 
+use Exception;
 use Illuminate\Http\RedirectResponse;
 use Inertia\Response;
 use Keating\DTOs\CourseSemesterData;
@@ -20,7 +21,12 @@ class CourseSemesterController
     public function index(): Response
     {
         $courses = CourseSemester::query()
+            ->join("semesters", "semesters.id", "=", "course_semester.semester_id")
+            ->join("courses", "courses.id", "=", "course_semester.course_id")
             ->withCount("groups")
+            ->orderByDesc("semesters.active")
+            ->orderByDesc("semesters.id")
+            ->orderBy("courses.semester")
             ->orderBy("created_at")
             ->get();
 
@@ -49,22 +55,17 @@ public function store(CourseSemesterRequest $request): RedirectResponse
             ->with("success", "Dodano kurs");
     }
 
-    public function show(CourseSemester $course): Response
-    {
-        return inertia("Dashboard/CourseSemester/Show", [
-            "course" => CourseSemesterData::fromModel($course),
-            "groups" => $course->groups->map(fn($group): GroupData => GroupData::fromModel($group)),
-            "studyForms" => Options::forEnum(StudyForm::class)->toArray(),
-        ]);
-    }
-
+    /**
+     * @throws Exception
+     */
     public function edit(CourseSemester $course): Response
     {
         return inertia("Dashboard/CourseSemester/Edit", [
-            "course" => $course,
+            "course" => CourseSemesterData::fromModel($course),
+            "courses" => Course::query()->get(["id", "name"]),
+            "semesters" => Semester::query()->orderByDesc("id")->get(["id", "name"]),
+            "groups" => $course->groups->map(fn($group): GroupData => GroupData::fromModel($group)),
             "studyForms" => Options::forEnum(StudyForm::class)->toArray(),
-            "courses" => Course::all(["id", "name"]),
-            "semesters" => Semester::all(["id", "name"]),
         ]);
     }
 
diff --git a/app/Http/Controllers/Dashboard/SemesterController.php b/app/Http/Controllers/Dashboard/SemesterController.php
index aaab465..222774a 100644
--- a/app/Http/Controllers/Dashboard/SemesterController.php
+++ b/app/Http/Controllers/Dashboard/SemesterController.php
@@ -16,7 +16,9 @@ class SemesterController
     public function index(): Response
     {
         $semesters = Semester::query()
+            ->orderByDesc("active")
             ->orderByDesc("created_at")
+            ->orderByDesc("id")
             ->get();
 
         return inertia("Dashboard/Semester/Index", [
@@ -71,7 +73,7 @@ public function toggleActive(Semester $semester, ActivateSemesterAction $activat
 
             return redirect()->back()
                 ->with("success", "Semestr aktywny");
-        } catch (Exception $e) {
+        } catch (Exception) {
             return redirect()->back()
                 ->with("error", "Wystąpił nieoczekiwany problem");
         }
diff --git a/app/Http/Controllers/Public/CourseController.php b/app/Http/Controllers/Public/CourseController.php
index db60712..c003455 100644
--- a/app/Http/Controllers/Public/CourseController.php
+++ b/app/Http/Controllers/Public/CourseController.php
@@ -7,20 +7,15 @@
 use Inertia\Response;
 use Keating\DTOs\CoursePublicData;
 use Keating\Models\Course;
-use Keating\Models\Semester;
 
 class CourseController
 {
     public function index(): Response
     {
-        $activeSemesters = Semester::query()
-            ->where("active", true)
-            ->pluck("name");
-
         $courses = Course::query()
             ->with("field")
             ->get()
-            ->map(fn(Course $course): CoursePublicData => CoursePublicData::fromModel($course, $activeSemesters))
+            ->map(fn(Course $course): CoursePublicData => CoursePublicData::fromModel($course))
             ->sortBy("semester")
             ->sortByDesc("active");
 
diff --git a/app/Http/Controllers/Public/GradeController.php b/app/Http/Controllers/Public/GradeController.php
index 921a63b..fb8916c 100644
--- a/app/Http/Controllers/Public/GradeController.php
+++ b/app/Http/Controllers/Public/GradeController.php
@@ -47,19 +47,18 @@ public function __invoke(Request $request, ?Semester $semester = null, ?CourseSe
                     ->where("active", true)
                     ->orderBy("priority")
                     ->get();
+
                 $students = $group->students()
                     ->whereNot("index_number", $index)
                     ->inRandomOrder()
-                    ->take(8)
                     ->get()
-                    ->push($studentByIndex)
-                    ->sortBy("index_number")
+                    ->prepend($studentByIndex)
                     ->map(fn(Student $student): StudentData => StudentData::fromModels($student, $studentByIndex, $gradeColumns));
             }
         }
 
         return inertia("Public/Grade", [
-            "semesters" => Semester::query()->get(["name", "id"]),
+            "semesters" => Semester::query()->orderByDesc("id")->get(["name", "id"]),
             "semester" => $semester,
             "courses" => $courses,
             "course" => $course,
diff --git a/app/Models/Field.php b/app/Models/Field.php
index 7cf2e68..45ba2a0 100644
--- a/app/Models/Field.php
+++ b/app/Models/Field.php
@@ -22,6 +22,7 @@ class Field extends Model
     use HasUlids;
 
     protected $fillable = [
+        "id",
         "name",
         "abbreviation",
     ];
diff --git a/database/factories/GroupFactory.php b/database/factories/GroupFactory.php
index e6204c1..ea6597b 100644
--- a/database/factories/GroupFactory.php
+++ b/database/factories/GroupFactory.php
@@ -13,7 +13,7 @@ class GroupFactory extends Factory
     public function definition(): array
     {
         return [
-            "name" => fake()->asciify("******"),
+            "name" => fake()->numerify("s#INF#"),
             "course_semester_id" => CourseSemester::factory(),
             "form" => StudyForm::Stationary->value,
         ];
diff --git a/database/factories/SemesterFactory.php b/database/factories/SemesterFactory.php
index 7929ba2..00b0e42 100644
--- a/database/factories/SemesterFactory.php
+++ b/database/factories/SemesterFactory.php
@@ -11,7 +11,7 @@ class SemesterFactory extends Factory
     public function definition(): array
     {
         return [
-            "name" => fake()->numberBetween(1, 7),
+            "name" => fake()->randomElement(["zimowy", "letni"]) . " " . fake()->year(),
             "active" => fake()->boolean,
         ];
     }
diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php
index 4b5de92..598ae00 100644
--- a/database/seeders/DatabaseSeeder.php
+++ b/database/seeders/DatabaseSeeder.php
@@ -5,12 +5,16 @@
 namespace Database\Seeders;
 
 use Illuminate\Database\Seeder;
+use Keating\Enums\SemesterName;
+use Keating\Models\Course;
 use Keating\Models\CourseSemester;
+use Keating\Models\Field;
 use Keating\Models\Grade;
 use Keating\Models\GradeColumn;
 use Keating\Models\Group;
 use Keating\Models\Section;
 use Keating\Models\SectionSettings;
+use Keating\Models\Semester;
 use Keating\Models\Setting;
 use Keating\Models\Student;
 use Keating\Models\User;
@@ -20,6 +24,7 @@ class DatabaseSeeder extends Seeder
     public function run(): void
     {
         User::factory()->create(["email" => "admin@example.com"]);
+
         Setting::factory()->create();
         Section::factory(4)->counter()->create();
         Section::factory(3)->about()->create();
@@ -29,12 +34,63 @@ public function run(): void
             "counters_enabled" => true,
             "contact_enabled" => true,
         ]);
-        $this->seedGrades();
+
+        $this->seedRealData();
     }
 
-    protected function seedGrades(): void
+    protected function seedRealData(): void
     {
-        $courses = CourseSemester::factory(5)->create();
+        $semesters = Semester::factory()->count(5)->sequence(
+            ["name" => "zimowy 2022/23", "active" => false],
+            ["name" => "letni 2022/23", "active" => false],
+            ["name" => "zimowy 2023/24", "active" => false],
+            ["name" => "letni 2023/24", "active" => false],
+            ["name" => "zimowy 2024/25", "active" => true],
+        )->create();
+
+        $fields = Field::factory()->count(3)->sequence(
+            ["name" => "Informatyka", "abbreviation" => "INF"],
+            ["name" => "Informatyka, specjalność Programowanie", "abbreviation" => "INF/PAM"],
+            ["name" => "Informatyka, specjalność Grafika", "abbreviation" => "INF/GK"],
+        )->create();
+
+        $courses = Course::factory()->count(3)->sequence(
+            [
+                "name" => "Programowanie obiektowe",
+                "abbreviation" => "PO",
+                "semester" => 3,
+                "type" => "laboratory",
+                "field_id" => $fields[1]->id,
+                "semester_name" => SemesterName::Winter->value,
+            ],
+            [
+                "name" => "Programowanie systemów internetowych",
+                "abbreviation" => "PSI",
+                "semester" => 4,
+                "type" => "lecture",
+                "field_id" => $fields[2]->id,
+                "semester_name" => SemesterName::Summer->value,
+            ],
+            [
+                "name" => "Programowanie systemów internetowych",
+                "abbreviation" => "PSI",
+                "semester" => 4,
+                "type" => "project",
+                "field_id" => $fields[2]->id,
+                "semester_name" => SemesterName::Summer->value,
+            ],
+        )->create();
+
+        $courses = CourseSemester::factory(7)->sequence(
+            ["course_id" => $courses[0]->id, "semester_id" => $semesters[4]->id],
+            ["course_id" => $courses[1]->id, "semester_id" => $semesters[3]->id],
+            ["course_id" => $courses[2]->id, "semester_id" => $semesters[3]->id],
+            ["course_id" => $courses[0]->id, "semester_id" => $semesters[2]->id],
+            ["course_id" => $courses[1]->id, "semester_id" => $semesters[1]->id],
+            ["course_id" => $courses[2]->id, "semester_id" => $semesters[1]->id],
+            ["course_id" => $courses[0]->id, "semester_id" => $semesters[0]->id],
+        )->create();
+
         $students = Student::factory(100)->create();
 
         foreach ($courses as $course) {
diff --git a/database/seeders/DemoSeeder.php b/database/seeders/DemoSeeder.php
deleted file mode 100644
index d7a6b55..0000000
--- a/database/seeders/DemoSeeder.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Database\Seeders;
-
-use Illuminate\Database\Seeder;
-use Keating\Models\News;
-
-class DemoSeeder extends Seeder
-{
-    public function run(): void
-    {
-        News::factory(20)->create();
-    }
-}
diff --git a/resources/js/Components/SectionHeader.vue b/resources/js/Components/SectionHeader.vue
index a781ae1..265d237 100644
--- a/resources/js/Components/SectionHeader.vue
+++ b/resources/js/Components/SectionHeader.vue
@@ -3,7 +3,7 @@
     <h2 class="text-3xl font-bold tracking-tight text-gray-900 sm:text-4xl">
       <slot name="header" />
     </h2>
-    <p class="mt-1 text-lg leading-8 text-gray-600">
+    <p class="mt-1 text-lg leading-6 text-gray-600">
       <slot name="subheader" />
     </p>
   </div>
diff --git a/resources/js/Layouts/PublicLayout.vue b/resources/js/Layouts/PublicLayout.vue
index 82a8b34..06cdabf 100644
--- a/resources/js/Layouts/PublicLayout.vue
+++ b/resources/js/Layouts/PublicLayout.vue
@@ -80,7 +80,7 @@ const mobileMenuOpen = ref(false)
       <div class="mx-auto max-w-7xl px-6 py-12 md:flex md:items-center md:justify-center lg:px-8">
         <div class="mt-8 md:order-1 md:mt-0">
           <p class="text-center text-xs leading-5 text-gray-500">
-            2023
+            2024
             <EllipsisHorizontalIcon class="mx-2 inline-block w-6" />
             <a class="font-semibold" href="https://github.com/blumilksoftware/keating" target="_blank">keating
               management system</a> developed at <a class="font-semibold" href="https://blumilk.pl/" target="_blank">Blumilk</a>
diff --git a/resources/js/Pages/Dashboard/ContactInfo/Edit.vue b/resources/js/Pages/Dashboard/ContactInfo/Edit.vue
index fbf425d..2a85522 100644
--- a/resources/js/Pages/Dashboard/ContactInfo/Edit.vue
+++ b/resources/js/Pages/Dashboard/ContactInfo/Edit.vue
@@ -47,7 +47,7 @@ function updateContactInfo() {
               <FormLabel for="id">
                 Id
               </FormLabel>
-              <TextInput class="opacity-75" placeholder="autogenerowany ulid" autocomplete="off" disabled />
+              <TextInput class="opacity-75" :placeholder="contactInfo.id" autocomplete="off" disabled />
             </FormGroup>
             <FormGroup>
               <FormLabel for="label">
diff --git a/resources/js/Pages/Dashboard/ContactInfo/Index.vue b/resources/js/Pages/Dashboard/ContactInfo/Index.vue
index d13608e..dd701d0 100644
--- a/resources/js/Pages/Dashboard/ContactInfo/Index.vue
+++ b/resources/js/Pages/Dashboard/ContactInfo/Index.vue
@@ -9,7 +9,6 @@ import Button from '@/Shared/Components/Buttons/Button.vue'
 import EmptyState from '@/Shared/Components/EmptyState/EmptyState.vue'
 import RemoveModal from '@/Shared/Modals/RemoveModal.vue'
 import { ref } from 'vue'
-import { PencilSquareIcon, XCircleIcon } from '@heroicons/vue/24/outline'
 import ManagementHeader from '@/Shared/Components/ManagementHeader.vue'
 import ManagementHeaderItem from '@/Shared/Components/ManagementHeaderItem.vue'
 import StyledLink from '@/Shared/Components/StyledLink.vue'
@@ -74,10 +73,10 @@ const contactInfoToDeleteId = ref(0)
               </TableCell>
               <TableCell class="flex justify-end gap-2">
                 <StyledLink :href="`contact-infos/${contact.id}/edit`">
-                  <PencilSquareIcon class="w-5" />
+                  edytuj
                 </StyledLink>
                 <Button class="text-red-600" @click="[showModal = true, contactInfoToDeleteId = contact.id]">
-                  <XCircleIcon class="w-5" />
+                  usuń
                 </Button>
               </TableCell>
             </TableRow>
diff --git a/resources/js/Pages/Dashboard/Course/Edit.vue b/resources/js/Pages/Dashboard/Course/Edit.vue
index 82ace59..fc3e09a 100644
--- a/resources/js/Pages/Dashboard/Course/Edit.vue
+++ b/resources/js/Pages/Dashboard/Course/Edit.vue
@@ -12,7 +12,6 @@ import ManagementHeader from '@/Shared/Components/ManagementHeader.vue'
 import ManagementHeaderItem from '@/Shared/Components/ManagementHeaderItem.vue'
 import TextAreaEditor from '../../../Shared/Forms/TextAreaEditor.vue'
 
-
 const props = defineProps({
   course: Object,
   classTypes: Array,
@@ -20,7 +19,6 @@ const props = defineProps({
   semesterNames: Array,
 })
 
-
 const form = useForm({
   name: props.course.name,
   slug: props.course.slug,
@@ -58,7 +56,7 @@ function updateCourse() {
               <FormLabel for="id">
                 Id
               </FormLabel>
-              <TextInput class="opacity-75" placeholder="autogenerowany ulid" autocomplete="off" disabled />
+              <TextInput class="opacity-75" :placeholder="course.id" autocomplete="off" disabled />
             </FormGroup>
             <FormGroup>
               <FormLabel for="name">
diff --git a/resources/js/Pages/Dashboard/Course/Index.vue b/resources/js/Pages/Dashboard/Course/Index.vue
index c0bc8a0..3e6276e 100644
--- a/resources/js/Pages/Dashboard/Course/Index.vue
+++ b/resources/js/Pages/Dashboard/Course/Index.vue
@@ -10,7 +10,6 @@ import RemoveModal from '@/Shared/Modals/RemoveModal.vue'
 import { ref } from 'vue'
 import ManagementHeader from '@/Shared/Components/ManagementHeader.vue'
 import ManagementHeaderItem from '@/Shared/Components/ManagementHeaderItem.vue'
-import { PencilSquareIcon, XCircleIcon } from '@heroicons/vue/24/outline'
 import StyledLink from '@/Shared/Components/StyledLink.vue'
 
 defineProps({
@@ -40,7 +39,7 @@ const courseToDeleteId = ref(0)
         <template #actions>
           <span class="hidden sm:block">
             <StyledLink :href="`/dashboard/courses/create`">
-              Dodaj
+              dodaj
             </StyledLink>
           </span>
         </template>
@@ -84,10 +83,10 @@ const courseToDeleteId = ref(0)
               </TableCell>
               <TableCell class="flex justify-end gap-2">
                 <StyledLink :href="`/dashboard/courses/${course.id}/edit`">
-                  <PencilSquareIcon class="w-5" />
+                  edytuj
                 </StyledLink>
                 <Button class="text-red-600" @click="[showModal = true, courseToDeleteId = course.id]">
-                  <XCircleIcon class="w-5" />
+                  usuń
                 </Button>
               </TableCell>
             </TableRow>
diff --git a/resources/js/Pages/Dashboard/CourseSemester/Edit.vue b/resources/js/Pages/Dashboard/CourseSemester/Edit.vue
index f8a13aa..7285187 100644
--- a/resources/js/Pages/Dashboard/CourseSemester/Edit.vue
+++ b/resources/js/Pages/Dashboard/CourseSemester/Edit.vue
@@ -1,31 +1,73 @@
 <script setup>
 import DashboardLayout from '@/Layouts/DashboardLayout.vue'
 import Section from '@/Shared/Components/Section.vue'
-import Select from '@/Shared/Forms/Select.vue'
 import SubmitButton from '@/Shared/Components/Buttons/SubmitButton.vue'
 import FormGroup from '@/Shared/Forms/FormGroup.vue'
 import FormLabel from '@/Shared/Forms/FormLabel.vue'
 import TextInput from '@/Shared/Forms/TextInput.vue'
+import Select from '@/Shared/Forms/Select.vue'
+import Button from '@/Shared/Components/Buttons/Button.vue'
 import { useForm } from '@inertiajs/inertia-vue3'
 import FormError from '@/Shared/Forms/FormError.vue'
 import ManagementHeader from '@/Shared/Components/ManagementHeader.vue'
 import ManagementHeaderItem from '@/Shared/Components/ManagementHeaderItem.vue'
-
+import RemoveModal from '@/Shared/Modals/RemoveModal.vue'
+import { ref } from 'vue'
+import StyledLink from '@/Shared/Components/StyledLink.vue'
 
 const props = defineProps({
   course: Object,
   courses: Array,
   semesters: Array,
+  groups: Object,
+  studyForms: Array,
 })
 
+const showModal = ref(false)
+const groupToDeleteId = ref(null)
+const groupToEdit = ref(null)
+const showEditForm = ref(false)
+
+const courseForm = useForm({
+  course: props.course.courseId,
+  semester: props.course.semesterId,
+})
 
 const form = useForm({
-  course: props.course.course_id,
-  semester: props.course.semester_id,
+  name: '',
+  form: '',
+})
+
+const editForm = useForm({
+  name: '',
+  form: '',
 })
 
 function updateCourse() {
-  form.patch(`/dashboard/semester-courses/${props.course.id}`)
+  courseForm.patch(`/dashboard/semester-courses/${props.course.id}`)
+}
+
+function editGroup(group) {
+  groupToEdit.value = group
+  editForm.name = group.name
+  editForm.form = group.form
+  showEditForm.value = true
+}
+
+function createGroup() {
+  form.post(`/dashboard/semester-courses/${props.course.id}/groups`, {
+    onSuccess: () => {
+      form.reset()
+    },
+  })
+}
+
+function updateGroup() {
+  editForm.patch(`/dashboard/semester-courses/${props.course.id}/groups/${groupToEdit.value.id}`, {
+    onSuccess: () => {
+      showEditForm.value = false
+    },
+  })
 }
 </script>
 
@@ -34,40 +76,37 @@ function updateCourse() {
     <div class="flex flex-col gap-8">
       <ManagementHeader>
         <template #header>
-          Zarządzanie kursami w semestrze
+          Podgląd i zarządzanie kursem w semestrze
         </template>
         <template #statistics>
           <ManagementHeaderItem>
-            Formularz edycji istniejącego kursu w semestrze
+            Formularz podglądu kursu w semestrze
           </ManagementHeaderItem>
         </template>
       </ManagementHeader>
-      <form class="grid grid-cols-2" @submit.prevent="updateCourse">
+
+      <form class="grid grid-cols-2" @submit.prevent="updateCourse()">
         <Section>
           <div class="flex flex-col justify-between gap-4">
             <FormGroup>
               <FormLabel for="id">
                 Id
               </FormLabel>
-              <TextInput class="opacity-75" placeholder="autogenerowany ulid" autocomplete="off" disabled />
+              <TextInput class="opacity-75" :placeholder="course.id" autocomplete="off" disabled />
             </FormGroup>
             <FormGroup>
               <FormLabel for="course">
                 Kurs
               </FormLabel>
-              <Select id="course" v-model="form.course" :error="form.errors.course" :options="courses" label="name"
-                      item-value="id"
-              />
-              <FormError :error="form.errors.course" />
+              <Select id="course" v-model="courseForm.course" :error="courseForm.errors.course" :options="courses" label="name" item-value="id" />
+              <FormError :error="courseForm.errors.course" />
             </FormGroup>
             <FormGroup>
               <FormLabel for="semester">
                 Semestr
               </FormLabel>
-              <Select id="semester" v-model="form.semester" :error="form.errors.semester" :options="semesters" label="name"
-                      item-value="id"
-              />
-              <FormError :error="form.errors.semester" />
+              <Select id="semester" v-model="courseForm.semester" :error="courseForm.errors.semester" :options="semesters" label="name" item-value="id" />
+              <FormError :error="courseForm.errors.semester" />
             </FormGroup>
             <div class="mt-4 flex justify-end">
               <SubmitButton>
@@ -77,6 +116,112 @@ function updateCourse() {
           </div>
         </Section>
       </form>
+
+      <ManagementHeader v-if="!showEditForm">
+        <template #header>
+          Dodawanie grupy w kursie
+        </template>
+        <template #statistics>
+          <ManagementHeaderItem>
+            Formularz dodawania grupy w kursie
+          </ManagementHeaderItem>
+        </template>
+      </ManagementHeader>
+      <ManagementHeader v-else>
+        <template #header>
+          Edycja grupy w kursie
+        </template>
+        <template #statistics>
+          <ManagementHeaderItem>
+            Formularz edycji grupy w kursie
+          </ManagementHeaderItem>
+        </template>
+      </ManagementHeader>
+      <div class="grid grid-cols-2 gap-4">
+        <Section class="h-max">
+          <form v-if="!showEditForm" @submit.prevent="createGroup">
+            <div class="flex flex-col justify-between gap-4">
+              <FormGroup>
+                <FormLabel for="id">
+                  Id
+                </FormLabel>
+                <TextInput class="opacity-75" placeholder="autogenerowany ulid" autocomplete="off" disabled />
+              </FormGroup>
+              <FormGroup>
+                <FormLabel for="name">
+                  Nazwa
+                </FormLabel>
+                <TextInput id="name" v-model="form.name" :error="form.errors.name" autocomplete="off" />
+                <FormError :error="form.errors.name" />
+              </FormGroup>
+              <FormGroup>
+                <FormLabel for="type">
+                  Tryb studiów
+                </FormLabel>
+                <Select id="type" v-model="form.form" :error="form.errors.form" :options="studyForms" label="label" item-value="value" />
+                <FormError :error="form.errors.form" />
+              </FormGroup>
+              <div class="mt-4 flex justify-end">
+                <SubmitButton>
+                  Utwórz
+                </SubmitButton>
+              </div>
+            </div>
+          </form>
+          <form v-else class="gap-4" @submit.prevent="updateGroup">
+            <div class="flex flex-col justify-between gap-4">
+              <FormGroup>
+                <FormLabel for="id">
+                  Id
+                </FormLabel>
+                <TextInput class="opacity-75" :placeholder="groupToEdit.id" autocomplete="off" disabled />
+              </FormGroup>
+              <FormGroup>
+                <FormLabel for="name">
+                  Nazwa
+                </FormLabel>
+                <TextInput id="name" v-model="editForm.name" :error="editForm.errors.name" autocomplete="off" />
+                <FormError :error="editForm.errors.name" />
+              </FormGroup>
+              <FormGroup>
+                <FormLabel for="type">
+                  Tryb studiów
+                </FormLabel>
+                <Select id="type" v-model="editForm.form" :error="editForm.errors.form" :options="studyForms" label="label" item-value="value" />
+                <FormError :error="editForm.errors.form" />
+              </FormGroup>
+              <div class="mt-4 flex justify-end">
+                <SubmitButton>
+                  Zapisz
+                </SubmitButton>
+              </div>
+            </div>
+          </form>
+        </Section>
+        <div class="grid grid-cols-2 gap-4">
+          <div v-for="group in groups" :key="group.id" class="flex h-max flex-col items-center justify-center gap-4 overflow-x-auto bg-white p-4 text-center sm:rounded-lg">
+            <div class="flex">
+              {{ group.name }}
+            </div>
+            <div class="flex gap-2">
+              <StyledLink :href="`/dashboard/semester-courses/${course.id}/groups/${group.id}/grades`">
+                oceny
+              </StyledLink>
+              <StyledLink :href="`/dashboard/semester-courses/${course.id}/groups/${group.id}/students`">
+                studenci
+              </StyledLink>
+              <Button @click="editGroup(group)">
+                edytuj
+              </Button>
+              <Button class="text-red-600" @click="[showModal = true, showEditForm = false, groupToDeleteId = group.id]">
+                usuń
+              </Button>
+            </div>
+          </div>
+        </div>
+      </div>
     </div>
   </DashboardLayout>
+
+  <RemoveModal :show="showModal" :href="`/dashboard/semester-courses/${course.id}/groups/${groupToDeleteId}`" @close="showModal = false" />
 </template>
diff --git a/resources/js/Pages/Dashboard/CourseSemester/Grade/Index.vue b/resources/js/Pages/Dashboard/CourseSemester/Grade/Index.vue
index de388e7..54e3ff1 100644
--- a/resources/js/Pages/Dashboard/CourseSemester/Grade/Index.vue
+++ b/resources/js/Pages/Dashboard/CourseSemester/Grade/Index.vue
@@ -127,7 +127,7 @@ watch(searchForm, debounce(() => {
         <template #actions>
           <TextInput id="filter" v-model="searchForm.search" class="max-w-lg" placeholder="Szukaj" type="search" />
           <Button @click="[showCreateForm = true, showEditForm = false]">
-            Dodaj kolumnę
+            dodaj kolumnę
           </Button>
         </template>
       </ManagementHeader>
diff --git a/resources/js/Pages/Dashboard/CourseSemester/Index.vue b/resources/js/Pages/Dashboard/CourseSemester/Index.vue
index f9317be..f057592 100644
--- a/resources/js/Pages/Dashboard/CourseSemester/Index.vue
+++ b/resources/js/Pages/Dashboard/CourseSemester/Index.vue
@@ -10,7 +10,6 @@ import RemoveModal from '@/Shared/Modals/RemoveModal.vue'
 import { ref } from 'vue'
 import ManagementHeader from '@/Shared/Components/ManagementHeader.vue'
 import ManagementHeaderItem from '@/Shared/Components/ManagementHeaderItem.vue'
-import { PencilSquareIcon, XCircleIcon, EyeIcon } from '@heroicons/vue/24/outline'
 import StyledLink from '@/Shared/Components/StyledLink.vue'
 
 defineProps({
@@ -41,7 +40,7 @@ const courseToDeleteId = ref(0)
         <template #actions>
           <span class="hidden sm:block">
             <StyledLink :href="`/dashboard/semester-courses/create`">
-              Dodaj
+              dodaj
             </StyledLink>
           </span>
         </template>
@@ -86,13 +85,10 @@ const courseToDeleteId = ref(0)
               </TableCell>
               <TableCell class="flex justify-end gap-2">
                 <StyledLink :href="`/dashboard/semester-courses/${course.id}`">
-                  <EyeIcon class="w-5" />
-                </StyledLink>
-                <StyledLink :href="`/dashboard/semester-courses/${course.id}/edit`">
-                  <PencilSquareIcon class="w-5" />
+                  zarządzaj
                 </StyledLink>
                 <Button class="text-red-600" @click="[showModal = true, courseToDeleteId = course.id]">
-                  <XCircleIcon class="w-5" />
+                  usuń
                 </Button>
               </TableCell>
             </TableRow>
diff --git a/resources/js/Pages/Dashboard/CourseSemester/Show.vue b/resources/js/Pages/Dashboard/CourseSemester/Show.vue
deleted file mode 100644
index 8b617ee..0000000
--- a/resources/js/Pages/Dashboard/CourseSemester/Show.vue
+++ /dev/null
@@ -1,217 +0,0 @@
-<script setup>
-import DashboardLayout from '@/Layouts/DashboardLayout.vue'
-import Section from '@/Shared/Components/Section.vue'
-import SubmitButton from '@/Shared/Components/Buttons/SubmitButton.vue'
-import FormGroup from '@/Shared/Forms/FormGroup.vue'
-import FormLabel from '@/Shared/Forms/FormLabel.vue'
-import TextInput from '@/Shared/Forms/TextInput.vue'
-import Select from '@/Shared/Forms/Select.vue'
-import Button from '@/Shared/Components/Buttons/Button.vue'
-import { useForm } from '@inertiajs/inertia-vue3'
-import FormError from '@/Shared/Forms/FormError.vue'
-import ManagementHeader from '@/Shared/Components/ManagementHeader.vue'
-import ManagementHeaderItem from '@/Shared/Components/ManagementHeaderItem.vue'
-import RemoveModal from '@/Shared/Modals/RemoveModal.vue'
-import { PencilSquareIcon, UsersIcon, XCircleIcon, ChartBarIcon } from '@heroicons/vue/24/outline'
-import { ref } from 'vue'
-import StyledLink from '@/Shared/Components/StyledLink.vue'
-
-const props = defineProps({
-  course: Object,
-  groups: Object,
-  studyForms: Array,
-})
-const showModal = ref(false)
-const groupToDeleteId = ref(null)
-const groupToEdit = ref(null)
-const showEditForm = ref(false)
-const form = useForm({
-  name: '',
-  form: '',
-})
-const editForm = useForm({
-  name: '',
-  form: '',
-})
-
-function editGroup(group) {
-  groupToEdit.value = group
-  editForm.name = group.name
-  editForm.form = group.form
-  showEditForm.value = true
-}
-
-function createGroup() {
-  form.post(`/dashboard/semester-courses/${props.course.id}/groups`, {
-    onSuccess: () => {
-      form.reset()
-    },
-  })
-}
-
-function updateGroup() {
-  editForm.patch(`/dashboard/semester-courses/${props.course.id}/groups/${groupToEdit.value.id}`, {
-    onSuccess: () => {
-      showEditForm.value = false
-    },
-  })
-}
-</script>
-
-<template>
-  <DashboardLayout>
-    <div class="flex flex-col gap-8">
-      <ManagementHeader>
-        <template #header>
-          Pdogląd i zarządzanie kursem w semestrze
-        </template>
-        <template #statistics>
-          <ManagementHeaderItem>
-            Formularz podglądu kursu w semestrze
-          </ManagementHeaderItem>
-        </template>
-      </ManagementHeader>
-      <div class="grid grid-cols-2 gap-4">
-        <Section>
-          <div class="flex flex-col justify-between gap-4">
-            <FormGroup>
-              <FormLabel for="id">
-                Id
-              </FormLabel>
-              <TextInput :placeholder="course.id" autocomplete="off" disabled />
-            </FormGroup>
-            <FormGroup>
-              <FormLabel for="course">
-                Kurs
-              </FormLabel>
-              <TextInput :placeholder="course.course" autocomplete="off" disabled />
-            </FormGroup>
-            <FormGroup>
-              <FormLabel for="semester">
-                Semestr
-              </FormLabel>
-              <TextInput :placeholder="course.semester" autocomplete="off" disabled />
-            </FormGroup>
-            <FormGroup>
-              <FormLabel for="semester">
-                Liczba grup
-              </FormLabel>
-              <TextInput :placeholder="course.groupsCount" autocomplete="off" disabled />
-            </FormGroup>
-          </div>
-        </Section>
-      </div>
-      <ManagementHeader v-if="!showEditForm">
-        <template #header>
-          Dodawanie grupy w kursie
-        </template>
-        <template #statistics>
-          <ManagementHeaderItem>
-            Formularz dodawania grupy w kursie
-          </ManagementHeaderItem>
-        </template>
-      </ManagementHeader>
-      <ManagementHeader v-else>
-        <template #header>
-          Edycja grupy w kursie
-        </template>
-        <template #statistics>
-          <ManagementHeaderItem>
-            Formularz edycji grupy w kursie
-          </ManagementHeaderItem>
-        </template>
-      </ManagementHeader>
-      <div class="grid grid-cols-2 gap-4">
-        <Section class="h-max">
-          <form v-if="!showEditForm" @submit.prevent="createGroup">
-            <div class="flex flex-col justify-between gap-4">
-              <FormGroup>
-                <FormLabel for="id">
-                  Id
-                </FormLabel>
-                <TextInput class="opacity-75" placeholder="autogenerowany ulid" autocomplete="off" disabled />
-              </FormGroup>
-              <FormGroup>
-                <FormLabel for="name">
-                  Nazwa
-                </FormLabel>
-                <TextInput id="name" v-model="form.name" :error="form.errors.name" autocomplete="off" />
-                <FormError :error="form.errors.name" />
-              </FormGroup>
-              <FormGroup>
-                <FormLabel for="type">
-                  Tryb studiów
-                </FormLabel>
-                <Select id="type" v-model="form.form" :error="form.errors.form" :options="studyForms" label="label" item-value="value" />
-                <FormError :error="form.errors.form" />
-              </FormGroup>
-              <div class="mt-4 flex justify-end">
-                <SubmitButton>
-                  Utwórz
-                </SubmitButton>
-              </div>
-            </div>
-          </form>
-          <form v-else class="gap-4" @submit.prevent="updateGroup">
-            <div class="flex flex-col justify-between gap-4">
-              <FormGroup>
-                <FormLabel for="id">
-                  Id
-                </FormLabel>
-                <TextInput class="opacity-75" :placeholder="groupToEdit.id" autocomplete="off" disabled />
-              </FormGroup>
-              <FormGroup>
-                <FormLabel for="name">
-                  Nazwa
-                </FormLabel>
-                <TextInput id="name" v-model="editForm.name" :error="editForm.errors.name" autocomplete="off" />
-                <FormError :error="editForm.errors.name" />
-              </FormGroup>
-              <FormGroup>
-                <FormLabel for="type">
-                  Tryb studiów
-                </FormLabel>
-                <Select id="type" v-model="editForm.form" :error="editForm.errors.form" :options="studyForms" label="label" item-value="value" />
-                <FormError :error="editForm.errors.form" />
-              </FormGroup>
-              <div class="mt-4 flex justify-end">
-                <SubmitButton>
-                  Zapisz
-                </SubmitButton>
-              </div>
-            </div>
-          </form>
-        </Section>
-        <div class="grid grid-cols-2 gap-4">
-          <div v-for="group in groups" :key="group.id"
-               class="flex h-max cursor-pointer items-center justify-between overflow-x-auto bg-white p-4 text-center sm:rounded-lg"
-          >
-            {{ group.name }}[{{ group.formAbbreviation }}]
-            <div class="flex gap-2">
-              <StyledLink class="has-tooltip" :href="`/dashboard/semester-courses/${course.id}/groups/${group.id}/grades`">
-                <ChartBarIcon class="w-5" />
-                <span class="tooltip -ml-6 -mt-16 rounded bg-gray-500 p-1 text-white">Oceny</span>
-              </StyledLink>
-              <StyledLink class="has-tooltip" :href="`/dashboard/semester-courses/${course.id}/groups/${group.id}/students`">
-                <UsersIcon class="w-5" />
-                <span class="tooltip -ml-8 -mt-16 rounded bg-gray-500 p-1 text-white">Studenci</span>
-              </StyledLink>
-              <Button class="has-tooltip">
-                <PencilSquareIcon class="w-5" @click="editGroup(group)" />
-                <span class="tooltip -ml-10 -mt-16 rounded bg-gray-500 p-1 text-white">Edytuj grupę</span>
-              </Button>
-              <Button class="has-tooltip text-red-600" @click="[showModal = true, showEditForm = false, groupToDeleteId = group.id]">
-                <XCircleIcon class="w-5" />
-                <span class="tooltip -ml-10 -mt-16 rounded bg-rose-300 p-1 text-white">Usuń grupę</span>
-              </Button>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </DashboardLayout>
-
-  <RemoveModal :show="showModal" :href="`/dashboard/semester-courses/${course.id}/groups/${groupToDeleteId}`"
-               @close="showModal = false"
-  />
-</template>
diff --git a/resources/js/Pages/Dashboard/CourseSemester/Student/Index.vue b/resources/js/Pages/Dashboard/CourseSemester/Student/Index.vue
index c70dde8..a9e5a56 100644
--- a/resources/js/Pages/Dashboard/CourseSemester/Student/Index.vue
+++ b/resources/js/Pages/Dashboard/CourseSemester/Student/Index.vue
@@ -13,7 +13,7 @@ import { Inertia } from '@inertiajs/inertia'
 import { debounce } from 'lodash'
 import TextInput from '@/Shared/Forms/TextInput.vue'
 import { useForm } from '@inertiajs/inertia-vue3'
-import { XCircleIcon, PlusIcon } from '@heroicons/vue/24/outline'
+import { PlusIcon } from '@heroicons/vue/24/outline'
 import ManagementHeader from '@/Shared/Components/ManagementHeader.vue'
 import ManagementHeaderItem from '@/Shared/Components/ManagementHeaderItem.vue'
 
@@ -55,8 +55,10 @@ watch(form, debounce(() => {
     <div class="flex flex-col gap-8">
       <ManagementHeader>
         <template #header>
-          Zarządzanie studentami w grupie <span class="text-gray-500">{{ group.name }}</span><br>
-          dla kursu <span class="text-gray-500">{{ course.course }}</span>
+          Zarządzanie studentami w grupie
+          <span class="text-gray-500">{{ group.name }}</span>
+          <br> dla kursu
+          <span class="text-gray-500">{{ course.course }}</span>
         </template>
         <template #statistics>
           <ManagementHeaderItem>
@@ -68,21 +70,16 @@ watch(form, debounce(() => {
         </template>
         <template #actions>
           <Button @click="[studentsFormOpen = !studentsFormOpen]">
-            Dodaj
+            dodaj
           </Button>
         </template>
       </ManagementHeader>
       <div v-if="studentsFormOpen" class="border-2 border-dotted p-4 sm:rounded-lg">
-        <TextInput id="search" v-model="form.search" placeholder="Szukaj studentów do dodania" type="search"
-                   class="mb-5 max-w-lg"
-        />
+        <TextInput id="search" v-model="form.search" placeholder="Szukaj studentów do dodania" type="search" class="mb-5 max-w-lg" />
         <div v-if="availableStudents.length" class="grid max-h-64 grid-cols-3 gap-4 overflow-y-auto">
-          <div v-for="student in availableStudents" :key="student.id"
-               class="flex h-max cursor-pointer items-center justify-between overflow-x-auto bg-white p-4 text-left sm:rounded-lg"
-          >
+          <div v-for="student in availableStudents" :key="student.id" class="flex h-max cursor-pointer items-center justify-between overflow-x-auto bg-white p-4 text-left sm:rounded-lg">
             <div>
-              {{ student.first_name }} {{ student.surname }} <br>
-              {{ student.index_number }}
+              {{ student.first_name }} {{ student.surname }} <br> {{ student.index_number }}
             </div>
             <div>
               <Button @click="addStudent(student.id)">
@@ -126,7 +123,7 @@ watch(form, debounce(() => {
               </TableCell>
               <TableCell class="flex justify-end gap-2">
                 <Button class="text-red-600" @click="[showModal = true, studentToDeleteId = student.id]">
-                  <XCircleIcon class="w-5" />
+                  usuń
                 </Button>
               </TableCell>
             </TableRow>
diff --git a/resources/js/Pages/Dashboard/FAQ/Edit.vue b/resources/js/Pages/Dashboard/FAQ/Edit.vue
index d202df9..993a8a5 100644
--- a/resources/js/Pages/Dashboard/FAQ/Edit.vue
+++ b/resources/js/Pages/Dashboard/FAQ/Edit.vue
@@ -46,7 +46,7 @@ function editFAQ() {
               <FormLabel for="id">
                 Id
               </FormLabel>
-              <TextInput class="opacity-75" placeholder="autogenerowany ulid" autocomplete="off" disabled />
+              <TextInput class="opacity-75" :placeholder="faq.id" autocomplete="off" disabled />
             </FormGroup>
             <FormGroup>
               <FormLabel for="question">
diff --git a/resources/js/Pages/Dashboard/FAQ/Index.vue b/resources/js/Pages/Dashboard/FAQ/Index.vue
index 3d4807b..0e4c11b 100644
--- a/resources/js/Pages/Dashboard/FAQ/Index.vue
+++ b/resources/js/Pages/Dashboard/FAQ/Index.vue
@@ -10,7 +10,6 @@ import RemoveModal from '@/Shared/Modals/RemoveModal.vue'
 import { ref } from 'vue'
 import ManagementHeader from '@/Shared/Components/ManagementHeader.vue'
 import ManagementHeaderItem from '@/Shared/Components/ManagementHeaderItem.vue'
-import { PencilSquareIcon, XCircleIcon } from '@heroicons/vue/24/outline'
 import StyledLink from '@/Shared/Components/StyledLink.vue'
 
 defineProps({
@@ -66,10 +65,10 @@ const faqToDeleteId = ref(0)
               </TableCell>
               <TableCell class="flex justify-end gap-2">
                 <StyledLink :href="`/dashboard/faqs/${faq.id}/edit`">
-                  <PencilSquareIcon class="w-5" />
+                  edytuj
                 </StyledLink>
                 <Button class="text-red-600" @click="[showModal = true, faqToDeleteId = faq.id]">
-                  <XCircleIcon class="w-5" />
+                  usuń
                 </Button>
               </TableCell>
             </TableRow>
diff --git a/resources/js/Pages/Dashboard/Field/Index.vue b/resources/js/Pages/Dashboard/Field/Index.vue
index 674eca1..625d316 100644
--- a/resources/js/Pages/Dashboard/Field/Index.vue
+++ b/resources/js/Pages/Dashboard/Field/Index.vue
@@ -10,7 +10,6 @@ import RemoveModal from '@/Shared/Modals/RemoveModal.vue'
 import { ref } from 'vue'
 import ManagementHeader from '@/Shared/Components/ManagementHeader.vue'
 import ManagementHeaderItem from '@/Shared/Components/ManagementHeaderItem.vue'
-import { PencilSquareIcon, XCircleIcon } from '@heroicons/vue/24/outline'
 import StyledLink from '@/Shared/Components/StyledLink.vue'
 
 defineProps({
@@ -40,7 +39,7 @@ const fieldToDeleteId = ref(0)
         <template #actions>
           <span class="hidden sm:block">
             <StyledLink :href="`/dashboard/fields/create`">
-              Dodaj
+              dodaj
             </StyledLink>
           </span>
         </template>
@@ -72,10 +71,10 @@ const fieldToDeleteId = ref(0)
               </TableCell>
               <TableCell class="flex justify-end gap-2">
                 <StyledLink :href="`/dashboard/fields/${field.id}/edit`">
-                  <PencilSquareIcon class="w-5" />
+                  edytuj
                 </StyledLink>
                 <Button class="text-red-600" @click="[showModal = true, fieldToDeleteId = field.id]">
-                  <XCircleIcon class="w-5" />
+                  usuń
                 </Button>
               </TableCell>
             </TableRow>
diff --git a/resources/js/Pages/Dashboard/News/Index.vue b/resources/js/Pages/Dashboard/News/Index.vue
index 4b62f01..67460a8 100644
--- a/resources/js/Pages/Dashboard/News/Index.vue
+++ b/resources/js/Pages/Dashboard/News/Index.vue
@@ -13,7 +13,6 @@ import { Inertia } from '@inertiajs/inertia'
 import { debounce } from 'lodash'
 import TextInput from '@/Shared/Forms/TextInput.vue'
 import { useForm } from '@inertiajs/inertia-vue3'
-import { PencilSquareIcon, XCircleIcon } from '@heroicons/vue/24/outline'
 import ManagementHeader from '@/Shared/Components/ManagementHeader.vue'
 import ManagementHeaderItem from '@/Shared/Components/ManagementHeaderItem.vue'
 import StyledLink from '@/Shared/Components/StyledLink.vue'
@@ -98,10 +97,10 @@ watch(form, debounce(() => {
               </TableCell>
               <TableCell class="flex justify-end gap-2">
                 <StyledLink :href="`news/${article.id}/edit`">
-                  <PencilSquareIcon class="w-5" />
+                  edytuj
                 </StyledLink>
                 <Button class="text-red-600" @click="[showModal = true, newsToDeleteId = article.id]">
-                  <XCircleIcon class="w-5" />
+                  usuń
                 </Button>
               </TableCell>
             </TableRow>
diff --git a/resources/js/Pages/Dashboard/Section/Show.vue b/resources/js/Pages/Dashboard/Section/Show.vue
index d24fee6..8ca70b6 100644
--- a/resources/js/Pages/Dashboard/Section/Show.vue
+++ b/resources/js/Pages/Dashboard/Section/Show.vue
@@ -8,7 +8,6 @@ import FormError from '@/Shared/Forms/FormError.vue'
 import { useForm } from '@inertiajs/inertia-vue3'
 import ManagementHeader from '@/Shared/Components/ManagementHeader.vue'
 import ManagementHeaderItem from '@/Shared/Components/ManagementHeaderItem.vue'
-import { PencilSquareIcon, XCircleIcon } from '@heroicons/vue/24/outline'
 import EmptyState from '@/Shared/Components/EmptyState/EmptyState.vue'
 import TableCell from '@/Shared/Components/Table/TableCell.vue'
 import TableRow from '@/Shared/Components/Table/TableRow.vue'
@@ -210,10 +209,10 @@ function updateSectionSettings() {
                     </TableCell>
                     <TableCell class="flex justify-end gap-2">
                       <Button @click="editSection(item)">
-                        <PencilSquareIcon class="w-5" />
+                        edytuj
                       </Button>
                       <Button class="text-red-600" @click="[showModal = true, sectionToDeleteId = item.id]">
-                        <XCircleIcon class="w-5" />
+                        usuń
                       </Button>
                     </TableCell>
                   </TableRow>
@@ -251,10 +250,10 @@ function updateSectionSettings() {
                     </TableCell>
                     <TableCell class="flex justify-end gap-2">
                       <Button @click="editSection(counter)">
-                        <PencilSquareIcon class="w-5" />
+                        edytuj
                       </Button>
                       <Button class="text-red-600" @click="[showModal = true, sectionToDeleteId = counter.id]">
-                        <XCircleIcon class="w-5" />
+                        usuń
                       </Button>
                     </TableCell>
                   </TableRow>
diff --git a/resources/js/Pages/Dashboard/Semester/Index.vue b/resources/js/Pages/Dashboard/Semester/Index.vue
index 72bcc8e..d769487 100644
--- a/resources/js/Pages/Dashboard/Semester/Index.vue
+++ b/resources/js/Pages/Dashboard/Semester/Index.vue
@@ -11,7 +11,6 @@ import { ref } from 'vue'
 import { Method } from '@inertiajs/inertia'
 import ManagementHeader from '@/Shared/Components/ManagementHeader.vue'
 import ManagementHeaderItem from '@/Shared/Components/ManagementHeaderItem.vue'
-import { PencilSquareIcon, XCircleIcon, CheckIcon } from '@heroicons/vue/24/outline'
 import StyledLink from '@/Shared/Components/StyledLink.vue'
 
 defineProps({
@@ -41,11 +40,12 @@ const semesterToDeleteId = ref(0)
         <template #actions>
           <span class="hidden sm:block">
             <StyledLink :href="`/dashboard/semesters/create`">
-              Dodaj
+              dodaj
             </StyledLink>
           </span>
         </template>
       </ManagementHeader>
+
       <div v-if="semesters.length" class="flex flex-col gap-8">
         <TableWrapper>
           <template #header>
@@ -74,16 +74,15 @@ const semesterToDeleteId = ref(0)
                 {{ semester.active ? "aktywny" : "nieaktywny" }}
               </TableCell>
               <TableCell class="flex justify-end gap-2">
-                <Button v-if="semester.status !== true" :method="Method.POST"
-                        :href="`/dashboard/semesters/${semester.id}/activate`"
-                >
-                  <CheckIcon class="w-5" />
+                <Button v-if="semester.status !== true" :method="Method.POST" :href="`/dashboard/semesters/${semester.id}/activate`">
+                  <span v-if="semester.active !== true">aktywuj</span>
+                  <span v-else>deaktywuj</span>
                 </Button>
                 <StyledLink :href="`/dashboard/semesters/${semester.id}/edit`">
-                  <PencilSquareIcon class="w-5" />
+                  edytuj
                 </StyledLink>
                 <Button class="text-red-600" @click="[showModal = true, semesterToDeleteId = semester.id]">
-                  <XCircleIcon class="w-5" />
+                  usuń
                 </Button>
               </TableCell>
             </TableRow>
diff --git a/resources/js/Pages/Dashboard/Student/Index.vue b/resources/js/Pages/Dashboard/Student/Index.vue
index 35811a9..9a81d84 100644
--- a/resources/js/Pages/Dashboard/Student/Index.vue
+++ b/resources/js/Pages/Dashboard/Student/Index.vue
@@ -13,7 +13,6 @@ import { Inertia } from '@inertiajs/inertia'
 import { debounce } from 'lodash'
 import TextInput from '@/Shared/Forms/TextInput.vue'
 import { useForm } from '@inertiajs/inertia-vue3'
-import { PencilSquareIcon, XCircleIcon } from '@heroicons/vue/24/outline'
 import ManagementHeader from '@/Shared/Components/ManagementHeader.vue'
 import ManagementHeaderItem from '@/Shared/Components/ManagementHeaderItem.vue'
 import StyledLink from '@/Shared/Components/StyledLink.vue'
@@ -101,10 +100,10 @@ watch(form, debounce(() => {
               </TableCell>
               <TableCell class="flex justify-end gap-2">
                 <StyledLink :href="`students/${student.id}/edit`">
-                  <PencilSquareIcon class="w-5" />
+                  edytuj
                 </StyledLink>
                 <Button class="text-red-600" @click="[showModal = true, studentToDeleteId = student.id]">
-                  <XCircleIcon class="w-5" />
+                  usuń
                 </Button>
               </TableCell>
             </TableRow>
diff --git a/resources/js/Pages/Public/Course/Index.vue b/resources/js/Pages/Public/Course/Index.vue
index 7a4a61a..3cbfb3a 100644
--- a/resources/js/Pages/Public/Course/Index.vue
+++ b/resources/js/Pages/Public/Course/Index.vue
@@ -7,6 +7,7 @@ import TableWrapper from '@/Shared/Components/Table/Public/TableWrapper.vue'
 import TableHeader from '@/Shared/Components/Table/Public/TableHeader.vue'
 import TableRow from '@/Shared/Components/Table/Public/TableRow.vue'
 import TableCell from '@/Shared/Components/Table/Public/TableCell.vue'
+import { Head } from '@inertiajs/inertia-vue3'
 
 defineProps({
   courses: Object,
@@ -15,6 +16,8 @@ defineProps({
 </script>
 
 <template>
+  <Head title="Lista kursów" />
+
   <PublicLayout>
     <div class="relative isolate bg-white">
       <BackgroundGrid />
@@ -25,7 +28,7 @@ defineProps({
               Lista kursów
             </template>
             <template #subheader>
-              Szczegółowe informacje dotyczące kursów
+              Szczegółowe informacje dotyczące kursów.
             </template>
           </SectionHeader>
 
@@ -33,25 +36,25 @@ defineProps({
             <div v-if="courses.length" class="flex flex-col gap-8">
               <TableWrapper>
                 <template #header>
-                  <TableHeader class="w-1/5">
+                  <TableHeader class="w-1">
                     Kod
                   </TableHeader>
-                  <TableHeader class="w-1/5">
+                  <TableHeader class="w-full">
                     Pełna nazwa kursu
                   </TableHeader>
-                  <TableHeader class="w-1/5">
+                  <TableHeader class="w-1">
                     Specjalność
                   </TableHeader>
-                  <TableHeader class="w-1/5">
+                  <TableHeader class="w-1">
                     Semestr
                   </TableHeader>
-                  <TableHeader class="w-1/5">
+                  <TableHeader class="w-1">
                     Forma
                   </TableHeader>
-                  <TableHeader />
+                  <TableHeader class="w-1" />
                 </template>
                 <template #body>
-                  <TableRow v-for="course in courses" :key="course.id" :class="[course.active ? '' : 'bg-gray-100']">
+                  <TableRow v-for="course in courses" :key="course.id" :class="[course.active ? '' : 'opacity-50']">
                     <TableCell>
                       {{ course.abbreviation }}
                     </TableCell>
@@ -69,7 +72,7 @@ defineProps({
                     </TableCell>
                     <TableCell>
                       <InertiaLink :href="`kursy/${course.slug}`">
-                        <ArrowRightCircleIcon class="m-auto size-6 text-gray-500" />
+                        <ArrowRightCircleIcon class="m-auto my-3 size-6 text-gray-500" />
                       </InertiaLink>
                     </TableCell>
                   </TableRow>
diff --git a/resources/js/Pages/Public/Grade.vue b/resources/js/Pages/Public/Grade.vue
index 10c0edc..3fbb3e2 100644
--- a/resources/js/Pages/Public/Grade.vue
+++ b/resources/js/Pages/Public/Grade.vue
@@ -39,150 +39,131 @@ function getIndex() {
   <Head title="Oceny" />
 
   <PublicLayout>
-    <div class="relative isolate bg-gradient-to-r from-gray-50 to-gray-100 py-24 sm:py-32">
-      <BackgroundGrid mask-direction="left" />
-      <div class="mx-auto max-w-7xl px-6 lg:px-8">
-        <SectionHeader class="max-w-full">
-          <template #header>
-            Formularz dostępu do ocen
-          </template>
-          <template #subheader>
-            Wybierz odpowiedni semestr, kurs oraz grupę, a następnie wpisz swój numer indeksu, aby uzyskać arkusz ocen i
-            obecności
-          </template>
-        </SectionHeader>
-        <div class="mt-5">
-          <table>
-            <tbody>
-              <tr class="w-1/2">
-                <td
-                  class="block border-t-2 border-gray-200 pl-5 pt-5 sm:table-cell sm:border-b-2 sm:border-r-2 sm:border-t-0 sm:p-5"
-                >
-                  Wybierz semestr:
-                </td>
-                <td class="block border-b-2 border-gray-200 px-5 pb-5 sm:table-cell sm:p-5">
-                  <div class="flex flex-wrap">
-                    <Link v-for="item in semesters" :key="item.id"
-                          :class="[item.id === semester?.id ? 'border-blue-900 text-blue-900' : '']"
-                          :href="`/oceny/${item.id}`"
-                          class="mr-5 mt-4 border-2 px-5 py-3"
-                    >
-                      {{ item.name }}
-                    </Link>
-                  </div>
-                </td>
-              </tr>
-              <tr v-if="semester">
-                <td class="block border-gray-200 pl-5 pt-5 sm:table-cell sm:border-b-2 sm:border-r-2 sm:p-5">
-                  Wybierz kurs:
-                </td>
-                <td class="block border-b-2 border-gray-200 px-5 pb-5 sm:table-cell sm:p-5">
-                  <div class="flex flex-wrap">
-                    <Link v-for="item in courses" :key="item.id"
-                          :class="[item.id === course?.id ? 'border-blue-900 text-blue-900' : '']"
-                          :href="`/oceny/${semester.id}/${item.id}`"
-                          class="mr-5 mt-4 border-2 px-5 py-3"
-                    >
-                      {{ item.course.name }}
-                    </Link>
-                  </div>
-                </td>
-              </tr>
-              <tr v-if="course">
-                <td class="block border-gray-200 pl-5 pt-5 sm:table-cell sm:border-b-2 sm:border-r-2 sm:p-5">
-                  Wybierz grupę:
-                </td>
-                <td class="block border-b-2 border-gray-200 px-5 pb-5 sm:table-cell sm:p-5">
-                  <div class="flex flex-wrap">
-                    <Link v-for="item in groups" :key="item.id"
-                          :class="[item.id === group?.id ? 'border-blue-900 text-blue-900' : '']"
-                          :href="`/oceny/${semester.id}/${course.id}/${item.id}`"
-                          class="mr-5 mt-4 border-2 px-5 py-3"
-                    >
-                      {{ item.name }}
-                    </Link>
+    <div class="relative isolate bg-white">
+      <BackgroundGrid />
+      <div class="py-24 sm:py-32">
+        <div class="mx-auto max-w-7xl px-6 lg:px-8">
+          <SectionHeader>
+            <template #header>
+              Oceny
+            </template>
+            <template #subheader>
+              Wybierz odpowiedni semestr, kurs oraz grupę, a następnie wpisz swój numer indeksu, aby uzyskać arkusz ocen i obecności.
+            </template>
+          </SectionHeader>
+
+          <div class="mx-auto mt-10 border-t border-gray-200 pt-10 text-sm sm:mt-16 sm:pt-16 lg:mx-0 lg:max-w-none lg:grid-cols-3">
+            <table>
+              <tbody>
+                <tr>
+                  <td class="block pl-5 sm:table-cell sm:p-5">
+                    Wybierz semestr:
+                  </td>
+                  <td class="block px-5 sm:table-cell">
+                    <div class="flex flex-wrap gap-2">
+                      <Link v-for="item in semesters" :key="item.id" :class="[item.id === semester?.id ? 'border-blue-900 text-blue-900' : '']" :href="`/oceny/${item.id}`" class="border px-4 py-2.5">
+                        {{ item.name }}
+                      </Link>
+                    </div>
+                  </td>
+                </tr>
+                <tr v-if="semester">
+                  <td class="block pl-5 sm:table-cell sm:p-5">
+                    Wybierz kurs:
+                  </td>
+                  <td class="block px-5 sm:table-cell">
+                    <div class="flex flex-wrap gap-2">
+                      <Link v-for="item in courses" :key="item.id" :class="[item.id === course?.id ? 'border-blue-900 text-blue-900' : '']" :href="`/oceny/${semester.id}/${item.id}`" class="border px-4 py-2.5">
+                        {{ item.course.name }}
+                      </Link>
+                    </div>
+                  </td>
+                </tr>
+                <tr v-if="course">
+                  <td class="block pl-5 sm:table-cell sm:p-5">
+                    Wybierz grupę:
+                  </td>
+                  <td class="block px-5 sm:table-cell">
+                    <div class="flex flex-wrap gap-2">
+                      <Link v-for="item in groups" :key="item.id" :class="[item.id === group?.id ? 'border-blue-900 text-blue-900' : '']" :href="`/oceny/${semester.id}/${course.id}/${item.id}`" class="border px-4 py-2.5">
+                        {{ item.name }}
+                      </Link>
+                    </div>
+                  </td>
+                </tr>
+                <tr v-if="group">
+                  <td class="block pl-5 sm:table-cell sm:p-5">
+                    Wybierz numer indeksu:
+                  </td>
+                  <td class="block px-5 sm:table-cell">
+                    <div class="flex">
+                      <input v-model="searchIndex" autocomplete="off" class="border-1 mr-3 block w-32 px-4 py-2.5 opacity-75 focus:!border-blue-900 focus:!text-blue-900 focus:!ring-0 sm:w-48">
+                      <SubmitButton class="min-h-max" @click="getIndex">
+                        <MagnifyingGlassIcon class="size-6" />
+                      </SubmitButton>
+                    </div>
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+            <div v-if="index && indexExists" class="mt-5">
+              <h3 class="text-2xl font-bold tracking-tight text-gray-900 sm:text-3xl">
+                Arkusz ocen i obecności
+              </h3>
+              <p class="mt-1 text-lg leading-8 text-gray-600">
+                Numery indeksów innych studentów są zaciemnione z prawnych względów
+              </p>
+              <TableWrapper class="mt-10">
+                <template #header>
+                  <TableHeader>
+                    student
+                  </TableHeader>
+                  <TableHeader v-for="column in gradeColumns" :key="column.id" class="min-w-[50px] border-2 border-solid text-center">
+                    {{ column.name }}
+                  </TableHeader>
+                </template>
+                <template #body>
+                  <TableRow v-for="student in students" :key="student">
+                    <TableCell class="size-[50px] min-w-[50px] border-2 text-center">
+                      {{ student.student }}
+                    </TableCell>
+                    <TableCell v-for="grade in student.grades" :key="grade" :class="{'bg-lime-200': grade.present === true, 'bg-rose-300': grade.present === false}" class="border-2 text-center text-gray-900">
+                      {{ grade.value }}
+                    </TableCell>
+                  </TableRow>
+                </template>
+              </TableWrapper>
+              <div class="mt-4">
+                <h5 class="text-xl font-bold tracking-tight text-gray-900">
+                  Legenda:
+                </h5>
+                <div class="flex flex-col gap-5 text-sm sm:flex-row">
+                  <div class="mt-3 flex items-center gap-2">
+                    <span class="size-8 bg-lime-300" />
+                    <p>student obecny lub ocena pozytywna</p>
                   </div>
-                </td>
-              </tr>
-              <tr v-if="group">
-                <td class="block border-gray-200 pl-5 pt-5 sm:table-cell sm:border-b-2 sm:border-r-2 sm:p-5">
-                  Wybierz numer indeksu:
-                </td>
-                <td class="block border-b-2 border-gray-200 px-5 pb-5 pt-2 sm:table-cell sm:p-5">
-                  <div class="flex">
-                    <input v-model="searchIndex" autocomplete="off"
-                           class="mr-3 block w-32 border-2 border-gray-200 px-5 py-3 opacity-75 focus:!border-blue-900 focus:!text-blue-900 focus:!ring-0 sm:w-48"
-                    >
-                    <SubmitButton class="min-h-max" @click="getIndex">
-                      <MagnifyingGlassIcon class="size-6" />
-                    </SubmitButton>
+                  <div class="mt-3 flex items-center gap-2">
+                    <span class="size-8 bg-red-300" />
+                    <p>student nieobecny lub ocena niedostateczna</p>
                   </div>
-                </td>
-              </tr>
-            </tbody>
-          </table>
-          <div v-if="index && indexExists" class="mt-5">
-            <h3 class="text-2xl font-bold tracking-tight text-gray-900 sm:text-3xl">
-              Arkusz ocen i obecności
-            </h3>
-            <p class="mt-1 text-lg leading-8 text-gray-600">
-              Numery indeksów innych studentów są zaciemnione z prawnych względów
-            </p>
-            <TableWrapper class="mt-10">
-              <template #header>
-                <TableHeader>
-                  student
-                </TableHeader>
-                <TableHeader v-for="column in gradeColumns" :key="column.id"
-                             class="min-w-[50px] border-2 border-solid text-center"
-                >
-                  {{ column.name }}
-                </TableHeader>
-              </template>
-              <template #body>
-                <TableRow v-for="student in students" :key="student">
-                  <TableCell class="size-[50px] min-w-[50px] border-2 text-center font-bold">
-                    {{ student.student }}
-                  </TableCell>
-                  <TableCell v-for="grade in student.grades" :key="grade"
-                             :class="{'bg-lime-200': grade.present === true, 'bg-rose-300': grade.present === false}"
-                             class="border-2 text-center font-bold text-gray-900"
-                  >
-                    {{ grade.value }}
-                  </TableCell>
-                </TableRow>
-              </template>
-            </TableWrapper>
-            <div class="mt-4">
-              <h5 class="text-xl font-bold tracking-tight text-gray-900">
-                Legenda:
-              </h5>
-              <div class="flex flex-col gap-5 sm:flex-row">
-                <div class="mt-3 flex items-center gap-2">
-                  <span class="size-8 bg-lime-300" />
-                  <p>student obecny lub ocena pozytywna</p>
-                </div>
-                <div class="mt-3 flex items-center gap-2">
-                  <span class="size-8 bg-red-300" />
-                  <p>student nieobecny lub ocena niedostateczna</p>
                 </div>
               </div>
             </div>
-          </div>
-          <div v-else-if="index" class="mt-5 rounded-md bg-red-50 p-4">
-            <div class="flex items-center">
-              <div class="shrink-0">
-                <ExclamationCircleIcon class="size-14 text-red-400" />
-              </div>
-              <div class="ml-3">
-                <h3 class="text-sm font-medium text-red-800">
-                  Niestety nic nie znaleziono.
-                </h3>
-                <p class="mt-2 text-sm text-red-700">
-                  Dla podanej kombinacji identyfikatorów semestru, kursu i numeru indeksu nie odnaleziono żadnych
-                  danych. Sprawdź poprawność podanych informacji. Jeżeli semestr dopiero się rozpoczął, może po prostu
-                  jeszcze niczego tu nie ma.
-                </p>
+            <div v-else-if="index" class="mt-5 rounded-md bg-red-50 p-4">
+              <div class="flex items-center">
+                <div class="shrink-0">
+                  <ExclamationCircleIcon class="size-14 text-red-400" />
+                </div>
+                <div class="ml-3">
+                  <h3 class="text-sm font-medium text-red-800">
+                    Niestety nic nie znaleziono.
+                  </h3>
+                  <p class="mt-2 text-sm text-red-700">
+                    Dla podanej kombinacji identyfikatorów semestru, kursu i numeru indeksu nie odnaleziono żadnych
+                    danych. Sprawdź poprawność podanych informacji. Jeżeli semestr dopiero się rozpoczął, może po prostu
+                    jeszcze niczego tu nie ma.
+                  </p>
+                </div>
               </div>
             </div>
           </div>
diff --git a/routes/web.php b/routes/web.php
index 112d23c..58f85fd 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -110,8 +110,7 @@
         Route::get("/semester-courses", "index")->name("course.semester.index");
         Route::get("/semester-courses/create", "create")->name("course.semester.create");
         Route::post("/semester-courses", "store")->name("course.semester.store");
-        Route::get("/semester-courses/{course}", "show")->name("course.semester.show");
-        Route::get("/semester-courses/{course}/edit", "edit")->name("course.semester.edit");
+        Route::get("/semester-courses/{course}", "edit")->name("course.semester.edit");
         Route::patch("/semester-courses/{course}", "update")->name("course.semester.update");
         Route::delete("/semester-courses/{course}", "destroy")->name("course.semester.destroy");
     });
diff --git a/tests/Feature/SemesterTest.php b/tests/Feature/SemesterTest.php
index dd8b9ef..687a018 100644
--- a/tests/Feature/SemesterTest.php
+++ b/tests/Feature/SemesterTest.php
@@ -82,18 +82,37 @@ public function testSemesterCanBeSetToActiveStatus(): void
         $this->assertTrue($semester->active);
     }
 
-    public function testManySemestersCanBeActive(): void
+    public function testManySemestersCannotBeActive(): void
     {
-        $inactiveSemester = Semester::factory()->create(["active" => 0]);
-        $activeSemester = Semester::factory()->create(["active" => 1]);
-        $this->assertFalse($inactiveSemester->active);
-        $this->assertTrue($activeSemester->active);
+        $oldSemester = Semester::factory()->create(["active" => 0]);
+        $previousSemester = Semester::factory()->create(["active" => 0]);
+        $currentSemester = Semester::factory()->create(["active" => 0]);
 
-        $this->post("/dashboard/semesters/{$inactiveSemester->id}/activate");
+        $this->assertFalse($oldSemester->active);
+        $this->assertFalse($previousSemester->active);
+        $this->assertFalse($currentSemester->active);
 
-        $inactiveSemester->refresh();
-        $activeSemester->refresh();
-        $this->assertTrue($inactiveSemester->active);
-        $this->assertTrue($activeSemester->active);
+        $this->post("/dashboard/semesters/{$currentSemester->id}/activate");
+
+        $oldSemester->refresh();
+        $previousSemester->refresh();
+        $currentSemester->refresh();
+
+        $this->assertFalse($oldSemester->active);
+        $this->assertFalse($previousSemester->active);
+        $this->assertTrue($currentSemester->active);
+
+        $newSemester = Semester::factory()->create(["active" => 0]);
+        $this->post("/dashboard/semesters/{$newSemester->id}/activate");
+
+        $oldSemester->refresh();
+        $previousSemester->refresh();
+        $currentSemester->refresh();
+        $newSemester->refresh();
+
+        $this->assertFalse($oldSemester->active);
+        $this->assertFalse($previousSemester->active);
+        $this->assertFalse($currentSemester->active);
+        $this->assertTrue($newSemester->active);
     }
 }