diff --git a/app/Exports/AttendanceGroupedExportSingleView.php b/app/Exports/AttendanceGroupedExportSingleView.php
index 5e91a29..1e0a344 100644
--- a/app/Exports/AttendanceGroupedExportSingleView.php
+++ b/app/Exports/AttendanceGroupedExportSingleView.php
@@ -38,8 +38,9 @@ class AttendanceGroupedExportSingleView implements FromView, WithTitle
             $date = Classes::find($this->groupedValue)->date;
 
             $this->groupedValue = "{$date} {$subject}";
+        } else if($this->groupBy == 'seat_number') {
+            $this->groupedValue = "{$this->groupedValue}";
         }
-
         return substr(str_replace(":", "-", "{$this->groupedValue}"), 0, 30);
     }
 }
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index 97b04fd..7607012 100644
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -53,6 +53,17 @@ class RegisterController extends Controller
             'surname' => ['required', 'string', 'max:255'],
             'email' => ['required', 'string', 'email', 'max:255', 'unique:users'],
             'password' => ['required', 'string', 'min:8', 'confirmed'],
+        ], [
+            'name.required' => 'Imię jest wymagane.',
+            'name.max' => 'Imię jest zbyt długie. Maksymalna liczba znaków to 255.',
+            'surname.required' => 'Nazwisko jest wymagane.',
+            'surname.max' => 'Nazwisko jest zbyt długie. Maksymalna liczba znaków to 255.',
+            'email.required' => 'Email jest wymagany.',
+            'email.email' => 'Email jest niepoprawny.',
+            'email.max' => 'Email jest zbyt długi. Maksymalna liczba znaków to 255.',
+            'email.unique' => 'Ten adres email jest już zajęty.',
+            'password.required' => 'Imię jest wymagane.',
+            'password.min' => 'Hasło musi się składać z min. 8 znaków.',
         ]);
     }
 
diff --git a/app/Http/Controllers/User/UserAttendancesController.php b/app/Http/Controllers/User/UserAttendancesController.php
index 93b24af..3c3bd03 100644
--- a/app/Http/Controllers/User/UserAttendancesController.php
+++ b/app/Http/Controllers/User/UserAttendancesController.php
@@ -20,16 +20,17 @@ class UserAttendancesController extends Controller
     protected function validator(array $data)
     {
         $messages = [
-            'student_id.required' => 'Numer indeksu jest wymagany.',
-            'student_name.required' => 'Imię jest wymagane.',
-            'student_surname.required' => 'Nazwisko jest wymagane.',
             'classes_id.required' => 'Wskazanie zajęć jest wymagane.',
             'classes_id.exists' => 'Niepoprawne zajęcia.',
+            'student_id.required' => 'Numer indeksu jest wymagany.',
+            'student_id.numeric' => 'Numer indeksu nie jest liczbą.',
+            'student_name.required' => 'Imię jest wymagane.',
+            'student_surname.required' => 'Nazwisko jest wymagane.',
         ];
 
         $rules = [
             'classes_id' => ['required', 'exists:classes,id'],
-            'student_id' => ['required'],
+            'student_id' => ['required', 'numeric'],
             'student_name' => ['required'],
             'student_surname' => ['required'],
         ];
@@ -103,7 +104,7 @@ class UserAttendancesController extends Controller
         $today_date = date('Y-m-d');
         $groupByLabel = str_replace("_", "-", $groupBy);
         if($groupBy == 'classes_id') {
-            $groupByLabel = 'classes_name';
+            $groupByLabel = 'classes-name';
         }
         return Excel::download(new AttendanceGroupedExportView($groupBy), "all-attendance-grouped-by-{$groupByLabel}-{$today_date}.xlsx");
     }
diff --git a/app/Http/Controllers/User/UserClassesController.php b/app/Http/Controllers/User/UserClassesController.php
index c6779fe..db56cd2 100644
--- a/app/Http/Controllers/User/UserClassesController.php
+++ b/app/Http/Controllers/User/UserClassesController.php
@@ -39,12 +39,13 @@ class UserClassesController extends Controller {
     {
         $messages = [
             'student_id_number.required' => 'Numer indeksu jest wymagany.',
+            'student_id_number.numeric' => 'Numer indeksu nie jest liczbą.',
             'student_name.required' => 'Imię jest wymagane.',
             'student_surname.required' => 'Nazwisko jest wymagane.',
         ];
 
         $rules = [
-            'student_id_number' => ['required'],
+            'student_id_number' => ['required', 'numeric'],
             'student_name' => ['required'],
             'student_surname' => ['required'],
         ];
diff --git a/app/Http/Controllers/User/UserSubjectsController.php b/app/Http/Controllers/User/UserSubjectsController.php
index a79cf7e..76bd127 100644
--- a/app/Http/Controllers/User/UserSubjectsController.php
+++ b/app/Http/Controllers/User/UserSubjectsController.php
@@ -9,6 +9,7 @@ use Illuminate\Support\Facades\Auth;
 
 use App\Subject;
 use App\Room;
+use Illuminate\Validation\Rule;
 
 class UserSubjectsController extends Controller
 {
@@ -17,12 +18,16 @@ class UserSubjectsController extends Controller
         $messages = [
             'name.required' => 'Nazwa przedmiotu jest wymagana.',
             'name.unique' => 'Podana nazwa przedmiotu już istnieje w systemie.',
+            'weekday.in' => 'Dzień tygodnia jest niepoprawny.',
+            'time.date_format' => 'Podana godzina jest nieprawidłowa.',
             'room_id.required' => 'Sala jest wymagana.',
             'room_id.exists' => 'Niepoprawny numer sali.'
         ];
 
         $rules = [
             'name' => ['required', 'unique:subjects,name'],
+            'weekday' => Rule::in([null, 'Poniedziałek', 'Wtorek', 'Środa', 'Czwartek', 'Piątek', 'Sobota', 'Niedziela']),
+            'time' => ['date_format:H:i'],
             'room_id' => ['required', 'exists:rooms,id'],
         ];
         return Validator::make($data, $rules, $messages);
@@ -33,13 +38,18 @@ class UserSubjectsController extends Controller
         $messages = [
             'name_e.required' => 'Nazwa przedmiotu jest wymagana.',
             'name_e.unique' => 'Podana nazwa przedmiotu już istnieje w systemie.',
+            'weekday_e.in' => 'Dzień tygodnia jest niepoprawny.',
+            'time_e.date_format' => 'Podana godzina jest nieprawidłowa.',
             'room_id_e.required' => 'Sala jest wymagana.',
             'room_id_e.exists' => 'Niepoprawny numer sali.'
         ];
 
         $rules = [
-            'name_e' => ['required', 'unique:subjects,name'],
+            'name_e' => ['sometimes', 'required', 'unique:subjects,name'],
+            'weekday_e' => Rule::in([null, 'Poniedziałek', 'Wtorek', 'Środa', 'Czwartek', 'Piątek', 'Sobota', 'Niedziela']),
+            'time_e' => ['date_format:H:i'],
             'room_id_e' => ['required', 'exists:rooms,id'],
+            'subject_id' => ['sometimes']
         ];
         return Validator::make($data, $rules, $messages);
     }
@@ -93,7 +103,11 @@ class UserSubjectsController extends Controller
         $subject_id = $request->input('subject_id');
         $subject = Subject::find($subject_id);
         if($subject) {
-            $validator = $this->edited_validator($request->all());
+            if($request->input('name_e') == $subject->name) {
+                $validator = $this->edited_validator($request->except(['name_e']));
+            } else {
+                $validator = $this->edited_validator($request->all());
+            }
             if ($validator->fails()) {
                 return redirect()->back()
                     ->withErrors($validator)
diff --git a/resources/views/user/delete_confirmation_attendance.blade.php b/resources/views/user/delete_confirmation_attendance.blade.php
index d5554bc..77784ed 100644
--- a/resources/views/user/delete_confirmation_attendance.blade.php
+++ b/resources/views/user/delete_confirmation_attendance.blade.php
@@ -8,9 +8,9 @@
                 </button>
             </div>
             <div class="modal-body">
-                <p> Czy na pewno chcesz usunąć obecność studenta {{ $attendance->student_name }} {{ $attendance->student_surname }}
-                    (numer indeksu {{ $attendance->student_id_number }}) z zajęć {{ App\Subject::find(App\Classes::find($attendance->classes_id)->subject_id)->name }},
-                    które odbyły się {{ App\Classes::find($attendance->classes_id)-> date }} o godzinie {{ App\Subject::find(App\Classes::find($attendance->classes_id)->subject_id)->time }}?</p>
+                <p> Czy na pewno chcesz usunąć obecność studenta <b>{{ $attendance->student_name }} {{ $attendance->student_surname }}</b>
+                    (numer indeksu <b>{{ $attendance->student_id_number }}</b>) z zajęć <b>{{ App\Subject::find(App\Classes::find($attendance->classes_id)->subject_id)->name }}</b>
+                    które odbyły się <b>{{ App\Classes::find($attendance->classes_id)-> date }}</b> o godzinie <b>{{ App\Subject::find(App\Classes::find($attendance->classes_id)->subject_id)->time }}</b>?</p>
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-secondary" data-dismiss="modal" title="Anuluj"> Anuluj </button>
diff --git a/resources/views/user/delete_confirmation_classes.blade.php b/resources/views/user/delete_confirmation_classes.blade.php
index 3b1b1eb..97e49d0 100644
--- a/resources/views/user/delete_confirmation_classes.blade.php
+++ b/resources/views/user/delete_confirmation_classes.blade.php
@@ -8,8 +8,8 @@
                 </button>
             </div>
             <div class="modal-body">
-                <p> Czy na pewno chcesz usunąć zajęcia {{ App\Subject::find(App\Classes::find($classes_item->id)->subject_id)->name }}, które odbyły się
-                    {{ App\Classes::find($classes_item->id)-> date }} o godzinie {{ App\Subject::find(App\Classes::find($classes_item->id)->subject_id)->time }}?</p>
+                <p> Czy na pewno chcesz usunąć zajęcia <b>{{ App\Subject::find(App\Classes::find($classes_item->id)->subject_id)->name }}</b>, które odbyły się
+                    <b>{{ App\Classes::find($classes_item->id)-> date }}</b> o godzinie <b>{{ App\Subject::find(App\Classes::find($classes_item->id)->subject_id)->time }}</b>?</p>
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-secondary" data-dismiss="modal" title="Anuluj"> Anuluj </button>
diff --git a/resources/views/user/delete_confirmation_subject.blade.php b/resources/views/user/delete_confirmation_subject.blade.php
index 87a49f1..1c4b275 100644
--- a/resources/views/user/delete_confirmation_subject.blade.php
+++ b/resources/views/user/delete_confirmation_subject.blade.php
@@ -8,7 +8,9 @@
                 </button>
             </div>
             <div class="modal-body">
-                <p> Czy na pewno chcesz usunąć przedmiot {{ $subject->name }}, który odbywa się w każdy {{ $subject->weekday }} o godzinie {{ $subject->time }} w sali {{ App\Room::find($subject->room_id)->name }}?</p>
+                <p> Czy na pewno chcesz usunąć przedmiot <b>{{ $subject->name }}</b>?
+                    <br><br> Dzień i godzina przedmiotu:
+                    <br> {{ $subject->weekday }}, godzina {{ $subject->time }} w sali {{ App\Room::find($subject->room_id)->name }}</p>
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-secondary" data-dismiss="modal" title="Anuluj"> Anuluj </button>