From 2e438541d00c462be50633f23e49f15173446308 Mon Sep 17 00:00:00 2001
From: smugg99 <dudak799@gmail.com>
Date: Fri, 8 Nov 2024 00:21:44 +0100
Subject: [PATCH] added togglable animations, more colors to the ui, oled
 theme, error feedback, fixed scraper bug with multiple indexes and the same
 key

---
 .gitignore                                    |   4 +-
 common/models/data.pb.go                      | 545 ++++++++++--------
 common/utils/utils.go                         |  36 +-
 core/datastore/crud.go                        |  15 +
 core/observer/observer.go                     |  13 +-
 core/scraper/scraper.go                       | 128 ++--
 data.proto                                    |   8 +-
 .../components.d.ts                           |  17 +-
 .../index.html                                |   2 +-
 .../public/favicon.ico                        | Bin 15406 -> 0 bytes
 .../src/App.vue                               |  23 +-
 .../src/components/AnimationsSwitcher.vue     |  43 ++
 .../src/components/DivisionButton.vue         |   9 +-
 .../src/components/LanguageSwitcher.vue       |   9 +-
 .../src/components/Overlay.vue                |   6 +-
 .../src/components/RoomButton.vue             |  20 +-
 .../src/components/ScheduleTable.vue          | 166 ++++--
 .../src/components/TeacherButton.vue          |   9 +-
 .../src/components/ThemeSwitcher.vue          |  11 +-
 .../src/components/Weather.vue                | 108 +++-
 .../src/components/pages/Division.vue         |  70 ---
 .../src/components/pages/Divisions.vue        | 109 +++-
 .../src/components/pages/Room.vue             |  69 ---
 .../src/components/pages/Rooms.vue            | 115 +++-
 .../src/components/pages/Settings.vue         |  10 +-
 .../src/components/pages/Teacher.vue          |  69 ---
 .../src/components/pages/Teachers.vue         | 118 +++-
 .../src/locales/en.js                         | 133 +++--
 .../src/locales/pl.js                         |  21 +-
 .../src/locales/uk.js                         |  96 ++-
 .../src/plugins/vuetify.ts                    | 132 +++--
 .../src/router.ts                             |  31 +-
 .../src/stores/localeStore.ts                 |   2 +-
 .../src/stores/miscStore.ts                   |  22 +
 34 files changed, 1350 insertions(+), 819 deletions(-)
 delete mode 100644 web/optivum-better-schedule-frontend/public/favicon.ico
 create mode 100644 web/optivum-better-schedule-frontend/src/components/AnimationsSwitcher.vue
 delete mode 100644 web/optivum-better-schedule-frontend/src/components/pages/Division.vue
 delete mode 100644 web/optivum-better-schedule-frontend/src/components/pages/Room.vue
 delete mode 100644 web/optivum-better-schedule-frontend/src/components/pages/Teacher.vue
 create mode 100644 web/optivum-better-schedule-frontend/src/stores/miscStore.ts

diff --git a/.gitignore b/.gitignore
index 553795f..c980143 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,4 +26,6 @@ go.work.sum
 .VSCodeCounter
 .vscode
 app/db
-web/optivum-better-schedule-frontend/src/components/_.vue
\ No newline at end of file
+web/optivum-better-schedule-frontend/src/components/_.vue
+app/dist
+build
\ No newline at end of file
diff --git a/common/models/data.pb.go b/common/models/data.pb.go
index a55c022..dab23b7 100644
--- a/common/models/data.pb.go
+++ b/common/models/data.pb.go
@@ -75,18 +75,63 @@ func (x *APIResponse) GetMessage() string {
 	return ""
 }
 
+type Duplicates struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Values []int64 `protobuf:"varint,1,rep,packed,name=values,proto3" json:"values,omitempty"`
+}
+
+func (x *Duplicates) Reset() {
+	*x = Duplicates{}
+	mi := &file_data_proto_msgTypes[1]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *Duplicates) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*Duplicates) ProtoMessage() {}
+
+func (x *Duplicates) ProtoReflect() protoreflect.Message {
+	mi := &file_data_proto_msgTypes[1]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use Duplicates.ProtoReflect.Descriptor instead.
+func (*Duplicates) Descriptor() ([]byte, []int) {
+	return file_data_proto_rawDescGZIP(), []int{1}
+}
+
+func (x *Duplicates) GetValues() []int64 {
+	if x != nil {
+		return x.Values
+	}
+	return nil
+}
+
 type Metadata struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Designators map[string]int64 `protobuf:"bytes,1,rep,name=designators,proto3" json:"designators,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
-	FullNames   map[string]int64 `protobuf:"bytes,2,rep,name=full_names,json=fullNames,proto3" json:"full_names,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
+	Designators map[string]*Duplicates `protobuf:"bytes,1,rep,name=designators,proto3" json:"designators,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	FullNames   map[string]*Duplicates `protobuf:"bytes,2,rep,name=full_names,json=fullNames,proto3" json:"full_names,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 }
 
 func (x *Metadata) Reset() {
 	*x = Metadata{}
-	mi := &file_data_proto_msgTypes[1]
+	mi := &file_data_proto_msgTypes[2]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -98,7 +143,7 @@ func (x *Metadata) String() string {
 func (*Metadata) ProtoMessage() {}
 
 func (x *Metadata) ProtoReflect() protoreflect.Message {
-	mi := &file_data_proto_msgTypes[1]
+	mi := &file_data_proto_msgTypes[2]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -111,17 +156,17 @@ func (x *Metadata) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Metadata.ProtoReflect.Descriptor instead.
 func (*Metadata) Descriptor() ([]byte, []int) {
-	return file_data_proto_rawDescGZIP(), []int{1}
+	return file_data_proto_rawDescGZIP(), []int{2}
 }
 
-func (x *Metadata) GetDesignators() map[string]int64 {
+func (x *Metadata) GetDesignators() map[string]*Duplicates {
 	if x != nil {
 		return x.Designators
 	}
 	return nil
 }
 
-func (x *Metadata) GetFullNames() map[string]int64 {
+func (x *Metadata) GetFullNames() map[string]*Duplicates {
 	if x != nil {
 		return x.FullNames
 	}
@@ -139,7 +184,7 @@ type Condition struct {
 
 func (x *Condition) Reset() {
 	*x = Condition{}
-	mi := &file_data_proto_msgTypes[2]
+	mi := &file_data_proto_msgTypes[3]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -151,7 +196,7 @@ func (x *Condition) String() string {
 func (*Condition) ProtoMessage() {}
 
 func (x *Condition) ProtoReflect() protoreflect.Message {
-	mi := &file_data_proto_msgTypes[2]
+	mi := &file_data_proto_msgTypes[3]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -164,7 +209,7 @@ func (x *Condition) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Condition.ProtoReflect.Descriptor instead.
 func (*Condition) Descriptor() ([]byte, []int) {
-	return file_data_proto_rawDescGZIP(), []int{2}
+	return file_data_proto_rawDescGZIP(), []int{3}
 }
 
 func (x *Condition) GetName() string {
@@ -193,7 +238,7 @@ type Temperature struct {
 
 func (x *Temperature) Reset() {
 	*x = Temperature{}
-	mi := &file_data_proto_msgTypes[3]
+	mi := &file_data_proto_msgTypes[4]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -205,7 +250,7 @@ func (x *Temperature) String() string {
 func (*Temperature) ProtoMessage() {}
 
 func (x *Temperature) ProtoReflect() protoreflect.Message {
-	mi := &file_data_proto_msgTypes[3]
+	mi := &file_data_proto_msgTypes[4]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -218,7 +263,7 @@ func (x *Temperature) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Temperature.ProtoReflect.Descriptor instead.
 func (*Temperature) Descriptor() ([]byte, []int) {
-	return file_data_proto_rawDescGZIP(), []int{3}
+	return file_data_proto_rawDescGZIP(), []int{4}
 }
 
 func (x *Temperature) GetCurrent() float64 {
@@ -256,7 +301,7 @@ type Forecast struct {
 
 func (x *Forecast) Reset() {
 	*x = Forecast{}
-	mi := &file_data_proto_msgTypes[4]
+	mi := &file_data_proto_msgTypes[5]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -268,7 +313,7 @@ func (x *Forecast) String() string {
 func (*Forecast) ProtoMessage() {}
 
 func (x *Forecast) ProtoReflect() protoreflect.Message {
-	mi := &file_data_proto_msgTypes[4]
+	mi := &file_data_proto_msgTypes[5]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -281,7 +326,7 @@ func (x *Forecast) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Forecast.ProtoReflect.Descriptor instead.
 func (*Forecast) Descriptor() ([]byte, []int) {
-	return file_data_proto_rawDescGZIP(), []int{4}
+	return file_data_proto_rawDescGZIP(), []int{5}
 }
 
 func (x *Forecast) GetCondition() *Condition {
@@ -330,7 +375,7 @@ type ForecastResponse struct {
 
 func (x *ForecastResponse) Reset() {
 	*x = ForecastResponse{}
-	mi := &file_data_proto_msgTypes[5]
+	mi := &file_data_proto_msgTypes[6]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -342,7 +387,7 @@ func (x *ForecastResponse) String() string {
 func (*ForecastResponse) ProtoMessage() {}
 
 func (x *ForecastResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_data_proto_msgTypes[5]
+	mi := &file_data_proto_msgTypes[6]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -355,7 +400,7 @@ func (x *ForecastResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ForecastResponse.ProtoReflect.Descriptor instead.
 func (*ForecastResponse) Descriptor() ([]byte, []int) {
-	return file_data_proto_rawDescGZIP(), []int{5}
+	return file_data_proto_rawDescGZIP(), []int{6}
 }
 
 func (x *ForecastResponse) GetName() string {
@@ -386,7 +431,7 @@ type CurrentWeatherResponse struct {
 
 func (x *CurrentWeatherResponse) Reset() {
 	*x = CurrentWeatherResponse{}
-	mi := &file_data_proto_msgTypes[6]
+	mi := &file_data_proto_msgTypes[7]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -398,7 +443,7 @@ func (x *CurrentWeatherResponse) String() string {
 func (*CurrentWeatherResponse) ProtoMessage() {}
 
 func (x *CurrentWeatherResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_data_proto_msgTypes[6]
+	mi := &file_data_proto_msgTypes[7]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -411,7 +456,7 @@ func (x *CurrentWeatherResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CurrentWeatherResponse.ProtoReflect.Descriptor instead.
 func (*CurrentWeatherResponse) Descriptor() ([]byte, []int) {
-	return file_data_proto_rawDescGZIP(), []int{6}
+	return file_data_proto_rawDescGZIP(), []int{7}
 }
 
 func (x *CurrentWeatherResponse) GetName() string {
@@ -459,7 +504,7 @@ type AirPollutionResponse struct {
 
 func (x *AirPollutionResponse) Reset() {
 	*x = AirPollutionResponse{}
-	mi := &file_data_proto_msgTypes[7]
+	mi := &file_data_proto_msgTypes[8]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -471,7 +516,7 @@ func (x *AirPollutionResponse) String() string {
 func (*AirPollutionResponse) ProtoMessage() {}
 
 func (x *AirPollutionResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_data_proto_msgTypes[7]
+	mi := &file_data_proto_msgTypes[8]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -484,7 +529,7 @@ func (x *AirPollutionResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AirPollutionResponse.ProtoReflect.Descriptor instead.
 func (*AirPollutionResponse) Descriptor() ([]byte, []int) {
-	return file_data_proto_rawDescGZIP(), []int{7}
+	return file_data_proto_rawDescGZIP(), []int{8}
 }
 
 func (x *AirPollutionResponse) GetComponents() map[string]float64 {
@@ -505,7 +550,7 @@ type Timestamp struct {
 
 func (x *Timestamp) Reset() {
 	*x = Timestamp{}
-	mi := &file_data_proto_msgTypes[8]
+	mi := &file_data_proto_msgTypes[9]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -517,7 +562,7 @@ func (x *Timestamp) String() string {
 func (*Timestamp) ProtoMessage() {}
 
 func (x *Timestamp) ProtoReflect() protoreflect.Message {
-	mi := &file_data_proto_msgTypes[8]
+	mi := &file_data_proto_msgTypes[9]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -530,7 +575,7 @@ func (x *Timestamp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Timestamp.ProtoReflect.Descriptor instead.
 func (*Timestamp) Descriptor() ([]byte, []int) {
-	return file_data_proto_rawDescGZIP(), []int{8}
+	return file_data_proto_rawDescGZIP(), []int{9}
 }
 
 func (x *Timestamp) GetHour() int64 {
@@ -558,7 +603,7 @@ type TimeRange struct {
 
 func (x *TimeRange) Reset() {
 	*x = TimeRange{}
-	mi := &file_data_proto_msgTypes[9]
+	mi := &file_data_proto_msgTypes[10]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -570,7 +615,7 @@ func (x *TimeRange) String() string {
 func (*TimeRange) ProtoMessage() {}
 
 func (x *TimeRange) ProtoReflect() protoreflect.Message {
-	mi := &file_data_proto_msgTypes[9]
+	mi := &file_data_proto_msgTypes[10]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -583,7 +628,7 @@ func (x *TimeRange) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TimeRange.ProtoReflect.Descriptor instead.
 func (*TimeRange) Descriptor() ([]byte, []int) {
-	return file_data_proto_rawDescGZIP(), []int{9}
+	return file_data_proto_rawDescGZIP(), []int{10}
 }
 
 func (x *TimeRange) GetStart() *Timestamp {
@@ -617,7 +662,7 @@ type Lesson struct {
 
 func (x *Lesson) Reset() {
 	*x = Lesson{}
-	mi := &file_data_proto_msgTypes[10]
+	mi := &file_data_proto_msgTypes[11]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -629,7 +674,7 @@ func (x *Lesson) String() string {
 func (*Lesson) ProtoMessage() {}
 
 func (x *Lesson) ProtoReflect() protoreflect.Message {
-	mi := &file_data_proto_msgTypes[10]
+	mi := &file_data_proto_msgTypes[11]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -642,7 +687,7 @@ func (x *Lesson) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Lesson.ProtoReflect.Descriptor instead.
 func (*Lesson) Descriptor() ([]byte, []int) {
-	return file_data_proto_rawDescGZIP(), []int{10}
+	return file_data_proto_rawDescGZIP(), []int{11}
 }
 
 func (x *Lesson) GetFullName() string {
@@ -711,7 +756,7 @@ type LessonGroup struct {
 
 func (x *LessonGroup) Reset() {
 	*x = LessonGroup{}
-	mi := &file_data_proto_msgTypes[11]
+	mi := &file_data_proto_msgTypes[12]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -723,7 +768,7 @@ func (x *LessonGroup) String() string {
 func (*LessonGroup) ProtoMessage() {}
 
 func (x *LessonGroup) ProtoReflect() protoreflect.Message {
-	mi := &file_data_proto_msgTypes[11]
+	mi := &file_data_proto_msgTypes[12]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -736,7 +781,7 @@ func (x *LessonGroup) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use LessonGroup.ProtoReflect.Descriptor instead.
 func (*LessonGroup) Descriptor() ([]byte, []int) {
-	return file_data_proto_rawDescGZIP(), []int{11}
+	return file_data_proto_rawDescGZIP(), []int{12}
 }
 
 func (x *LessonGroup) GetLessons() []*Lesson {
@@ -756,7 +801,7 @@ type ScheduleDay struct {
 
 func (x *ScheduleDay) Reset() {
 	*x = ScheduleDay{}
-	mi := &file_data_proto_msgTypes[12]
+	mi := &file_data_proto_msgTypes[13]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -768,7 +813,7 @@ func (x *ScheduleDay) String() string {
 func (*ScheduleDay) ProtoMessage() {}
 
 func (x *ScheduleDay) ProtoReflect() protoreflect.Message {
-	mi := &file_data_proto_msgTypes[12]
+	mi := &file_data_proto_msgTypes[13]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -781,7 +826,7 @@ func (x *ScheduleDay) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ScheduleDay.ProtoReflect.Descriptor instead.
 func (*ScheduleDay) Descriptor() ([]byte, []int) {
-	return file_data_proto_rawDescGZIP(), []int{12}
+	return file_data_proto_rawDescGZIP(), []int{13}
 }
 
 func (x *ScheduleDay) GetLessonGroups() []*LessonGroup {
@@ -801,7 +846,7 @@ type Schedule struct {
 
 func (x *Schedule) Reset() {
 	*x = Schedule{}
-	mi := &file_data_proto_msgTypes[13]
+	mi := &file_data_proto_msgTypes[14]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -813,7 +858,7 @@ func (x *Schedule) String() string {
 func (*Schedule) ProtoMessage() {}
 
 func (x *Schedule) ProtoReflect() protoreflect.Message {
-	mi := &file_data_proto_msgTypes[13]
+	mi := &file_data_proto_msgTypes[14]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -826,7 +871,7 @@ func (x *Schedule) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Schedule.ProtoReflect.Descriptor instead.
 func (*Schedule) Descriptor() ([]byte, []int) {
-	return file_data_proto_rawDescGZIP(), []int{13}
+	return file_data_proto_rawDescGZIP(), []int{14}
 }
 
 func (x *Schedule) GetScheduleDays() []*ScheduleDay {
@@ -849,7 +894,7 @@ type Teacher struct {
 
 func (x *Teacher) Reset() {
 	*x = Teacher{}
-	mi := &file_data_proto_msgTypes[14]
+	mi := &file_data_proto_msgTypes[15]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -861,7 +906,7 @@ func (x *Teacher) String() string {
 func (*Teacher) ProtoMessage() {}
 
 func (x *Teacher) ProtoReflect() protoreflect.Message {
-	mi := &file_data_proto_msgTypes[14]
+	mi := &file_data_proto_msgTypes[15]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -874,7 +919,7 @@ func (x *Teacher) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Teacher.ProtoReflect.Descriptor instead.
 func (*Teacher) Descriptor() ([]byte, []int) {
-	return file_data_proto_rawDescGZIP(), []int{14}
+	return file_data_proto_rawDescGZIP(), []int{15}
 }
 
 func (x *Teacher) GetIndex() int64 {
@@ -918,7 +963,7 @@ type Room struct {
 
 func (x *Room) Reset() {
 	*x = Room{}
-	mi := &file_data_proto_msgTypes[15]
+	mi := &file_data_proto_msgTypes[16]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -930,7 +975,7 @@ func (x *Room) String() string {
 func (*Room) ProtoMessage() {}
 
 func (x *Room) ProtoReflect() protoreflect.Message {
-	mi := &file_data_proto_msgTypes[15]
+	mi := &file_data_proto_msgTypes[16]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -943,7 +988,7 @@ func (x *Room) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Room.ProtoReflect.Descriptor instead.
 func (*Room) Descriptor() ([]byte, []int) {
-	return file_data_proto_rawDescGZIP(), []int{15}
+	return file_data_proto_rawDescGZIP(), []int{16}
 }
 
 func (x *Room) GetIndex() int64 {
@@ -987,7 +1032,7 @@ type Division struct {
 
 func (x *Division) Reset() {
 	*x = Division{}
-	mi := &file_data_proto_msgTypes[16]
+	mi := &file_data_proto_msgTypes[17]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -999,7 +1044,7 @@ func (x *Division) String() string {
 func (*Division) ProtoMessage() {}
 
 func (x *Division) ProtoReflect() protoreflect.Message {
-	mi := &file_data_proto_msgTypes[16]
+	mi := &file_data_proto_msgTypes[17]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1012,7 +1057,7 @@ func (x *Division) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Division.ProtoReflect.Descriptor instead.
 func (*Division) Descriptor() ([]byte, []int) {
-	return file_data_proto_rawDescGZIP(), []int{16}
+	return file_data_proto_rawDescGZIP(), []int{17}
 }
 
 func (x *Division) GetIndex() int64 {
@@ -1055,7 +1100,7 @@ type School struct {
 
 func (x *School) Reset() {
 	*x = School{}
-	mi := &file_data_proto_msgTypes[17]
+	mi := &file_data_proto_msgTypes[18]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1067,7 +1112,7 @@ func (x *School) String() string {
 func (*School) ProtoMessage() {}
 
 func (x *School) ProtoReflect() protoreflect.Message {
-	mi := &file_data_proto_msgTypes[17]
+	mi := &file_data_proto_msgTypes[18]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1080,7 +1125,7 @@ func (x *School) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use School.ProtoReflect.Descriptor instead.
 func (*School) Descriptor() ([]byte, []int) {
-	return file_data_proto_rawDescGZIP(), []int{17}
+	return file_data_proto_rawDescGZIP(), []int{18}
 }
 
 func (x *School) GetDivisions() []*Division {
@@ -1112,150 +1157,155 @@ var file_data_proto_rawDesc = []byte{
 	0x65, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01,
 	0x28, 0x08, 0x52, 0x07, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x6d,
 	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65,
-	0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0x89, 0x02, 0x0a, 0x08, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61,
-	0x74, 0x61, 0x12, 0x41, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x6f, 0x72,
-	0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x4d,
-	0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x44, 0x65, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74,
-	0x6f, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x69, 0x67, 0x6e,
-	0x61, 0x74, 0x6f, 0x72, 0x73, 0x12, 0x3c, 0x0a, 0x0a, 0x66, 0x75, 0x6c, 0x6c, 0x5f, 0x6e, 0x61,
-	0x6d, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x64, 0x61, 0x74, 0x61,
-	0x2e, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x46, 0x75, 0x6c, 0x6c, 0x4e, 0x61,
-	0x6d, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x66, 0x75, 0x6c, 0x6c, 0x4e, 0x61,
-	0x6d, 0x65, 0x73, 0x1a, 0x3e, 0x0a, 0x10, 0x44, 0x65, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x6f,
-	0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c,
-	0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
-	0x02, 0x38, 0x01, 0x1a, 0x3c, 0x0a, 0x0e, 0x46, 0x75, 0x6c, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x73,
-	0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
-	0x01, 0x22, 0x41, 0x0a, 0x09, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12,
-	0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61,
-	0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f,
-	0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70,
-	0x74, 0x69, 0x6f, 0x6e, 0x22, 0x4b, 0x0a, 0x0b, 0x54, 0x65, 0x6d, 0x70, 0x65, 0x72, 0x61, 0x74,
-	0x75, 0x72, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x01, 0x52, 0x07, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x12, 0x10, 0x0a,
-	0x03, 0x6d, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x01, 0x52, 0x03, 0x6d, 0x69, 0x6e, 0x12,
-	0x10, 0x0a, 0x03, 0x6d, 0x61, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x01, 0x52, 0x03, 0x6d, 0x61,
-	0x78, 0x22, 0xbe, 0x01, 0x0a, 0x08, 0x46, 0x6f, 0x72, 0x65, 0x63, 0x61, 0x73, 0x74, 0x12, 0x2d,
-	0x0a, 0x09, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x0f, 0x2e, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69,
-	0x6f, 0x6e, 0x52, 0x09, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x33, 0x0a,
-	0x0b, 0x74, 0x65, 0x6d, 0x70, 0x65, 0x72, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x11, 0x2e, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x65, 0x6d, 0x70, 0x65, 0x72,
-	0x61, 0x74, 0x75, 0x72, 0x65, 0x52, 0x0b, 0x74, 0x65, 0x6d, 0x70, 0x65, 0x72, 0x61, 0x74, 0x75,
-	0x72, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x6e, 0x72, 0x69, 0x73, 0x65, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x03, 0x52, 0x07, 0x73, 0x75, 0x6e, 0x72, 0x69, 0x73, 0x65, 0x12, 0x16, 0x0a, 0x06,
-	0x73, 0x75, 0x6e, 0x73, 0x65, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x73, 0x75,
-	0x6e, 0x73, 0x65, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x64, 0x61, 0x79, 0x4f, 0x66, 0x57, 0x65, 0x65,
-	0x6b, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x64, 0x61, 0x79, 0x4f, 0x66, 0x57, 0x65,
-	0x65, 0x6b, 0x22, 0x52, 0x0a, 0x10, 0x46, 0x6f, 0x72, 0x65, 0x63, 0x61, 0x73, 0x74, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x2a, 0x0a, 0x08, 0x66, 0x6f,
-	0x72, 0x65, 0x63, 0x61, 0x73, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x64,
-	0x61, 0x74, 0x61, 0x2e, 0x46, 0x6f, 0x72, 0x65, 0x63, 0x61, 0x73, 0x74, 0x52, 0x08, 0x66, 0x6f,
-	0x72, 0x65, 0x63, 0x61, 0x73, 0x74, 0x22, 0xc2, 0x01, 0x0a, 0x16, 0x43, 0x75, 0x72, 0x72, 0x65,
-	0x6e, 0x74, 0x57, 0x65, 0x61, 0x74, 0x68, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x2d, 0x0a, 0x09, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69,
-	0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x64, 0x61, 0x74, 0x61, 0x2e,
-	0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x63, 0x6f, 0x6e, 0x64, 0x69,
-	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x33, 0x0a, 0x0b, 0x74, 0x65, 0x6d, 0x70, 0x65, 0x72, 0x61, 0x74,
-	0x75, 0x72, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x64, 0x61, 0x74, 0x61,
-	0x2e, 0x54, 0x65, 0x6d, 0x70, 0x65, 0x72, 0x61, 0x74, 0x75, 0x72, 0x65, 0x52, 0x0b, 0x74, 0x65,
-	0x6d, 0x70, 0x65, 0x72, 0x61, 0x74, 0x75, 0x72, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x6e,
-	0x72, 0x69, 0x73, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x73, 0x75, 0x6e, 0x72,
-	0x69, 0x73, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x75, 0x6e, 0x73, 0x65, 0x74, 0x18, 0x05, 0x20,
-	0x01, 0x28, 0x03, 0x52, 0x06, 0x73, 0x75, 0x6e, 0x73, 0x65, 0x74, 0x22, 0xa1, 0x01, 0x0a, 0x14,
-	0x41, 0x69, 0x72, 0x50, 0x6f, 0x6c, 0x6c, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x12, 0x4a, 0x0a, 0x0a, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e,
-	0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x64, 0x61, 0x74, 0x61, 0x2e,
-	0x41, 0x69, 0x72, 0x50, 0x6f, 0x6c, 0x6c, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x43, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, 0x45,
-	0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73,
-	0x1a, 0x3d, 0x0a, 0x0f, 0x43, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, 0x45, 0x6e,
-	0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x01, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22,
-	0x37, 0x0a, 0x09, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x12, 0x0a, 0x04,
-	0x68, 0x6f, 0x75, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x68, 0x6f, 0x75, 0x72,
-	0x12, 0x16, 0x0a, 0x06, 0x6d, 0x69, 0x6e, 0x75, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03,
-	0x52, 0x06, 0x6d, 0x69, 0x6e, 0x75, 0x74, 0x65, 0x22, 0x55, 0x0a, 0x09, 0x54, 0x69, 0x6d, 0x65,
-	0x52, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x25, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x69, 0x6d, 0x65,
-	0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x12, 0x21, 0x0a, 0x03,
-	0x65, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x64, 0x61, 0x74, 0x61,
-	0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x03, 0x65, 0x6e, 0x64, 0x22,
-	0xc9, 0x02, 0x0a, 0x06, 0x4c, 0x65, 0x73, 0x73, 0x6f, 0x6e, 0x12, 0x1b, 0x0a, 0x09, 0x66, 0x75,
-	0x6c, 0x6c, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66,
-	0x75, 0x6c, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x2d, 0x0a, 0x12, 0x74, 0x65, 0x61, 0x63, 0x68,
-	0x65, 0x72, 0x5f, 0x64, 0x65, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x11, 0x74, 0x65, 0x61, 0x63, 0x68, 0x65, 0x72, 0x44, 0x65, 0x73, 0x69,
-	0x67, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x12, 0x23, 0x0a, 0x0d, 0x74, 0x65, 0x61, 0x63, 0x68, 0x65,
-	0x72, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x74,
-	0x65, 0x61, 0x63, 0x68, 0x65, 0x72, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x27, 0x0a, 0x0f, 0x72,
-	0x6f, 0x6f, 0x6d, 0x5f, 0x64, 0x65, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x18, 0x04,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x72, 0x6f, 0x6f, 0x6d, 0x44, 0x65, 0x73, 0x69, 0x67, 0x6e,
-	0x61, 0x74, 0x6f, 0x72, 0x12, 0x1d, 0x0a, 0x0a, 0x72, 0x6f, 0x6f, 0x6d, 0x5f, 0x69, 0x6e, 0x64,
-	0x65, 0x78, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x72, 0x6f, 0x6f, 0x6d, 0x49, 0x6e,
-	0x64, 0x65, 0x78, 0x12, 0x2f, 0x0a, 0x13, 0x64, 0x69, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x5f,
-	0x64, 0x65, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x12, 0x64, 0x69, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x44, 0x65, 0x73, 0x69, 0x67, 0x6e,
-	0x61, 0x74, 0x6f, 0x72, 0x12, 0x25, 0x0a, 0x0e, 0x64, 0x69, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e,
-	0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x64, 0x69,
-	0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x2e, 0x0a, 0x0a, 0x74,
-	0x69, 0x6d, 0x65, 0x5f, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x0f, 0x2e, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x52, 0x61, 0x6e, 0x67, 0x65,
-	0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x22, 0x35, 0x0a, 0x0b, 0x4c,
-	0x65, 0x73, 0x73, 0x6f, 0x6e, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x26, 0x0a, 0x07, 0x6c, 0x65,
-	0x73, 0x73, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x64, 0x61,
-	0x74, 0x61, 0x2e, 0x4c, 0x65, 0x73, 0x73, 0x6f, 0x6e, 0x52, 0x07, 0x6c, 0x65, 0x73, 0x73, 0x6f,
-	0x6e, 0x73, 0x22, 0x45, 0x0a, 0x0b, 0x53, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x65, 0x44, 0x61,
-	0x79, 0x12, 0x36, 0x0a, 0x0d, 0x6c, 0x65, 0x73, 0x73, 0x6f, 0x6e, 0x5f, 0x67, 0x72, 0x6f, 0x75,
-	0x70, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x64, 0x61, 0x74, 0x61, 0x2e,
-	0x4c, 0x65, 0x73, 0x73, 0x6f, 0x6e, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x0c, 0x6c, 0x65, 0x73,
-	0x73, 0x6f, 0x6e, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x22, 0x42, 0x0a, 0x08, 0x53, 0x63, 0x68,
-	0x65, 0x64, 0x75, 0x6c, 0x65, 0x12, 0x36, 0x0a, 0x0d, 0x73, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c,
-	0x65, 0x5f, 0x64, 0x61, 0x79, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x64,
-	0x61, 0x74, 0x61, 0x2e, 0x53, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x65, 0x44, 0x61, 0x79, 0x52,
-	0x0c, 0x73, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x65, 0x44, 0x61, 0x79, 0x73, 0x22, 0x88, 0x01,
-	0x0a, 0x07, 0x54, 0x65, 0x61, 0x63, 0x68, 0x65, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64,
-	0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12,
-	0x1e, 0x0a, 0x0a, 0x64, 0x65, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x0a, 0x64, 0x65, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x12,
-	0x1b, 0x0a, 0x09, 0x66, 0x75, 0x6c, 0x6c, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x08, 0x66, 0x75, 0x6c, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x2a, 0x0a, 0x08,
-	0x73, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e,
-	0x2e, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x53, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x65, 0x52, 0x08,
-	0x73, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x65, 0x22, 0x85, 0x01, 0x0a, 0x04, 0x52, 0x6f, 0x6f,
-	0x6d, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03,
-	0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x65, 0x73, 0x69, 0x67,
-	0x6e, 0x61, 0x74, 0x6f, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x64, 0x65, 0x73,
-	0x69, 0x67, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x12, 0x1b, 0x0a, 0x09, 0x66, 0x75, 0x6c, 0x6c, 0x5f,
-	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x75, 0x6c, 0x6c,
-	0x4e, 0x61, 0x6d, 0x65, 0x12, 0x2a, 0x0a, 0x08, 0x73, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x65,
-	0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x53, 0x63,
-	0x68, 0x65, 0x64, 0x75, 0x6c, 0x65, 0x52, 0x08, 0x73, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x65,
-	0x22, 0x89, 0x01, 0x0a, 0x08, 0x44, 0x69, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x14, 0x0a,
-	0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x69, 0x6e,
-	0x64, 0x65, 0x78, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x65, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x6f,
-	0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x64, 0x65, 0x73, 0x69, 0x67, 0x6e, 0x61,
-	0x74, 0x6f, 0x72, 0x12, 0x1b, 0x0a, 0x09, 0x66, 0x75, 0x6c, 0x6c, 0x5f, 0x6e, 0x61, 0x6d, 0x65,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x75, 0x6c, 0x6c, 0x4e, 0x61, 0x6d, 0x65,
-	0x12, 0x2a, 0x0a, 0x08, 0x73, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x65, 0x18, 0x04, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x53, 0x63, 0x68, 0x65, 0x64, 0x75,
-	0x6c, 0x65, 0x52, 0x08, 0x73, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x65, 0x22, 0x83, 0x01, 0x0a,
-	0x06, 0x53, 0x63, 0x68, 0x6f, 0x6f, 0x6c, 0x12, 0x2c, 0x0a, 0x09, 0x64, 0x69, 0x76, 0x69, 0x73,
-	0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x64, 0x61, 0x74,
-	0x61, 0x2e, 0x44, 0x69, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x64, 0x69, 0x76, 0x69,
-	0x73, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x29, 0x0a, 0x08, 0x74, 0x65, 0x61, 0x63, 0x68, 0x65, 0x72,
-	0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54,
-	0x65, 0x61, 0x63, 0x68, 0x65, 0x72, 0x52, 0x08, 0x74, 0x65, 0x61, 0x63, 0x68, 0x65, 0x72, 0x73,
-	0x12, 0x20, 0x0a, 0x05, 0x72, 0x6f, 0x6f, 0x6d, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x0a, 0x2e, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x05, 0x72, 0x6f, 0x6f,
-	0x6d, 0x73, 0x42, 0x11, 0x5a, 0x0f, 0x2e, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x6d,
-	0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0x24, 0x0a, 0x0a, 0x44, 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61,
+	0x74, 0x65, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x18, 0x01, 0x20,
+	0x03, 0x28, 0x03, 0x52, 0x06, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x22, 0xad, 0x02, 0x0a, 0x08,
+	0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x41, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x69,
+	0x67, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e,
+	0x64, 0x61, 0x74, 0x61, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x44, 0x65,
+	0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b,
+	0x64, 0x65, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x73, 0x12, 0x3c, 0x0a, 0x0a, 0x66,
+	0x75, 0x6c, 0x6c, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x1d, 0x2e, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e,
+	0x46, 0x75, 0x6c, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09,
+	0x66, 0x75, 0x6c, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x1a, 0x50, 0x0a, 0x10, 0x44, 0x65, 0x73,
+	0x69, 0x67, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
+	0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
+	0x26, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10,
+	0x2e, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x44, 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73,
+	0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x4e, 0x0a, 0x0e, 0x46,
+	0x75, 0x6c, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
+	0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
+	0x26, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10,
+	0x2e, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x44, 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73,
+	0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x41, 0x0a, 0x09, 0x43,
+	0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b,
+	0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x4b,
+	0x0a, 0x0b, 0x54, 0x65, 0x6d, 0x70, 0x65, 0x72, 0x61, 0x74, 0x75, 0x72, 0x65, 0x12, 0x18, 0x0a,
+	0x07, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x01, 0x52, 0x07,
+	0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x69, 0x6e, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x01, 0x52, 0x03, 0x6d, 0x69, 0x6e, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x61, 0x78,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x01, 0x52, 0x03, 0x6d, 0x61, 0x78, 0x22, 0xbe, 0x01, 0x0a, 0x08,
+	0x46, 0x6f, 0x72, 0x65, 0x63, 0x61, 0x73, 0x74, 0x12, 0x2d, 0x0a, 0x09, 0x63, 0x6f, 0x6e, 0x64,
+	0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x64, 0x61,
+	0x74, 0x61, 0x2e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x63, 0x6f,
+	0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x33, 0x0a, 0x0b, 0x74, 0x65, 0x6d, 0x70, 0x65,
+	0x72, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x64,
+	0x61, 0x74, 0x61, 0x2e, 0x54, 0x65, 0x6d, 0x70, 0x65, 0x72, 0x61, 0x74, 0x75, 0x72, 0x65, 0x52,
+	0x0b, 0x74, 0x65, 0x6d, 0x70, 0x65, 0x72, 0x61, 0x74, 0x75, 0x72, 0x65, 0x12, 0x18, 0x0a, 0x07,
+	0x73, 0x75, 0x6e, 0x72, 0x69, 0x73, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x73,
+	0x75, 0x6e, 0x72, 0x69, 0x73, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x75, 0x6e, 0x73, 0x65, 0x74,
+	0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x73, 0x75, 0x6e, 0x73, 0x65, 0x74, 0x12, 0x1c,
+	0x0a, 0x09, 0x64, 0x61, 0x79, 0x4f, 0x66, 0x57, 0x65, 0x65, 0x6b, 0x18, 0x05, 0x20, 0x01, 0x28,
+	0x03, 0x52, 0x09, 0x64, 0x61, 0x79, 0x4f, 0x66, 0x57, 0x65, 0x65, 0x6b, 0x22, 0x52, 0x0a, 0x10,
+	0x46, 0x6f, 0x72, 0x65, 0x63, 0x61, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
+	0x6e, 0x61, 0x6d, 0x65, 0x12, 0x2a, 0x0a, 0x08, 0x66, 0x6f, 0x72, 0x65, 0x63, 0x61, 0x73, 0x74,
+	0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x46, 0x6f,
+	0x72, 0x65, 0x63, 0x61, 0x73, 0x74, 0x52, 0x08, 0x66, 0x6f, 0x72, 0x65, 0x63, 0x61, 0x73, 0x74,
+	0x22, 0xc2, 0x01, 0x0a, 0x16, 0x43, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x57, 0x65, 0x61, 0x74,
+	0x68, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e,
+	0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12,
+	0x2d, 0x0a, 0x09, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74,
+	0x69, 0x6f, 0x6e, 0x52, 0x09, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x33,
+	0x0a, 0x0b, 0x74, 0x65, 0x6d, 0x70, 0x65, 0x72, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x65, 0x6d, 0x70, 0x65,
+	0x72, 0x61, 0x74, 0x75, 0x72, 0x65, 0x52, 0x0b, 0x74, 0x65, 0x6d, 0x70, 0x65, 0x72, 0x61, 0x74,
+	0x75, 0x72, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x6e, 0x72, 0x69, 0x73, 0x65, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x73, 0x75, 0x6e, 0x72, 0x69, 0x73, 0x65, 0x12, 0x16, 0x0a,
+	0x06, 0x73, 0x75, 0x6e, 0x73, 0x65, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x73,
+	0x75, 0x6e, 0x73, 0x65, 0x74, 0x22, 0xa1, 0x01, 0x0a, 0x14, 0x41, 0x69, 0x72, 0x50, 0x6f, 0x6c,
+	0x6c, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x4a,
+	0x0a, 0x0a, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x41, 0x69, 0x72, 0x50, 0x6f, 0x6c,
+	0x6c, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x43,
+	0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a,
+	0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, 0x1a, 0x3d, 0x0a, 0x0f, 0x43, 0x6f,
+	0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
+	0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
+	0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x01, 0x52, 0x05,
+	0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x37, 0x0a, 0x09, 0x54, 0x69, 0x6d,
+	0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x6f, 0x75, 0x72, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x68, 0x6f, 0x75, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x6d, 0x69,
+	0x6e, 0x75, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x6d, 0x69, 0x6e, 0x75,
+	0x74, 0x65, 0x22, 0x55, 0x0a, 0x09, 0x54, 0x69, 0x6d, 0x65, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x12,
+	0x25, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f,
+	0x2e, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52,
+	0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x12, 0x21, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73,
+	0x74, 0x61, 0x6d, 0x70, 0x52, 0x03, 0x65, 0x6e, 0x64, 0x22, 0xc9, 0x02, 0x0a, 0x06, 0x4c, 0x65,
+	0x73, 0x73, 0x6f, 0x6e, 0x12, 0x1b, 0x0a, 0x09, 0x66, 0x75, 0x6c, 0x6c, 0x5f, 0x6e, 0x61, 0x6d,
+	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x75, 0x6c, 0x6c, 0x4e, 0x61, 0x6d,
+	0x65, 0x12, 0x2d, 0x0a, 0x12, 0x74, 0x65, 0x61, 0x63, 0x68, 0x65, 0x72, 0x5f, 0x64, 0x65, 0x73,
+	0x69, 0x67, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x74,
+	0x65, 0x61, 0x63, 0x68, 0x65, 0x72, 0x44, 0x65, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x6f, 0x72,
+	0x12, 0x23, 0x0a, 0x0d, 0x74, 0x65, 0x61, 0x63, 0x68, 0x65, 0x72, 0x5f, 0x69, 0x6e, 0x64, 0x65,
+	0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x74, 0x65, 0x61, 0x63, 0x68, 0x65, 0x72,
+	0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x27, 0x0a, 0x0f, 0x72, 0x6f, 0x6f, 0x6d, 0x5f, 0x64, 0x65,
+	0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e,
+	0x72, 0x6f, 0x6f, 0x6d, 0x44, 0x65, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x12, 0x1d,
+	0x0a, 0x0a, 0x72, 0x6f, 0x6f, 0x6d, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x05, 0x20, 0x01,
+	0x28, 0x03, 0x52, 0x09, 0x72, 0x6f, 0x6f, 0x6d, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x2f, 0x0a,
+	0x13, 0x64, 0x69, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x64, 0x65, 0x73, 0x69, 0x67, 0x6e,
+	0x61, 0x74, 0x6f, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x64, 0x69, 0x76, 0x69,
+	0x73, 0x69, 0x6f, 0x6e, 0x44, 0x65, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x12, 0x25,
+	0x0a, 0x0e, 0x64, 0x69, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78,
+	0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x64, 0x69, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e,
+	0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x2e, 0x0a, 0x0a, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x72, 0x61,
+	0x6e, 0x67, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x64, 0x61, 0x74, 0x61,
+	0x2e, 0x54, 0x69, 0x6d, 0x65, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65,
+	0x52, 0x61, 0x6e, 0x67, 0x65, 0x22, 0x35, 0x0a, 0x0b, 0x4c, 0x65, 0x73, 0x73, 0x6f, 0x6e, 0x47,
+	0x72, 0x6f, 0x75, 0x70, 0x12, 0x26, 0x0a, 0x07, 0x6c, 0x65, 0x73, 0x73, 0x6f, 0x6e, 0x73, 0x18,
+	0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x4c, 0x65, 0x73,
+	0x73, 0x6f, 0x6e, 0x52, 0x07, 0x6c, 0x65, 0x73, 0x73, 0x6f, 0x6e, 0x73, 0x22, 0x45, 0x0a, 0x0b,
+	0x53, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x65, 0x44, 0x61, 0x79, 0x12, 0x36, 0x0a, 0x0d, 0x6c,
+	0x65, 0x73, 0x73, 0x6f, 0x6e, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x18, 0x01, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x11, 0x2e, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x4c, 0x65, 0x73, 0x73, 0x6f, 0x6e,
+	0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x0c, 0x6c, 0x65, 0x73, 0x73, 0x6f, 0x6e, 0x47, 0x72, 0x6f,
+	0x75, 0x70, 0x73, 0x22, 0x42, 0x0a, 0x08, 0x53, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x65, 0x12,
+	0x36, 0x0a, 0x0d, 0x73, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x65, 0x5f, 0x64, 0x61, 0x79, 0x73,
+	0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x53, 0x63,
+	0x68, 0x65, 0x64, 0x75, 0x6c, 0x65, 0x44, 0x61, 0x79, 0x52, 0x0c, 0x73, 0x63, 0x68, 0x65, 0x64,
+	0x75, 0x6c, 0x65, 0x44, 0x61, 0x79, 0x73, 0x22, 0x88, 0x01, 0x0a, 0x07, 0x54, 0x65, 0x61, 0x63,
+	0x68, 0x65, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x03, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x65, 0x73,
+	0x69, 0x67, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x64,
+	0x65, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x12, 0x1b, 0x0a, 0x09, 0x66, 0x75, 0x6c,
+	0x6c, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x75,
+	0x6c, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x2a, 0x0a, 0x08, 0x73, 0x63, 0x68, 0x65, 0x64, 0x75,
+	0x6c, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x64, 0x61, 0x74, 0x61, 0x2e,
+	0x53, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x65, 0x52, 0x08, 0x73, 0x63, 0x68, 0x65, 0x64, 0x75,
+	0x6c, 0x65, 0x22, 0x85, 0x01, 0x0a, 0x04, 0x52, 0x6f, 0x6f, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x69,
+	0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65,
+	0x78, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x65, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x64, 0x65, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x6f,
+	0x72, 0x12, 0x1b, 0x0a, 0x09, 0x66, 0x75, 0x6c, 0x6c, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x75, 0x6c, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x2a,
+	0x0a, 0x08, 0x73, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x0e, 0x2e, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x53, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x65,
+	0x52, 0x08, 0x73, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x65, 0x22, 0x89, 0x01, 0x0a, 0x08, 0x44,
+	0x69, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x1e, 0x0a,
+	0x0a, 0x64, 0x65, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x0a, 0x64, 0x65, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x12, 0x1b, 0x0a,
+	0x09, 0x66, 0x75, 0x6c, 0x6c, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x08, 0x66, 0x75, 0x6c, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x2a, 0x0a, 0x08, 0x73, 0x63,
+	0x68, 0x65, 0x64, 0x75, 0x6c, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x64,
+	0x61, 0x74, 0x61, 0x2e, 0x53, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x65, 0x52, 0x08, 0x73, 0x63,
+	0x68, 0x65, 0x64, 0x75, 0x6c, 0x65, 0x22, 0x83, 0x01, 0x0a, 0x06, 0x53, 0x63, 0x68, 0x6f, 0x6f,
+	0x6c, 0x12, 0x2c, 0x0a, 0x09, 0x64, 0x69, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x44, 0x69, 0x76, 0x69,
+	0x73, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x64, 0x69, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x12,
+	0x29, 0x0a, 0x08, 0x74, 0x65, 0x61, 0x63, 0x68, 0x65, 0x72, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28,
+	0x0b, 0x32, 0x0d, 0x2e, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x65, 0x61, 0x63, 0x68, 0x65, 0x72,
+	0x52, 0x08, 0x74, 0x65, 0x61, 0x63, 0x68, 0x65, 0x72, 0x73, 0x12, 0x20, 0x0a, 0x05, 0x72, 0x6f,
+	0x6f, 0x6d, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x64, 0x61, 0x74, 0x61,
+	0x2e, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x05, 0x72, 0x6f, 0x6f, 0x6d, 0x73, 0x42, 0x11, 0x5a, 0x0f,
+	0x2e, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x62,
+	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -1270,56 +1320,59 @@ func file_data_proto_rawDescGZIP() []byte {
 	return file_data_proto_rawDescData
 }
 
-var file_data_proto_msgTypes = make([]protoimpl.MessageInfo, 21)
+var file_data_proto_msgTypes = make([]protoimpl.MessageInfo, 22)
 var file_data_proto_goTypes = []any{
 	(*APIResponse)(nil),            // 0: data.APIResponse
-	(*Metadata)(nil),               // 1: data.Metadata
-	(*Condition)(nil),              // 2: data.Condition
-	(*Temperature)(nil),            // 3: data.Temperature
-	(*Forecast)(nil),               // 4: data.Forecast
-	(*ForecastResponse)(nil),       // 5: data.ForecastResponse
-	(*CurrentWeatherResponse)(nil), // 6: data.CurrentWeatherResponse
-	(*AirPollutionResponse)(nil),   // 7: data.AirPollutionResponse
-	(*Timestamp)(nil),              // 8: data.Timestamp
-	(*TimeRange)(nil),              // 9: data.TimeRange
-	(*Lesson)(nil),                 // 10: data.Lesson
-	(*LessonGroup)(nil),            // 11: data.LessonGroup
-	(*ScheduleDay)(nil),            // 12: data.ScheduleDay
-	(*Schedule)(nil),               // 13: data.Schedule
-	(*Teacher)(nil),                // 14: data.Teacher
-	(*Room)(nil),                   // 15: data.Room
-	(*Division)(nil),               // 16: data.Division
-	(*School)(nil),                 // 17: data.School
-	nil,                            // 18: data.Metadata.DesignatorsEntry
-	nil,                            // 19: data.Metadata.FullNamesEntry
-	nil,                            // 20: data.AirPollutionResponse.ComponentsEntry
+	(*Duplicates)(nil),             // 1: data.Duplicates
+	(*Metadata)(nil),               // 2: data.Metadata
+	(*Condition)(nil),              // 3: data.Condition
+	(*Temperature)(nil),            // 4: data.Temperature
+	(*Forecast)(nil),               // 5: data.Forecast
+	(*ForecastResponse)(nil),       // 6: data.ForecastResponse
+	(*CurrentWeatherResponse)(nil), // 7: data.CurrentWeatherResponse
+	(*AirPollutionResponse)(nil),   // 8: data.AirPollutionResponse
+	(*Timestamp)(nil),              // 9: data.Timestamp
+	(*TimeRange)(nil),              // 10: data.TimeRange
+	(*Lesson)(nil),                 // 11: data.Lesson
+	(*LessonGroup)(nil),            // 12: data.LessonGroup
+	(*ScheduleDay)(nil),            // 13: data.ScheduleDay
+	(*Schedule)(nil),               // 14: data.Schedule
+	(*Teacher)(nil),                // 15: data.Teacher
+	(*Room)(nil),                   // 16: data.Room
+	(*Division)(nil),               // 17: data.Division
+	(*School)(nil),                 // 18: data.School
+	nil,                            // 19: data.Metadata.DesignatorsEntry
+	nil,                            // 20: data.Metadata.FullNamesEntry
+	nil,                            // 21: data.AirPollutionResponse.ComponentsEntry
 }
 var file_data_proto_depIdxs = []int32{
-	18, // 0: data.Metadata.designators:type_name -> data.Metadata.DesignatorsEntry
-	19, // 1: data.Metadata.full_names:type_name -> data.Metadata.FullNamesEntry
-	2,  // 2: data.Forecast.condition:type_name -> data.Condition
-	3,  // 3: data.Forecast.temperature:type_name -> data.Temperature
-	4,  // 4: data.ForecastResponse.forecast:type_name -> data.Forecast
-	2,  // 5: data.CurrentWeatherResponse.condition:type_name -> data.Condition
-	3,  // 6: data.CurrentWeatherResponse.temperature:type_name -> data.Temperature
-	20, // 7: data.AirPollutionResponse.components:type_name -> data.AirPollutionResponse.ComponentsEntry
-	8,  // 8: data.TimeRange.start:type_name -> data.Timestamp
-	8,  // 9: data.TimeRange.end:type_name -> data.Timestamp
-	9,  // 10: data.Lesson.time_range:type_name -> data.TimeRange
-	10, // 11: data.LessonGroup.lessons:type_name -> data.Lesson
-	11, // 12: data.ScheduleDay.lesson_groups:type_name -> data.LessonGroup
-	12, // 13: data.Schedule.schedule_days:type_name -> data.ScheduleDay
-	13, // 14: data.Teacher.schedule:type_name -> data.Schedule
-	13, // 15: data.Room.schedule:type_name -> data.Schedule
-	13, // 16: data.Division.schedule:type_name -> data.Schedule
-	16, // 17: data.School.divisions:type_name -> data.Division
-	14, // 18: data.School.teachers:type_name -> data.Teacher
-	15, // 19: data.School.rooms:type_name -> data.Room
-	20, // [20:20] is the sub-list for method output_type
-	20, // [20:20] is the sub-list for method input_type
-	20, // [20:20] is the sub-list for extension type_name
-	20, // [20:20] is the sub-list for extension extendee
-	0,  // [0:20] is the sub-list for field type_name
+	19, // 0: data.Metadata.designators:type_name -> data.Metadata.DesignatorsEntry
+	20, // 1: data.Metadata.full_names:type_name -> data.Metadata.FullNamesEntry
+	3,  // 2: data.Forecast.condition:type_name -> data.Condition
+	4,  // 3: data.Forecast.temperature:type_name -> data.Temperature
+	5,  // 4: data.ForecastResponse.forecast:type_name -> data.Forecast
+	3,  // 5: data.CurrentWeatherResponse.condition:type_name -> data.Condition
+	4,  // 6: data.CurrentWeatherResponse.temperature:type_name -> data.Temperature
+	21, // 7: data.AirPollutionResponse.components:type_name -> data.AirPollutionResponse.ComponentsEntry
+	9,  // 8: data.TimeRange.start:type_name -> data.Timestamp
+	9,  // 9: data.TimeRange.end:type_name -> data.Timestamp
+	10, // 10: data.Lesson.time_range:type_name -> data.TimeRange
+	11, // 11: data.LessonGroup.lessons:type_name -> data.Lesson
+	12, // 12: data.ScheduleDay.lesson_groups:type_name -> data.LessonGroup
+	13, // 13: data.Schedule.schedule_days:type_name -> data.ScheduleDay
+	14, // 14: data.Teacher.schedule:type_name -> data.Schedule
+	14, // 15: data.Room.schedule:type_name -> data.Schedule
+	14, // 16: data.Division.schedule:type_name -> data.Schedule
+	17, // 17: data.School.divisions:type_name -> data.Division
+	15, // 18: data.School.teachers:type_name -> data.Teacher
+	16, // 19: data.School.rooms:type_name -> data.Room
+	1,  // 20: data.Metadata.DesignatorsEntry.value:type_name -> data.Duplicates
+	1,  // 21: data.Metadata.FullNamesEntry.value:type_name -> data.Duplicates
+	22, // [22:22] is the sub-list for method output_type
+	22, // [22:22] is the sub-list for method input_type
+	22, // [22:22] is the sub-list for extension type_name
+	22, // [22:22] is the sub-list for extension extendee
+	0,  // [0:22] is the sub-list for field type_name
 }
 
 func init() { file_data_proto_init() }
@@ -1333,7 +1386,7 @@ func file_data_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_data_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   21,
+			NumMessages:   22,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/common/utils/utils.go b/common/utils/utils.go
index 2d6c7f1..b8731b0 100644
--- a/common/utils/utils.go
+++ b/common/utils/utils.go
@@ -6,18 +6,32 @@ import (
 	"net/http"
 	"strings"
 	"sync"
+	"time"
 
 	"github.com/PuerkitoBio/goquery"
 )
 
+var HttpClient = &http.Client{
+	Transport: &http.Transport{
+		MaxIdleConns:        2000,
+		MaxIdleConnsPerHost: 1000,
+		IdleConnTimeout:     90 * time.Second,
+	},
+	Timeout: 20 * time.Second,
+}
+
 func CheckURL(url string) bool {
+	fmt.Println("checking URL:", url)
+
 	// #nosec G107
-	resp, err := http.Get(url)
+	resp, err := HttpClient.Get(url)
 	if err != nil {
 		return false
 	}
 	defer resp.Body.Close()
 
+	fmt.Printf("got status code: %d for %s\n", resp.StatusCode, url)
+
 	return resp.StatusCode == http.StatusOK
 }
 
@@ -31,12 +45,26 @@ func IsEmptyOrInvisible(text string) bool {
 func OpenDoc(baseUrl, endpoint string) (*goquery.Document, error) {
 	url := fmt.Sprintf("%s%s", baseUrl, endpoint)
 	fmt.Printf("fetching URL: %s\n", url)
-	
-	// #nosec G107
-	res, err := http.Get(url)
+
+	var res *http.Response
+	var err error
+
+	for i := 0; i < 3; i++ {
+		// #nosec G107
+		res, err = HttpClient.Get(url)
+		if err == nil && res.StatusCode == http.StatusOK {
+			break
+		}
+		if res != nil {
+			res.Body.Close()
+		}
+		time.Sleep(1 * time.Second)
+	}
+
 	if err != nil {
 		return nil, fmt.Errorf("error fetching URL: %w", err)
 	}
+
 	defer res.Body.Close()
 
 	if res.StatusCode != http.StatusOK {
diff --git a/core/datastore/crud.go b/core/datastore/crud.go
index 4ec62e8..a0b40fa 100644
--- a/core/datastore/crud.go
+++ b/core/datastore/crud.go
@@ -105,4 +105,19 @@ func GetRoom(index int64) (*models.Room, error) {
 func DeleteRoom(index int64) error {
     key := []byte(fmt.Sprintf("room:%d", index))
     return deleteItem(key)
+}
+
+func SetMetadata(metadata *models.Metadata) error {
+    key := []byte("metadata")
+    return setItem(key, metadata)
+}
+
+func GetMetadata() (*models.Metadata, error) {
+    key := []byte("metadata")
+    metadata := &models.Metadata{}
+    err := getItem(key, metadata)
+    if err != nil {
+        return nil, err
+    }
+    return metadata, nil
 }
\ No newline at end of file
diff --git a/core/observer/observer.go b/core/observer/observer.go
index 491e01f..06fb1b6 100644
--- a/core/observer/observer.go
+++ b/core/observer/observer.go
@@ -65,7 +65,18 @@ func (o *Observer) compareHash(ctx context.Context, client *http.Client) (bool,
 	o.Mu.RLock()
 	defer o.Mu.RUnlock()
 
-	doc, err := o.fetchContent(ctx, client)
+	var doc *goquery.Document
+	var err error
+
+	for i := 0; i < 3; i++ {
+		doc, err = o.fetchContent(ctx, client)
+		if err == nil {
+			break
+		}
+		fmt.Printf("error fetching content from %s, retrying... (%d/3)\n", o.URL, i+1)
+		time.Sleep(1 * time.Second)
+	}
+
 	if err != nil {
 		return false, fmt.Errorf("error fetching content from %s: %v", o.URL, err)
 	}
diff --git a/core/scraper/scraper.go b/core/scraper/scraper.go
index c14be1b..cd536f1 100644
--- a/core/scraper/scraper.go
+++ b/core/scraper/scraper.go
@@ -22,7 +22,6 @@ import (
 var Config config.ScraperConfig
 
 type ResourceType string
-
 const (
 	DivisionResource ResourceType = "division"
 	TeacherResource  ResourceType = "teacher"
@@ -33,6 +32,12 @@ func (t ResourceType) String() string {
 	return string(t)
 }
 
+type MetadataType string
+const (
+	DesignatorMetadata MetadataType = "designator"
+	FullNameMetadata   MetadataType = "fullname"
+)
+
 type ScraperResource struct {
 	Indexes     []int64
 	Metadata    *models.Metadata
@@ -48,8 +53,8 @@ func NewScraperResource(indexRegex *regexp.Regexp, resourceType ResourceType) *S
 	return &ScraperResource{
 		Indexes:     []int64{},
 		Metadata:    &models.Metadata{
-			Designators: make(map[string]int64),
-			FullNames:   make(map[string]int64),
+			Designators: make(map[string]*models.Duplicates),
+			FullNames:   make(map[string]*models.Duplicates),
 		},
 		Observer:    &observer.Observer{},
 		Hub:         &hub.Hub{},
@@ -72,35 +77,57 @@ func (s *ScraperResource) StopHub() {
 	}
 }
 
-func (s *ScraperResource) GetDesignatorFromIndex(index int64) string {
+func (s *ScraperResource) IsIndexInMetadata(index int64, metadataType MetadataType) (bool, string) {
 	s.Mu.RLock()
 	defer s.Mu.RUnlock()
-	for designator, _index := range s.Metadata.Designators {
-		if index == _index {
-			return designator
+	var metadata map[string]*models.Duplicates
+	if metadataType == DesignatorMetadata {
+		metadata = s.Metadata.Designators
+	} else if metadataType == FullNameMetadata {
+		metadata = s.Metadata.FullNames
+	} else {
+		return false, ""
+	}
+
+	for key, duplicates := range metadata {
+		for _, _index := range duplicates.Values {
+			if index == _index {
+				return true, key
+			}
 		}
 	}
+	return false, ""
+}
+
+func (s *ScraperResource) GetDesignatorFromIndex(index int64) string {
+	s.Mu.RLock()
+	defer s.Mu.RUnlock()
+	
+	if inDuplicates, designator := s.IsIndexInMetadata(index, DesignatorMetadata); inDuplicates {
+		return designator
+	}
+
 	return ""
 }
 
 func (s *ScraperResource) GetFullNameFromIndex(index int64) string {
 	s.Mu.RLock()
 	defer s.Mu.RUnlock()
-	for fullName, _index := range s.Metadata.FullNames {
-		if index == _index {
-			return fullName
-		}
+	
+	if inDuplicates, fullName := s.IsIndexInMetadata(index, FullNameMetadata); inDuplicates {
+		return fullName
 	}
+
 	return ""
 }
 
-func (s *ScraperResource) GetIndexFromDesignator(designator string) int64 {
+func (s *ScraperResource) GetIndexFromDesignator(designator string) *models.Duplicates {
 	s.Mu.RLock()
 	defer s.Mu.RUnlock()
 	return s.Metadata.Designators[designator]
 }
 
-func (s *ScraperResource) GetIndexFromFullName(fullName string) int64 {
+func (s *ScraperResource) GetIndexFromFullName(fullName string) *models.Duplicates {
 	s.Mu.RLock()
 	defer s.Mu.RUnlock()
 	return s.Metadata.FullNames[fullName]
@@ -109,37 +136,62 @@ func (s *ScraperResource) GetIndexFromFullName(fullName string) int64 {
 func (s *ScraperResource) UpdateMetadata(newDesignator, newFullName string, index int64) {
 	s.Mu.Lock()
 	defer s.Mu.Unlock()
-	for _designator, _index := range s.Metadata.Designators {
-		if index == _index {
-			delete(s.Metadata.Designators, _designator)
+
+	for designator, duplicates := range s.Metadata.Designators {
+		for i, _index := range duplicates.Values {
+			if index == _index {
+				duplicates.Values = append(duplicates.Values[:i], duplicates.Values[i+1:]...)
+				if len(duplicates.Values) == 0 {
+					delete(s.Metadata.Designators, designator)
+				}
+				break
+			}
 		}
 	}
-	s.Metadata.Designators[newDesignator] = index
+	if _, exists := s.Metadata.Designators[newDesignator]; !exists {
+		s.Metadata.Designators[newDesignator] = &models.Duplicates{}
+	}
+	s.Metadata.Designators[newDesignator].Values = append(s.Metadata.Designators[newDesignator].Values, index)
 
-	for _full_name, _index := range s.Metadata.FullNames {
-		if index == _index {
-			delete(s.Metadata.FullNames, _full_name)
+	for fullName, duplicates := range s.Metadata.FullNames {
+		for i, _index := range duplicates.Values {
+			if index == _index {
+				duplicates.Values = append(duplicates.Values[:i], duplicates.Values[i+1:]...)
+				if len(duplicates.Values) == 0 {
+					delete(s.Metadata.FullNames, fullName)
+				}
+				break
+			}
 		}
 	}
-	s.Metadata.FullNames[newFullName] = index
+	if _, exists := s.Metadata.FullNames[newFullName]; !exists {
+		s.Metadata.FullNames[newFullName] = &models.Duplicates{}
+	}
+	s.Metadata.FullNames[newFullName].Values = append(s.Metadata.FullNames[newFullName].Values, index)
 }
 
 func (s *ScraperResource) RemoveMetadata(index int64) {
 	s.Mu.Lock()
 	defer s.Mu.Unlock()
-	for designator, _index := range s.Metadata.Designators {
-		if index == _index {
-			delete(s.Metadata.Designators, designator)
-			if len(s.Metadata.Designators) == 0 {
+	for designator, duplicates := range s.Metadata.Designators {
+		for i, _index := range duplicates.Values {
+			if index == _index {
+				duplicates.Values = append(duplicates.Values[:i], duplicates.Values[i+1:]...)
+				if len(duplicates.Values) == 0 {
+					delete(s.Metadata.Designators, designator)
+				}
 				break
 			}
 		}
 	}
 
-	for fullName, _index := range s.Metadata.FullNames {
-		if index == _index {
-			delete(s.Metadata.FullNames, fullName)
-			if len(s.Metadata.FullNames) == 0 {
+	for fullName, duplicates := range s.Metadata.FullNames {
+		for i, _index := range duplicates.Values {
+			if index == _index {
+				duplicates.Values = append(duplicates.Values[:i], duplicates.Values[i+1:]...)
+				if len(duplicates.Values) == 0 {
+					delete(s.Metadata.FullNames, fullName)
+				}
 				break
 			}
 		}
@@ -336,9 +388,9 @@ func ScrapeDivisionsIndexes() ([]int64, error) {
 					return
 				}
 				endpoint := makeDivisionEndpoint(num)
-				_, err = utils.OpenDoc(Config.BaseUrl, endpoint)
-				if err != nil {
-					fmt.Printf("error opening division document: %v\n", err)
+		
+				if !utils.CheckURL(Config.BaseUrl + endpoint) {
+					fmt.Printf("error opening division " + Config.BaseUrl + endpoint + "\n")
 					return
 				}
 				indexes = append(indexes, num)
@@ -369,9 +421,9 @@ func ScrapeTeachersIndexes() ([]int64, error) {
 					return
 				}
 				endpoint := makeTeacherEndpoint(num)
-				_, err = utils.OpenDoc(Config.BaseUrl, endpoint)
-				if err != nil {
-					fmt.Printf("error opening teacher document: %v\n", err)
+
+				if !utils.CheckURL(Config.BaseUrl + endpoint) {
+					fmt.Printf("error opening teacher " + Config.BaseUrl + endpoint + "\n")
 					return
 				}
 				indexes = append(indexes, num)
@@ -402,9 +454,9 @@ func ScrapeRoomsIndexes() ([]int64, error) {
 					return
 				}
 				endpoint := makeRoomEndpoint(num)
-				_, err = utils.OpenDoc(Config.BaseUrl, endpoint)
-				if err != nil {
-					fmt.Printf("error opening room document: %v\n", err)
+
+				if !utils.CheckURL(Config.BaseUrl + endpoint) {
+					fmt.Printf("error opening room " + Config.BaseUrl + endpoint + "\n")
 					return
 				}
 				indexes = append(indexes, num)
diff --git a/data.proto b/data.proto
index 382ba07..6a42ae7 100644
--- a/data.proto
+++ b/data.proto
@@ -10,9 +10,13 @@ message APIResponse {
 	string message = 2;
 }
 
+message Duplicates {
+	repeated int64 values = 1;
+}
+
 message Metadata {
-	map<string, int64> designators = 1;
-	map<string, int64> full_names = 2;
+	map<string, Duplicates> designators = 1;
+	map<string, Duplicates> full_names = 2;
 }
 
 message Condition {
diff --git a/web/optivum-better-schedule-frontend/components.d.ts b/web/optivum-better-schedule-frontend/components.d.ts
index 8ed41af..b9fdb23 100644
--- a/web/optivum-better-schedule-frontend/components.d.ts
+++ b/web/optivum-better-schedule-frontend/components.d.ts
@@ -7,35 +7,20 @@ export {}
 /* prettier-ignore */
 declare module 'vue' {
   export interface GlobalComponents {
-    _: typeof import('./src/components/_.vue')['default']
-    AppBar: typeof import('./src/components/AppBar.vue')['default']
-    ClassesTab: typeof import('./src/components/ClassesTab.vue')['default']
+    AnimationsSwitcher: typeof import('./src/components/AnimationsSwitcher.vue')['default']
     Clock: typeof import('./src/components/clock/Clock.vue')['default']
-    copy: typeof import('./src/components/TeacherButton copy.vue')['default']
     Digit: typeof import('./src/components/clock/Digit.vue')['default']
-    Division: typeof import('./src/components/pages/Division.vue')['default']
     DivisionButton: typeof import('./src/components/DivisionButton.vue')['default']
     Divisions: typeof import('./src/components/pages/Divisions.vue')['default']
-    Dots: typeof import('./src/components/Dots.vue')['default']
-    Drawer: typeof import('./src/components/Drawer.vue')['default']
-    Fog: typeof import('./src/components/Fog.vue')['default']
-    HelloWorld: typeof import('./src/components/HelloWorld.vue')['default']
     Home: typeof import('./src/components/pages/Home.vue')['default']
-    HomePage: typeof import('./src/components/pages/HomePage.vue')['default']
-    HomeTab: typeof import('./src/components/HomeTab.vue')['default']
     LanguageSwitcher: typeof import('./src/components/LanguageSwitcher.vue')['default']
     Overlay: typeof import('./src/components/Overlay.vue')['default']
-    Rays: typeof import('./src/components/Rays.vue')['default']
-    Room: typeof import('./src/components/pages/Room.vue')['default']
     RoomButton: typeof import('./src/components/RoomButton.vue')['default']
     Rooms: typeof import('./src/components/pages/Rooms.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
     ScheduleTable: typeof import('./src/components/ScheduleTable.vue')['default']
     Settings: typeof import('./src/components/pages/Settings.vue')['default']
-    SettingsPage: typeof import('./src/components/pages/SettingsPage.vue')['default']
-    TabContent: typeof import('./src/components/TabContent.vue')['default']
-    Teacher: typeof import('./src/components/pages/Teacher.vue')['default']
     TeacherButton: typeof import('./src/components/TeacherButton.vue')['default']
     Teachers: typeof import('./src/components/pages/Teachers.vue')['default']
     ThemeSwitcher: typeof import('./src/components/ThemeSwitcher.vue')['default']
diff --git a/web/optivum-better-schedule-frontend/index.html b/web/optivum-better-schedule-frontend/index.html
index 44eb85d..1c33a19 100644
--- a/web/optivum-better-schedule-frontend/index.html
+++ b/web/optivum-better-schedule-frontend/index.html
@@ -5,7 +5,7 @@
     <meta charset="UTF-8" />
     <link rel="icon" href="/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Welcome to Vuetify 3</title>
+    <title>GOptivum</title>
 </head>
 
 <body>
diff --git a/web/optivum-better-schedule-frontend/public/favicon.ico b/web/optivum-better-schedule-frontend/public/favicon.ico
deleted file mode 100644
index 8fb9f91b3aab4eec0c76ffc5342528033c61e247..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15406
zcmeHO3v5%@8NNVarCoU?zSqezmT6npu}xxXJJhY(x=s~hQ>SSYYSncU&|(|9Y?QVX
z@}TB1G8mASM;tRKYgJkrAW)&g7${B%c>oE7;)O>NNO_bu4G-IdNB({Pb<Xw8^|j;J
zP9IaQbaZ@={r}&0{`30JIlm>TkJL{ZGDJe2DLL+vq#sL?l$jZPe_*I2y@|4sBRjso
zUy`aUlJo$60})6B%aMKN&yMG1<zTj~#0%`PD=WP-l$G(wmp-5NV42-|r~YN-j;}EF
z!EWm41KA2B+Uc;;wdHaJu^D50JQJ0tSyrSo^JVh8QlE}dT!P$YA<OxZnF{#}EhosG
zeot3AX!pF7QkycW%w}yDI`+K;d6!H+m+XutPp3D1ooe$NsOrUmkbO(Y?|Q+i$_HGs
z&;R<+;gNJuQ^|W&<0Pue&il`V)O5&S6FROgV;jhHz0k7OOrDxc9z|+b<*Re9Q_ZxD
zGMkbu<S!Kj<)Ne9@3uUu*Fog$3)xyEqP_XR&tVR0JmWI&h8>Qvjth%4dDy{HM^34)
z&_TyGJg3UC{J|n2-wr)LDYwhNWBH4VL-JgYz;erTEKiMF20`|$Cf~GysBU40j@&)u
zboK>@(yL25%R|RmS~6@99bG>PviV`j>&k~M@~J%cn{`uCzUOyY^23rlWt6DH=aut3
zlZo^g63<V)Px39mb5D2XpJX%e*yU#rzA8VPY`wAQ+xAE0UaSMBK6+I-MQ<zj#v+r<
z-;~>xIXwP(4)hgT<|I>hSGqh7YbLP$jL+%p0>vM2Su?wmOV;-uyLFww=KN5Ox{j<%
zmi}mZc22bZyxbmI!x+Ch3+qsk+#YbHJ{C<j(eH}KO8v_0%6@&_#b;iJu#VPKF`Tj<
zddh6FP2d^x<FmE3+};!Lo^eBlV7)qT#1-!crUmh_ex0WR_DYlc!0z(|mRY`QGR7g+
zUtWXZ6BQ&EU6RTsTF02->dQjDh~;LRJB63Pq&~p<P>*N){PEn7FA;EAwj=|b_AUGw
z{Eb1Zt8`N8chL?vjkw~yAvg~N+W_qV|N7U7a3HGfPY0GBqUxOaLJzPO2|Qz7H&yF{
z!Y@7SbxH$-Y<F|`UN6%A#q6`)psMNLX8Bs%(7~90&Ka@!UHHRlAJqDyJhi*H{CjFF
zwgCTAs{MP=XROTrK<FurG7kuUT5y0*+j`BV$U-*OoSHVcflst&Zimkb-?=9H36_sG
z4_+|%!^{KYaz(7T{5v|jaU>lpxgCaImE$Fk6T4dUMU!=a+u##*PZb&m9d@{VbA<&v
z;n*Hvm#Nt5zF}Ud{=9#v%+3;8${f~WV?Q`CFATe5JXp$wT(q1TOU7#0jK6PDXZ)(1
zOSF4N3hStRA?+K$*ZctH(lRF!KFSL%W20hM6%Rz+k9We?_C36J>PVG2%Y`27X;nW+
z*x`6oe7S`dXABgw#vFYvuM;-c|L9ua=7z9?9B!c<e!%kV2Lk(~z;Dsbfnp5kbM(bL
zBQC#F<Aw}s-f%q(pE>L=Fyiz34xz{6kpCd?PeyG2V7mkg<?H?>!!m@d$btKgDK_Ib
zt|Qt#$Am-fZ&{xA0GOAnn8Ue+QQBY3NiO*vfvd{5lsp3L_K5f@hhj{}^Nk#us4?p+
ztOM)g!<ZNEnCxe@^+4AS?eNzgQL(WP2JW7y*o-gIp?_gaEQUR13og@H4?lHN<<&Y2
zGhAJn1$%I*FYm)?|LP%eCy(>1L3Ff(Tk8KQe4khoQS4_&0;4zo|FQr(iM%k4L+U*z
zff0J2FQWxM*K?>u4d$6_8R>l`cK<L@ykyF&XW4e^)&tY5TWNLX-O1G5)4F*5!#Ubh
z@LO7|vy|3LuPaY|nbt&)Ej<-?5!=}B;=Lby|7};@>8U+!w`A!D@A2^2+L%A~GSv8*
z(uV!wgk<UONj;SgMF#IPDtG3ORR4-X*#Dl1XTRH%T#dTDW2FJ`*H`Gd^XE$Rq07N@
z#1%M4jQiZeh?nel+}}PC=`8TX-}u}|K7XS~R?iBOjh(2zT@zC8E3>D)YqY(1-;X}j
zv4?n<R;AvTC|<JV(Qlqax+3@*^PQ8d#CtH@$zJglDNiOFKM{Q$Yt?^^oQ>}%=LOp!
z;8GgCC~I2q%*#5{$kpuKJ6-ET<XbK~d-6^o*7o4I2h8;!oAEW4)%-Qshl1n4aw3j6
ziCAgH^t-CD83W60)}`Qi$H>*}o#)Z>p>vQsxF25{?c6CQ5()gsGtn{<JTI7WH7nyW
z+%i|!hYID3zU3(oCqN+~(b9?XXz=uzag9`VI9K6yK+L6l2K;YYBB^IZ36Y6IxMI@q
zp&onMrbt}P$~$}sjX%c1ZHxn39PmjIDW9bL20SmDaWyNe`HMoWZ-ngMF_xP?t9xQK
z_GZfxt-Uwf((fsEC~M5Pnw4>Ul`*ykb!bDMnnlGUdfYdn+9lsY%+pJ_Z_xHs+imH?
z!L`+luUT1yv*4C1Z&<#Qlui*r2~lxBI`sAm+}oX{s=OcRf9A0%Q^56>8DC==kKtgy
z>D-TeE@f3uu4&Y?ZVVlM3wLg~Z>Y}xfNE|1MIAijELQN`Y2<45F5=t5>wtYuk>yuH
zXEJj-vN;uZD0|537U$Eq5Oek?f#JlNGq{dN(qiDuxO185eWG@Tuk1zKUsCs)MAVm#
zZTvIN+Wl0&MDXYQF#3{qXA$(Ft>uw;>&qkE2f#n|`-?1D`gl8Gqj+=j77qvaV7#CH
z-mDV$x0TsBRP5B|jZ%mFQ}FDv4Rn5l$yl(|`Q7Oe;~u+P58Qvv*6uy)7U=EIpPM-5
zPv}(pkwc!Zx3$@4;Y){)0d<dX8|^S#=u9N1#!Vx@J)qswgx?jR4!O&CT@W}GJfGUE
z4Q9MWS@SIOIY`teP$UQ1mJR#9&>2tO5v#db<IZ<Yb^kEhpWg!*%fA#D9;b8{eCn6M
zH6ZvJ^TT=3`K$FPvTVNW9y(a)?QV{H%V)s-YA62Ycb2%n&Z(w~>4**wJ~;d2`ShTX
zw|GaKwMoD4ydIzqSN(;l&j_8}$q^eYga7tU+}Zvgxy<a(Wj@4%IQ0E!rz7q6;A<L}
zg80B#`15{wdpzex7_)Y8Zwuqk_mtwkJUrix@4hDN#CuD`)U6dZ*XQhqioV`O&c2aD
z=!_+&;~!eV`&<}zw*S%h5brU|ybhJww|PF*V{Er6Kg3wp?%_op>O*m1UDkuojePFZ
zG`-$PpE1`DpyrLMO}R7wCfu3t6Y<u%*o9DA_^4vW{X)OjIbuM$BP}1iJNZVj_8-wU
z=trvwx`f_HIW?{yjlO>|B7d%f_n+{8^32;HSdS9&hVGwt*sUYr-!%%`a~|XP)!GJa
zaPfvq9vz7{ms4}`U~qpQ+@r?~G$CeSuOWUWWPj8xrxoKsi%ALkMoN~Re@yeI<`b#&
zQakqh?^Bfdlv*~90r${a#kP)=j;z5r;Qua|_8~6ciamnnhpFd84r{fjgNVx%{UgRa
z5XnEKlf}cZ&elidYgP}Qi}Z0^o$C^y%G~k#_Qp8=1^BDy6=xQN&GlMeiCUK;x&F$^
zjA44c!M?-)Y1kOO--Oix|DE7=F!d?WE|oc-P;ICUYO&YsIA3qS68`^+SoxzLDfxQ-
z)V%&7_{XQaWqV^?8s0=b5Yxwfs(L2+kBDu`F4FIF*gxGfML8AK#-01US-npCiqalZ
z?M~DOWA<^ZR|~P;79^A!*A-C1sshAC6<~Z9P|a%vs7IcNOJh792S@Vc$sCItcXG)K
z1Fn?E#hswKujQD~WT#qpf3`ix0(EL{#By^?PeQ2&<H7Y@dq4MDpw|Mu7Kmhl{{gYD
Bh2#JL

diff --git a/web/optivum-better-schedule-frontend/src/App.vue b/web/optivum-better-schedule-frontend/src/App.vue
index 65d6f77..aa4d4f5 100644
--- a/web/optivum-better-schedule-frontend/src/App.vue
+++ b/web/optivum-better-schedule-frontend/src/App.vue
@@ -5,7 +5,7 @@
   </v-app>
 </template>
 
-<style scoped>
+<style>
 @import url('https://fonts.googleapis.com/css2?family=Overpass:wght@300;400;600;700&display=swap');
 @import url('https://fonts.googleapis.com/css2?family=Material+Icons+Outlined');
 
@@ -14,4 +14,25 @@ body,
 .v-application {
   font-family: 'Overpass', sans-serif; 
 }
+
+.text-gradient-yellow-pink {
+  background: linear-gradient(90deg, #f9e79f, #f1948a);
+  background-clip: text;
+  -webkit-background-clip: text;
+  -webkit-text-fill-color: transparent;
+}
+
+.text-gradient-green {
+  background: linear-gradient(90deg, #50fa7b, #3ff57c);
+  background-clip: text;
+  -webkit-background-clip: text;
+  -webkit-text-fill-color: transparent;
+}
+
+.text-gradient-blue-purple {
+  background: linear-gradient(90deg, #8be9fd, #6272a4);
+  background-clip: text;
+  -webkit-background-clip: text;
+  -webkit-text-fill-color: transparent;
+}
 </style>
\ No newline at end of file
diff --git a/web/optivum-better-schedule-frontend/src/components/AnimationsSwitcher.vue b/web/optivum-better-schedule-frontend/src/components/AnimationsSwitcher.vue
new file mode 100644
index 0000000..f9e0121
--- /dev/null
+++ b/web/optivum-better-schedule-frontend/src/components/AnimationsSwitcher.vue
@@ -0,0 +1,43 @@
+<!-- AnimationsSwitcher.vue -->
+<template>
+	<v-container class="fill-height d-flex justify-center align-center pa-0">
+		<div class="text-center">
+			<span class="animations-title">{{ t('animations.name') }}</span>
+			<v-switch v-model="reducedAnimationsEnabled" hide-details inset color="secondary" />
+		</div>
+	</v-container>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useMiscStore } from '@/stores/miscStore';
+
+const { t } = useI18n();
+
+const miscStore = useMiscStore();
+const reducedAnimationsEnabled = computed({
+	get: () => miscStore.reducedAnimationsEnabled,
+	set: (value) => {
+		miscStore.reducedAnimationsEnabled = value;
+	},
+});
+</script>
+
+<style scoped>
+.text-center {
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
+	text-align: center;
+}
+
+.animations-title {
+	font-size: 1.25rem;
+	font-weight: bold;
+	display: block;
+	user-select: none;
+	margin-top: 1rem;
+}
+</style>
diff --git a/web/optivum-better-schedule-frontend/src/components/DivisionButton.vue b/web/optivum-better-schedule-frontend/src/components/DivisionButton.vue
index 3dfb39f..6eac9bd 100644
--- a/web/optivum-better-schedule-frontend/src/components/DivisionButton.vue
+++ b/web/optivum-better-schedule-frontend/src/components/DivisionButton.vue
@@ -12,11 +12,14 @@
 </template>
 
 <script setup lang="ts">
-import { ref, onUnmounted, watchEffect } from 'vue';
+import { ref, onUnmounted, watchEffect, computed } from 'vue';
 import VanillaTilt from 'vanilla-tilt';
 import { useTheme } from 'vuetify';
+import { useMiscStore } from '@/stores/miscStore';
 
 const theme = useTheme();
+const miscStore = useMiscStore();
+const reducedAnimationsEnabled = computed(() => miscStore.reducedAnimationsEnabled);
 
 const getButtonColor = (index: number) => {
 	const colors = theme.current.value.colors;
@@ -35,14 +38,14 @@ const props = defineProps<{
 }>();
 
 const tilt = ref<VanillaTiltHTMLElement | null>(null);
-const enableTilt = ref(window.innerWidth > 700);
+const enableTilt = ref(window.innerWidth > 700 && !reducedAnimationsEnabled.value);
 
 watchEffect(() => {
 	if (enableTilt.value && tilt.value) {
 		VanillaTilt.init(tilt.value, {
 			max: 15,
 			speed: 400,
-			scale: 1.05,
+			scale: 1.1,
 			glare: false,
 			reverse: false,
 			transition: true,
diff --git a/web/optivum-better-schedule-frontend/src/components/LanguageSwitcher.vue b/web/optivum-better-schedule-frontend/src/components/LanguageSwitcher.vue
index 318f2b0..a0d0b05 100644
--- a/web/optivum-better-schedule-frontend/src/components/LanguageSwitcher.vue
+++ b/web/optivum-better-schedule-frontend/src/components/LanguageSwitcher.vue
@@ -20,7 +20,6 @@ const { t } = useI18n();
 const localeStore = useLocaleStore();
 
 const currentLanguage = ref(localeStore.currentLocale);
-
 const languageCodes = ['en', 'pl', 'uk'];
 
 const languages = computed(() => {
@@ -46,6 +45,14 @@ watch(
 </script>
 
 <style scoped>
+.text-center {
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
+	text-align: center;
+}
+
 .language-title {
 	font-size: 1.25rem;
 	font-weight: bold;
diff --git a/web/optivum-better-schedule-frontend/src/components/Overlay.vue b/web/optivum-better-schedule-frontend/src/components/Overlay.vue
index 1d5e228..53f1da5 100644
--- a/web/optivum-better-schedule-frontend/src/components/Overlay.vue
+++ b/web/optivum-better-schedule-frontend/src/components/Overlay.vue
@@ -10,7 +10,7 @@
 							<v-icon>{{ item.prependIcon }}</v-icon>
 						</template>
 						<template #title>
-							<span>{{ item.title }}</span>
+							<span class="nav-item-title">{{ item.title }}</span>
 						</template>
 					</v-list-item>
 				</v-list>
@@ -109,6 +109,10 @@ const items = computed(() => [
 	font-size: 1.5rem;
 }
 
+.nav-item-title {
+	user-select: none;
+}
+
 .no-scroll {
 	overflow: hidden !important;
 }
diff --git a/web/optivum-better-schedule-frontend/src/components/RoomButton.vue b/web/optivum-better-schedule-frontend/src/components/RoomButton.vue
index 513cdd5..8f01c81 100644
--- a/web/optivum-better-schedule-frontend/src/components/RoomButton.vue
+++ b/web/optivum-better-schedule-frontend/src/components/RoomButton.vue
@@ -3,7 +3,7 @@
 		<v-btn class="button" :style="{ backgroundColor: getButtonColor(index) }" :ripple="true" elevation="8"
 			variant="text" rounded="xl" :to="`/room/${props.id}`" nav link>
 			<div class="button-content">
-				<span :class="['full-name', fontSizeClass]">{{ props.text }}</span>
+				<span :class="['full-name', fontSizeClass]">{{ full_name }}</span>
 			</div>
 		</v-btn>
 	</div>
@@ -13,8 +13,11 @@
 import { ref, onUnmounted, watchEffect, computed } from 'vue';
 import VanillaTilt from 'vanilla-tilt';
 import { useTheme } from 'vuetify';
+import { useMiscStore } from '@/stores/miscStore';
 
 const theme = useTheme();
+const miscStore = useMiscStore();
+const reducedAnimationsEnabled = computed(() => miscStore.reducedAnimationsEnabled);
 
 const getButtonColor = (index: number) => {
 	const colors = theme.current.value.colors;
@@ -32,15 +35,19 @@ const props = defineProps<{
 	id: number;
 }>();
 
+const full_name = computed(() => {
+	return props.text === props.designator ? props.text : `${props.text} (${props.designator})`;
+});
+
 const tilt = ref<VanillaTiltHTMLElement | null>(null);
-const enableTilt = ref(window.innerWidth > 700);
+const enableTilt = ref(window.innerWidth > 700 && !reducedAnimationsEnabled.value);
 
 watchEffect(() => {
 	if (enableTilt.value && tilt.value) {
 		VanillaTilt.init(tilt.value, {
 			max: 15,
 			speed: 400,
-			scale: 1.05,
+			scale: 1.1,
 			glare: false,
 			reverse: false,
 			transition: true,
@@ -63,7 +70,6 @@ onUnmounted(() => {
 	window.removeEventListener('resize', resizeHandler);
 });
 
-// Compute a class based on text length
 const fontSizeClass = computed(() => {
 	if (props.text.length <= 5) return 'font-large';
 	if (props.text.length <= 10) return 'font-medium';
@@ -113,17 +119,17 @@ const fontSizeClass = computed(() => {
 }
 
 .font-large {
-	font-size: 1.5rem;
+	font-size: 1.85rem;
 	font-weight: 800;
 }
 
 .font-medium {
-	font-size: 1.2rem;
+	font-size: 1.25rem;
 	font-weight: 800;
 }
 
 .font-small {
-	font-size: 1rem;
+	font-size: 0.9rem;
 	font-weight: 800;
 }
 
diff --git a/web/optivum-better-schedule-frontend/src/components/ScheduleTable.vue b/web/optivum-better-schedule-frontend/src/components/ScheduleTable.vue
index 5a87a78..e313de4 100644
--- a/web/optivum-better-schedule-frontend/src/components/ScheduleTable.vue
+++ b/web/optivum-better-schedule-frontend/src/components/ScheduleTable.vue
@@ -1,16 +1,16 @@
 <template>
-	<v-slide-y-transition appear>
-		<v-empty-state v-if="notFound" headline="404" :title="t('page.not_found')" />
+	<v-slide-y-transition appear mode="out-in">
+		<v-empty-state v-if="notFound" headline="404" :title="t('page.not_found')" :key="transitionKey" />
 	</v-slide-y-transition>
 
 	<v-row class="division-grid" align="center" justify="center">
-		<v-slide-y-transition appear>
-			<div class="schedule-title-container pa-0">
+		<v-slide-x-reverse-transition appear mode="out-in">
+			<div class="schedule-title-container pa-0" :key="transitionKey">
 				<span class="schedule-title">{{ title }}</span>
 			</div>
-		</v-slide-y-transition>
-		<v-fade-transition appear>
-			<div class="schedule-container grid-item pa-0">
+		</v-slide-x-reverse-transition>
+		<v-fade-transition appear mode="out-in">
+			<div class="schedule-container grid-item pa-0" :key="transitionKey">
 				<!-- Mobile View -->
 				<template v-if="isMobileView">
 					<v-card variant="flat">
@@ -41,27 +41,29 @@
 											<div v-for="lesson in lessonGroup.lessons" :key="lesson.full_name"
 												class="stacked-lesson">
 												<span class="schedule-lesson-name">{{ lesson.full_name }}</span>
-												&nbsp;
-												<router-link
-													v-if="lesson.teacher_designator && teacherIndexes[lesson.teacher_designator] !== undefined"
-													:to="'/teacher/' + teacherIndexes[lesson.teacher_designator]"
-													class="schedule-lesson-teacher">
-													{{ lesson.teacher_designator }}
-												</router-link>
-												&nbsp;
-												<router-link
-													v-if="lesson.room_designator && roomIndexes[lesson.room_designator] !== undefined"
-													:to="'/room/' + roomIndexes[lesson.room_designator]"
-													class="schedule-lesson-room">
-													{{ lesson.room_designator }}
-												</router-link>
-												&nbsp;
-												<router-link
-													v-if="lesson.division_designator && divisionIndexes[lesson.division_designator] !== undefined"
-													:to="'/division/' + divisionIndexes[lesson.division_designator]"
-													class="schedule-lesson-division">
-													{{ lesson.division_designator }}
-												</router-link>
+												<template v-if="showTeacherLink && lesson.teacher_designator">
+													&nbsp;<router-link
+														:to="'/teacher/' + teacherIndexes[lesson.teacher_designator]"
+														class="schedule-lesson-teacher">
+														{{ lesson.teacher_designator }}
+													</router-link>&nbsp;
+												</template>
+
+												<template v-if="showDivisionLink && lesson.division_designator">
+													&nbsp;<router-link
+														:to="'/division/' + divisionIndexes[lesson.division_designator]"
+														class="schedule-lesson-division">
+														{{ lesson.division_designator }}
+													</router-link>&nbsp;
+												</template>
+
+												<template v-if="showRoomLink && lesson.room_designator">
+													&nbsp;<router-link
+														:to="'/room/' + roomIndexes[lesson.room_designator]"
+														class="schedule-lesson-room">
+														{{ lesson.room_designator }}
+													</router-link>&nbsp;
+												</template>
 											</div>
 										</td>
 									</tr>
@@ -102,18 +104,29 @@
 										<div v-for="lesson in day.lesson_groups.find((lg: LessonGroup) => formatTime(lg.lessons[0]?.time_range.start) + ' - ' + formatTime(lg.lessons[0]?.time_range.end) === timeRange)?.lessons"
 											:key="lesson.full_name" class="stacked-lesson">
 											<span class="schedule-lesson-name">{{ lesson.full_name }}</span>
-											&nbsp;
-											<router-link v-if="lesson.teacher_designator"
-												:to="'/teacher/' + teacherIndexes[lesson.teacher_designator]"
-												class="schedule-lesson-teacher">
-												{{ lesson.teacher_designator }}
-											</router-link>
-											&nbsp;
-											<router-link v-if="lesson.room_designator"
-												:to="'/room/' + roomIndexes[lesson.room_designator]"
-												class="schedule-lesson-room">
-												{{ lesson.room_designator }}
-											</router-link>
+
+											<template v-if="showTeacherLink && lesson.teacher_designator">
+												&nbsp;<router-link
+													:to="'/teacher/' + teacherIndexes[lesson.teacher_designator]"
+													class="schedule-lesson-teacher">
+													{{ lesson.teacher_designator }}
+												</router-link>&nbsp;
+											</template>
+
+											<template v-if="showDivisionLink && lesson.division_designator">
+												&nbsp;<router-link
+													:to="'/division/' + divisionIndexes[lesson.division_designator]"
+													class="schedule-lesson-division">
+													{{ lesson.division_designator }}
+												</router-link>&nbsp;
+											</template>
+
+											<template v-if="showRoomLink && lesson.room_designator">
+												&nbsp;<router-link :to="'/room/' + roomIndexes[lesson.room_designator]"
+													class="schedule-lesson-room">
+													{{ lesson.room_designator }}
+												</router-link>&nbsp;
+											</template>
 										</div>
 									</div>
 									<div v-else>&nbsp; <!-- Placeholder for empty cells --></div>
@@ -128,15 +141,12 @@
 </template>
 
 <script setup lang="ts">
-import { ref, onMounted, computed } from 'vue';
+import { ref, onMounted, computed, watch } from 'vue';
 import axios from 'axios';
 import { useI18n } from 'vue-i18n';
 import { useTheme } from 'vuetify';
-import { useRoute } from 'vue-router';
 
-const route = useRoute();
-const id = Number(route.params.id);
-const props = defineProps<{ type: 'teacher' | 'room' | 'division' }>();
+const props = defineProps<{ id: string; type: 'teacher' | 'room' | 'division' }>();
 
 interface TimeRange {
 	hour?: number;
@@ -173,6 +183,11 @@ interface DivisionData {
 	schedule: Schedule;
 }
 
+interface IndexesResponse {
+	designators: Record<string, { values: number[] }>;
+	full_names: Record<string, { values: number[] }>;
+}
+
 const { t } = useI18n();
 const theme = useTheme();
 
@@ -182,16 +197,33 @@ const scheduleData = ref<DivisionData | null>(null);
 const title = computed(() => {
 	const fullName = scheduleData.value?.full_name ?? '';
 	const designator = scheduleData.value?.designator ? ` (${scheduleData.value.designator})` : '';
+	if (fullName === scheduleData.value?.designator) {
+		if (props.type === 'room') {
+			return t('schedule.room_title_prefix') + scheduleData.value.designator;
+		}
+
+		return fullName;
+	}
+
 	return fullName + designator;
 });
+
+// Used to force transition when the id changes
+const transitionKey = computed(() => props.id);
+
+const showTeacherLink = computed(() => props.type !== 'teacher');
+const showDivisionLink = computed(() => props.type !== 'division');
+const showRoomLink = computed(() => props.type !== 'room');
+
 const teacherIndexes = ref<Record<string, number>>({});
 const roomIndexes = ref<Record<string, number>>({});
 const divisionIndexes = ref<Record<string, number>>({});
+
 const notFound = ref(false);
 const isMobileView = ref(window.innerWidth < mobileViewBreakpoint);
 const activeTab = ref(0);
 
-window.addEventListener("resize", () => {
+window.addEventListener('resize', () => {
 	isMobileView.value = window.innerWidth < mobileViewBreakpoint;
 });
 
@@ -200,9 +232,19 @@ const getRowColor = (rowIndex: number) => {
 	return rowIndex % 2 === 0 ? colors.background : colors.surface;
 };
 
+function extractIndexes(data: Record<string, { values: number[] }>): Record<string, number> {
+	const indexes: Record<string, number> = {};
+	for (const key in data) {
+		if (data[key].values && data[key].values.length > 0) {
+			indexes[key] = data[key].values[0];
+		}
+	}
+	return indexes;
+}
+
 const fetchData = async () => {
 	try {
-		const scheduleResponse = await axios.get(`/api/v1/${props.type}/${id}`);
+		const scheduleResponse = await axios.get(`/api/v1/${props.type}/${props.id}`);
 		if (scheduleResponse.status === 404) {
 			notFound.value = true;
 			return;
@@ -215,22 +257,22 @@ const fetchData = async () => {
 				axios.get(`/api/v1/rooms`),
 				axios.get(`/api/v1/teachers`),
 			]);
-			roomIndexes.value = roomsResponse.data.designators;
-			teacherIndexes.value = teachersResponse.data.designators;
+			roomIndexes.value = extractIndexes((roomsResponse.data as IndexesResponse).designators);
+			teacherIndexes.value = extractIndexes((teachersResponse.data as IndexesResponse).designators);
 		} else if (props.type === 'teacher') {
 			const [roomsResponse, divisionsResponse] = await Promise.all([
 				axios.get(`/api/v1/rooms`),
 				axios.get(`/api/v1/divisions`),
 			]);
-			roomIndexes.value = roomsResponse.data.designators;
-			divisionIndexes.value = divisionsResponse.data.designators;
+			roomIndexes.value = extractIndexes((roomsResponse.data as IndexesResponse).designators);
+			divisionIndexes.value = extractIndexes((divisionsResponse.data as IndexesResponse).designators);
 		} else if (props.type === 'room') {
 			const [teachersResponse, divisionsResponse] = await Promise.all([
 				axios.get(`/api/v1/teachers`),
 				axios.get(`/api/v1/divisions`),
 			]);
-			teacherIndexes.value = teachersResponse.data.designators;
-			divisionIndexes.value = divisionsResponse.data.designators;
+			teacherIndexes.value = extractIndexes((teachersResponse.data as IndexesResponse).designators);
+			divisionIndexes.value = extractIndexes((divisionsResponse.data as IndexesResponse).designators);
 		}
 	} catch (err) {
 		console.error('Error fetching data:', err);
@@ -240,6 +282,14 @@ const fetchData = async () => {
 
 onMounted(fetchData);
 
+// This had to be done because I changed the way the component is used in the parent component
+watch(
+	() => [props.id, props.type],
+	() => {
+		fetchData();
+	}
+);
+
 const uniqueTimeRanges = computed(() => {
 	const timeSet = new Set<string>();
 	scheduleData.value?.schedule.schedule_days.forEach((day) => {
@@ -264,7 +314,7 @@ const availableDayNames = computed(() => {
 		t('day.thursday'),
 		t('day.friday'),
 		t('day.saturday'),
-		t('day.sunday')
+		t('day.sunday'),
 	];
 	return dayNames.slice(0, scheduleData.value?.schedule.schedule_days.length ?? 0);
 });
@@ -275,7 +325,6 @@ function formatTime(time: TimeRange | undefined): string {
 	const minutes = time.minute !== undefined ? String(time.minute).padStart(2, '0') : '00';
 	return `${hours}:${minutes}`;
 }
-
 </script>
 
 <style scoped>
@@ -322,7 +371,7 @@ function formatTime(time: TimeRange | undefined): string {
 	text-align: left;
 	overflow-wrap: break-word;
 	word-break: break-word;
-	font-size: 1vh;
+	font-size: 1.5vh;
 	border: 1px solid rgba(255, 255, 255, 0.15);
 	white-space: normal;
 }
@@ -330,7 +379,7 @@ function formatTime(time: TimeRange | undefined): string {
 .schedule-title-container {
 	width: 100%;
 	height: auto;
-	margin-top: 2vh;
+	margin-top: 0vh;
 	margin-bottom: 1vh;
 	display: flex;
 	justify-content: center;
@@ -369,9 +418,10 @@ function formatTime(time: TimeRange | undefined): string {
 .schedule-lesson-teacher,
 .schedule-lesson-room,
 .schedule-lesson-division {
-    font-size: 1.25vh;
+    font-size: 1.5vh;
     display: inline;
     white-space: nowrap;
+	text-decoration: none;
 }
 
 .stacked-lesson {
diff --git a/web/optivum-better-schedule-frontend/src/components/TeacherButton.vue b/web/optivum-better-schedule-frontend/src/components/TeacherButton.vue
index b46c31a..00ba43a 100644
--- a/web/optivum-better-schedule-frontend/src/components/TeacherButton.vue
+++ b/web/optivum-better-schedule-frontend/src/components/TeacherButton.vue
@@ -12,11 +12,14 @@
 </template>
 
 <script setup lang="ts">
-import { ref, onUnmounted, watchEffect } from 'vue';
+import { ref, onUnmounted, watchEffect, computed } from 'vue';
 import VanillaTilt from 'vanilla-tilt';
 import { useTheme } from 'vuetify';
+import { useMiscStore } from '@/stores/miscStore';
 
 const theme = useTheme();
+const miscStore = useMiscStore();
+const reducedAnimationsEnabled = computed(() => miscStore.reducedAnimationsEnabled);
 
 const getButtonColor = (index: number) => {
 	const colors = theme.current.value.colors;
@@ -35,14 +38,14 @@ const props = defineProps<{
 }>();
 
 const tilt = ref<VanillaTiltHTMLElement | null>(null);
-const enableTilt = ref(window.innerWidth > 700);
+const enableTilt = ref(window.innerWidth > 700 && !reducedAnimationsEnabled.value);
 
 watchEffect(() => {
 	if (enableTilt.value && tilt.value) {
 		VanillaTilt.init(tilt.value, {
 			max: 15,
 			speed: 400,
-			scale: 1.05,
+			scale: 1.1,
 			glare: false,
 			reverse: false,
 			transition: true,
diff --git a/web/optivum-better-schedule-frontend/src/components/ThemeSwitcher.vue b/web/optivum-better-schedule-frontend/src/components/ThemeSwitcher.vue
index 1dd9d46..554b196 100644
--- a/web/optivum-better-schedule-frontend/src/components/ThemeSwitcher.vue
+++ b/web/optivum-better-schedule-frontend/src/components/ThemeSwitcher.vue
@@ -1,13 +1,14 @@
 <!-- ThemeSwitcher.vue -->
 <template>
 	<v-container class="fill-height d-flex justify-center align-center pa-0">
-		<div class=" text-center">
+		<div class="text-center">
 			<span class="theme-title">{{ t('theme.name') }}</span>
 			<v-btn-toggle v-model="currentTheme" mandatory class="ma-4 elevation-8" color="tertiary" variant="outlined">
 				<v-btn value="dracula" icon="mdi-ghost" />
 				<v-btn value="dark" icon="mdi-weather-night" />
 				<v-btn value="auto" icon="mdi-auto-mode" />
 				<v-btn value="light" icon="mdi-weather-sunny" />
+				<v-btn value="oled" icon="mdi-sprout" />
 			</v-btn-toggle>
 		</div>
 	</v-container>
@@ -38,6 +39,14 @@ watch(
 </script>
 
 <style scoped>
+.text-center {
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
+	text-align: center;
+}
+
 .theme-title {
 	font-size: 1.25rem;
 	font-weight: bold;
diff --git a/web/optivum-better-schedule-frontend/src/components/Weather.vue b/web/optivum-better-schedule-frontend/src/components/Weather.vue
index d98a4b4..7012f75 100644
--- a/web/optivum-better-schedule-frontend/src/components/Weather.vue
+++ b/web/optivum-better-schedule-frontend/src/components/Weather.vue
@@ -1,21 +1,32 @@
 <!-- Weather.vue -->
 <template>
   <v-row class="d-flex justify-center align-center flex-nowrap" no-gutters>
-    <v-card class="weather-card" :loading="isLoading" flat>
+    <v-card class="weather-card" flat>
       <v-row class="justify-center align-center weather-info">
-        <v-col class="text-center" cols="6">
+        <v-col class="text-center" cols="4">
           <span class="location-info">{{ locationName }}</span>
-          <div class="temp-info">
+          <div class="info">
             <v-icon class="condition-icon">{{ conditionIcon }}</v-icon>
             <span class="temperature">{{ temperature }}</span>
           </div>
         </v-col>
-        <v-col class="text-right condition-col" cols="6">
-          <div class="d-flex flex-column align-end">
+
+        <v-col class="text-right condition-col" cols="4">
+          <div class="d-flex flex-column justify-center align-center">
             <span class="condition-text">{{ conditionName }}</span>
             <span class="condition-text-lower">{{ conditionDescription }}</span>
           </div>
         </v-col>
+
+        <v-col class="text-center" cols="4">
+          <div class="d-flex flex-column justify-center align-center">
+            <span class="condition-text">{{ t('air_quality.quality') }}</span>
+            <span class="condition-text-lower">{{ airQualityLabel }}</span>
+          </div>
+          <div class="info">
+            <v-icon class="air-quality-icon">{{ airQualityIcon }}</v-icon>
+          </div>
+        </v-col>
       </v-row>
       <v-divider></v-divider>
       <v-card-text class="forecast-section">
@@ -65,6 +76,11 @@ const conditionName = ref(t(`weather.conditions.${randomConditionName}`));
 const conditionDescription = ref(t(`weather.conditions.${randomConditionDescription}`));
 const conditionIcon = ref(getConditionIcon(randomConditionName));
 
+const airQualityIndex = ref(0);
+const airQualityLabel = ref('');
+const airQualityIcon = ref('');
+
+
 interface ForecastDay {
   code: number;
   name: string;
@@ -138,11 +154,15 @@ const fetchWeatherData = async (retryDelay = 1000) => {
       setTimeout(() => fetchWeatherData(retryDelay * 1.5), retryDelay);
     } else {
       console.error('Error fetching weather data:', error);
-      isLoading.value = false;
+      setTimeout(() => {
+        isLoading.value = false;
+      }, 1000);
     }
   } finally {
     if (isLoading.value) {
-      isLoading.value = false;
+      setTimeout(() => {
+        isLoading.value = false;
+      }, 1000);
     }
   }
 };
@@ -176,6 +196,39 @@ const processWeatherData = (currentData: any, forecast: any[]) => {
   });
 };
 
+function getAirQualityInfo(pm25: number, pm10: number) {
+  const aqi = Math.max(pm25, pm10);
+
+  if (aqi <= 12) {
+    return { label: t('air_quality.conditions.very_good'), icon: 'mdi-emoticon-outline' };
+  } else if (aqi <= 35.4) {
+    return { label: t('air_quality.conditions.good'), icon: 'mdi-emoticon-neutral-outline' };
+  } else if (aqi <= 55.4) {
+    return { label: t('air_quality.conditions.moderate'), icon: 'mdi-emoticon-confused-outline' };
+  } else if (aqi <= 150.4) {
+    return { label: t('air_quality.conditions.unhealthy_for_sensitive_groups'), icon: 'mdi-emoticon-sad-outline' };
+  } else if (aqi <= 250.4) {
+    return { label: t('air_quality.conditions.very_unhealthy'), icon: 'mdi-emoticon-frown-outline' };
+  } else {
+    return { label: t('air_quality.conditions.hazardous'), icon: 'mdi-emoticon-dead-outline' };
+  }
+}
+
+const fetchAirQualityData = async () => {
+  try {
+    const response = await axios.get('/api/v1/air/current');
+    const components = response.data.components;
+    const { label, icon } = getAirQualityInfo(components.pm2_5, components.pm10);
+
+    airQualityIndex.value = Math.max(components.pm2_5, components.pm10);
+    airQualityLabel.value = label;
+    airQualityIcon.value = icon;
+  } catch (error) {
+    console.error('Error fetching air quality data:', error);
+  }
+};
+
+
 const getDayName = (dayOfWeek: number) => {
   const days = [
     'monday',
@@ -212,8 +265,12 @@ let intervalId: number | null = null;
 
 onMounted(() => {
   fetchWeatherData();
+  fetchAirQualityData();
 
-  intervalId = setInterval(fetchWeatherData, CACHE_DURATION);
+  intervalId = setInterval(() => {
+    fetchWeatherData();
+    fetchAirQualityData();
+  }, CACHE_DURATION);
 });
 
 onUnmounted(() => {
@@ -235,32 +292,33 @@ onUnmounted(() => {
   margin-bottom: 1vw;
 }
 
+.air-quality-info,
 .location-info {
   font-size: 3vw;
   font-weight: 800;
   white-space: nowrap;
-  color: var(--v-primary-base);
   user-select: none;
 }
 
-.temp-info {
+.info {
   display: flex;
   justify-content: center;
   align-items: center;
   margin-top: 0.5vw;
 }
 
+.air-quality-icon,
 .condition-icon {
   font-size: 4vw;
   margin-right: 1vw;
-  color: var(--v-warning-base);
+  color: rgb(var(--v-theme-gradient2));
   user-select: none;
 }
 
 .temperature {
   font-size: 3vw;
   font-weight: 600;
-  color: var(--v-primary-darken1);
+  color: rgb(var(--v-theme-gradient2));
   user-select: none;
 }
 
@@ -270,19 +328,18 @@ onUnmounted(() => {
 
 .condition-text {
   font-size: 2vw;
-  font-weight: 600;
-  color: var(--v-secondary-lighten2);
-  text-align: right;
+  font-weight: 800;
+  text-align: center;
   white-space: nowrap;
   user-select: none;
 }
 
 .condition-text-lower {
-  font-size: 2vw;
+  font-size: 1.5vw;
   font-weight: 400;
   font-style: italic;
-  color: var(--v-secondary-lighten2);
-  text-align: right;
+  color: rgb(var(--v-theme-gradient2));
+  text-align: center;
   text-wrap-mode: auto;
   user-select: none;
 }
@@ -304,27 +361,22 @@ onUnmounted(() => {
 .forecast-day {
   font-size: 1.8vw;
   font-weight: 800;
-  color: var(--v-secondary-lighten1);
   user-select: none;
 }
 
 .forecast-temp {
   font-size: 1.6vw;
   font-weight: 600;
-  color: var(--v-secondary-darken1);
+  color: rgb(var(--v-theme-gradient1));
   user-select: none;
 }
 
 .forecast-icon {
   font-size: 4vw;
-  color: var(--v-info-base);
+  color: rgb(var(--v-theme-gradient1));
   user-select: none;
 }
 
-.muted-text {
-  color: var(--v-primary-lighten4);
-}
-
 @media (max-width: 1279px) {
   .weather-card {
     width: 100%;
@@ -334,6 +386,7 @@ onUnmounted(() => {
     font-size: 4vw;
   }
 
+  .air-quality-icon,
   .condition-icon {
     font-size: 6vw;
   }
@@ -366,9 +419,10 @@ onUnmounted(() => {
   }
 
   .location-info {
-    font-size: 6vw;
+    font-size: 3vw;
   }
 
+  .air-quality-icon,
   .condition-icon {
     font-size: 8vw;
   }
@@ -378,7 +432,7 @@ onUnmounted(() => {
   }
 
   .condition-text {
-    font-size: 5vw;
+    font-size: 3vw;
   }
 
   .condition-text-lower {
diff --git a/web/optivum-better-schedule-frontend/src/components/pages/Division.vue b/web/optivum-better-schedule-frontend/src/components/pages/Division.vue
deleted file mode 100644
index 180ff34..0000000
--- a/web/optivum-better-schedule-frontend/src/components/pages/Division.vue
+++ /dev/null
@@ -1,70 +0,0 @@
-<!-- Home.vue -->
-<template>
-	<!-- <div class="fill-height fill-width pa-0">
-		<v-slide-y-reverse-transition appear>
-			<div class="grid-container pa-0 fill-height">
-				<v-row class="division-grid" align="center" justify="center">
-					<ScheduleTable class="grid-item" :index="id" :type="type" />
-				</v-row>
-			</div>
-		</v-slide-y-reverse-transition>
-	</div> -->
-	<ScheduleTable :type="type" />
-</template>
-
-<script setup lang="ts">
-import ScheduleTable from '../ScheduleTable.vue';
-
-const type = "division";
-</script>
-
-<!-- <style scoped>
-.grid-container {
-	display: grid;
-	grid-template-rows: 1fr;
-	align-items: center;
-	justify-items: center;
-	padding: 0;
-	height: 100vh;
-}
-
-.division-grid {
-	display: grid;
-	grid-template-rows: auto;
-	width: 100%;
-	align-items: center;
-	justify-items: center;
-	gap: 0;
-	padding: 0;
-	margin: 0;
-	height: 100%;
-}
-
-.grid-item {
-	max-width: 100%;
-	padding: 0;
-}
-
-@media (max-width: 1279px) {
-	.grid-container {
-		align-items: start;
-		justify-items: stretch;
-		height: auto;
-		min-height: 100vh;
-	}
-
-	.division-grid {
-		align-items: start;
-		justify-items: start;
-		grid-template-rows: auto;
-		width: 100%;
-		height: auto;
-	}
-
-	.grid-item {
-		align-self: start;
-		width: 100%;
-		padding-top: 0;
-	}
-}
-</style> -->
diff --git a/web/optivum-better-schedule-frontend/src/components/pages/Divisions.vue b/web/optivum-better-schedule-frontend/src/components/pages/Divisions.vue
index cbacc97..7eabd7d 100644
--- a/web/optivum-better-schedule-frontend/src/components/pages/Divisions.vue
+++ b/web/optivum-better-schedule-frontend/src/components/pages/Divisions.vue
@@ -1,31 +1,55 @@
-<!-- DivisionsPage.vue -->
+<!-- pages/Divisions.vue -->
 <template>
-	<v-slide-y-transition appear>
+	<v-slide-y-transition appear v-if="!reducedAnimationsEnabled">
 		<v-card class="search-container pa-0" elevation="8" rounded="pill">
 			<v-text-field v-model="search" class="search" :label="t('search.division')" prepend-inner-icon="mdi-magnify"
 				variant="solo" rounded="pill" hide-details="auto" @input="debouncedSearch" />
 		</v-card>
 	</v-slide-y-transition>
+	<div v-else>
+		<v-card class="search-container pa-0" elevation="8" rounded="pill">
+			<v-text-field v-model="search" class="search" :label="t('search.division')" prepend-inner-icon="mdi-magnify"
+				variant="solo" rounded="pill" hide-details="auto" @input="debouncedSearch" />
+		</v-card>
+	</div>
 
-	<v-slide-y-reverse-transition appear>
+	<v-slide-y-reverse-transition appear v-if="!reducedAnimationsEnabled">
 		<v-container class="scrollable-grid pa-0">
-			<v-container class="divisions-grid pa-0">
-				<v-col v-for="(division, index) in filteredDivisions" :key="division.id" class="grid-item pa-0">
-					<DivisionButton :text="division.full_name" :designator="division.designator" :index="index"
-						:id="division.id" />
-				</v-col>
+			<v-container :key="searchKey" class="scrollable-grid pa-0">
+				<v-container class="divisions-grid pa-0">
+					<v-col v-for="(division, index) in filteredDivisions" :key="division.id" class="grid-item pa-0"
+						:class="{ 'animated-item': !reducedAnimationsEnabled }"
+						:style="!reducedAnimationsEnabled ? delayStyle(index) : {}">
+						<DivisionButton :text="division.full_name" :designator="division.designator" :index="index"
+							:id="division.id" />
+					</v-col>
+				</v-container>
 			</v-container>
-			<v-empty-state v-if="!loading && filteredDivisions.length === 0" icon="mdi-magnify-remove-outline"
+			<v-empty-state v-if="!loading && !error && filteredDivisions.length === 0" icon="mdi-magnify-remove-outline"
 				class="no-divisions" :title="t('page.no_divisions')" />
+			<v-empty-state v-if="error" icon="mdi-alert-circle" color="error" class="no-divisions"
+				:title="t('page.divisions_error')" />
 		</v-container>
 	</v-slide-y-reverse-transition>
-
-	<div v-if="loading" class="loading">
-		<v-progress-circular indeterminate color="primary"></v-progress-circular>
+	<div v-else>
+		<v-container class="scrollable-grid pa-0">
+			<v-container :key="searchKey" class="scrollable-grid pa-0">
+				<v-container class="divisions-grid pa-0">
+					<v-col v-for="(division, index) in filteredDivisions" :key="division.id" class="grid-item pa-0">
+						<DivisionButton :text="division.full_name" :designator="division.designator" :index="index"
+							:id="division.id" />
+					</v-col>
+				</v-container>
+			</v-container>
+			<v-empty-state v-if="!loading && !error && filteredDivisions.length === 0" icon="mdi-magnify-remove-outline"
+				class="no-divisions" :title="t('page.no_divisions')" />
+			<v-empty-state v-if="error" icon="mdi-alert-circle" color="error" class="no-divisions"
+				:title="t('page.divisions_error')" />
+		</v-container>
 	</div>
 
-	<div v-if="error" class="error">
-		{{ error }}
+	<div v-if="loading" class="loading">
+		<v-progress-circular indeterminate></v-progress-circular>
 	</div>
 </template>
 
@@ -34,7 +58,8 @@ import { ref, onMounted, computed } from 'vue';
 import axios from 'axios';
 import { useI18n } from 'vue-i18n';
 import { debounce } from 'lodash-es';
-import DivisionButton from '../DivisionButton.vue'
+import DivisionButton from '../DivisionButton.vue';
+import { useMiscStore } from '@/stores/miscStore';
 
 interface Division {
 	designator: string;
@@ -42,23 +67,40 @@ interface Division {
 	full_name: string;
 }
 
+interface DivisionResponse {
+	data: DivisionResponseData;
+}
+
+interface DivisionResponseData {
+	designators: { [key: string]: { values: number[] } };
+	full_names: { [key: string]: { values: number[] } };
+}
+
 const { t } = useI18n();
+const miscStore = useMiscStore();
+const reducedAnimationsEnabled = computed(() => miscStore.reducedAnimationsEnabled);
 
 const search = ref('');
 const divisions = ref<Division[]>([]);
 const loading = ref(false);
 const error = ref<string | null>(null);
 
+// Forces remounting the component when the search key changes so animations are triggered
+const searchKey = computed(() => search.value);
+const delayStyle = (index: number) => ({
+	animationDelay: `${index * 50}ms`,
+});
+
 const fetchDivisions = async () => {
 	loading.value = true;
 	try {
-		const response = await axios.get('/api/v1/divisions');
+		const response: DivisionResponse = await axios.get('/api/v1/divisions');
 		const designators = response.data.designators;
 		const fullNames = response.data.full_names;
 
-		divisions.value = Object.keys(designators).map((designator) => {
-			const id = designators[designator];
-			const full_name = Object.keys(fullNames).find((name) => fullNames[name] === id) || '';
+		divisions.value = Object.entries(designators).map(([designator, { values }]) => {
+			const id = values[0];
+			const full_name = Object.keys(fullNames).find(name => fullNames[name].values.includes(id)) || '';
 
 			return {
 				designator,
@@ -155,6 +197,35 @@ onMounted(fetchDivisions);
 	overflow: visible;
 }
 
+.animated-item {
+	opacity: 0;
+	transform: translateY(100%);
+	animation: fadeInUp 0.5s forwards;
+}
+
+@keyframes fadeInUp {
+	to {
+		opacity: 1;
+		transform: translateY(0);
+	}
+}
+
+.animated-item.fade-leave-active {
+	animation: fadeOutDown 0.5s forwards;
+}
+
+@keyframes fadeOutDown {
+	from {
+		opacity: 1;
+		transform: translateY(0);
+	}
+
+	to {
+		opacity: 0;
+		transform: translateY(100%);
+	}
+}
+
 .loading,
 .error {
 	display: flex;
diff --git a/web/optivum-better-schedule-frontend/src/components/pages/Room.vue b/web/optivum-better-schedule-frontend/src/components/pages/Room.vue
deleted file mode 100644
index fe65a99..0000000
--- a/web/optivum-better-schedule-frontend/src/components/pages/Room.vue
+++ /dev/null
@@ -1,69 +0,0 @@
-<!-- Home.vue -->
-<template>
-	<!-- <div class="fill-height fill-width pa-0">
-		<v-slide-y-reverse-transition appear>
-			<div class="grid-container pa-0 fill-height">
-				<v-row class="room-grid" align="center" justify="center">
-					<ScheduleTable class="grid-item" :index="id" :type="type" />
-				</v-row>
-			</div>
-		</v-slide-y-reverse-transition>
-	</div> -->
-	<ScheduleTable :type="type" />
-</template>
-
-<script setup lang="ts">
-import ScheduleTable from '../ScheduleTable.vue';
-const type = "room";
-</script>
-
-<!-- <style scoped>
-.grid-container {
-	display: grid;
-	grid-template-rows: 1fr;
-	align-items: center;
-	justify-items: center;
-	padding: 0;
-	height: 100vh;
-}
-
-.room-grid {
-	display: grid;
-	grid-template-rows: auto;
-	width: 100%;
-	align-items: center;
-	justify-items: center;
-	gap: 0;
-	padding: 0;
-	margin: 0;
-	height: 100%;
-}
-
-.grid-item {
-	max-width: 100%;
-	padding: 0;
-}
-
-@media (max-width: 1279px) {
-	.grid-container {
-		align-items: start;
-		justify-items: stretch;
-		height: auto;
-		min-height: 100vh;
-	}
-
-	.division-grid {
-		align-items: start;
-		justify-items: start;
-		grid-template-rows: auto;
-		width: 100%;
-		height: auto;
-	}
-
-	.grid-item {
-		align-self: start;
-		width: 100%;
-		padding-top: 0;
-	}
-}
-</style> -->
\ No newline at end of file
diff --git a/web/optivum-better-schedule-frontend/src/components/pages/Rooms.vue b/web/optivum-better-schedule-frontend/src/components/pages/Rooms.vue
index e763abc..f9ac529 100644
--- a/web/optivum-better-schedule-frontend/src/components/pages/Rooms.vue
+++ b/web/optivum-better-schedule-frontend/src/components/pages/Rooms.vue
@@ -1,29 +1,56 @@
+<!-- pages/Rooms.vue -->
 <template>
-	<v-slide-y-transition appear>
+	<template v-if="!reducedAnimationsEnabled">
+		<v-slide-y-transition appear>
+			<v-card class="search-container pa-0" elevation="8" rounded="pill">
+				<v-text-field v-model="search" class="search" :label="t('search.room')" prepend-inner-icon="mdi-magnify"
+					variant="solo" rounded="pill" hide-details="auto" @input="debouncedSearch" />
+			</v-card>
+		</v-slide-y-transition>
+
+		<v-slide-y-reverse-transition appear>
+			<v-container class="scrollable-grid pa-0">
+				<v-container :key="searchKey" class="scrollable-grid pa-0">
+					<v-container class="rooms-grid pa-0">
+						<v-col v-for="(room, index) in filteredRooms" :key="room.id" class="grid-item pa-0"
+							:class="{ 'animated-item': !reducedAnimationsEnabled }"
+							:style="!reducedAnimationsEnabled ? delayStyle(index) : {}">
+							<RoomButton :text="room.full_name" :designator="room.designator" :index="index"
+								:id="room.id" />
+						</v-col>
+					</v-container>
+				</v-container>
+				<v-empty-state v-if="!loading && !error && filteredRooms.length === 0" icon="mdi-magnify-remove-outline"
+					class="no-rooms" :title="t('page.no_rooms')" />
+				<v-empty-state v-if="error" icon="mdi-alert-circle" color="error" class="no-rooms"
+					:title="t('page.rooms_error')" />
+			</v-container>
+		</v-slide-y-reverse-transition>
+	</template>
+
+	<template v-else>
 		<v-card class="search-container pa-0" elevation="8" rounded="pill">
 			<v-text-field v-model="search" class="search" :label="t('search.room')" prepend-inner-icon="mdi-magnify"
 				variant="solo" rounded="pill" hide-details="auto" @input="debouncedSearch" />
 		</v-card>
-	</v-slide-y-transition>
 
-	<v-slide-y-reverse-transition appear>
 		<v-container class="scrollable-grid pa-0">
-			<v-container class="rooms-grid pa-0">
-				<v-col v-for="(room, index) in filteredRooms" :key="room.id" class="grid-item pa-0">
-					<RoomButton :text="room.full_name" :designator="room.designator" :index="index" :id="room.id" />
-				</v-col>
+			<v-container :key="searchKey" class="scrollable-grid pa-0">
+				<v-container class="rooms-grid pa-0">
+					<v-col v-for="(room, index) in filteredRooms" :key="room.id" class="grid-item pa-0">
+						<RoomButton :text="room.full_name" :designator="room.designator" :index="index" :id="room.id" />
+					</v-col>
+				</v-container>
 			</v-container>
-			<v-empty-state v-if="!loading && filteredRooms.length === 0" icon="mdi-magnify-remove-outline"
+			<v-empty-state v-if="!loading && !error && filteredRooms.length === 0" icon="mdi-magnify-remove-outline"
 				class="no-rooms" :title="t('page.no_rooms')" />
+			<v-empty-state v-if="error" icon="mdi-alert-circle" color="error" class="no-rooms"
+				:title="t('page.rooms_error')" />
 		</v-container>
-	</v-slide-y-reverse-transition>
+	</template>
 
 	<div v-if="loading" class="loading">
-		<v-progress-circular indeterminate color="primary"></v-progress-circular>
-	</div>
-
-	<div v-if="error" class="error">
-		{{ error }}
+		<v-progress-circular indeterminate></v-progress-circular>
 	</div>
 </template>
 
@@ -32,7 +59,8 @@ import { ref, onMounted, computed } from 'vue';
 import axios from 'axios';
 import { useI18n } from 'vue-i18n';
 import { debounce } from 'lodash-es';
-import RoomButton from '../RoomButton.vue'
+import RoomButton from '../RoomButton.vue';
+import { useMiscStore } from '@/stores/miscStore';
 
 interface Room {
 	designator: string;
@@ -40,7 +68,18 @@ interface Room {
 	full_name: string;
 }
 
+interface RoomResponse {
+	data: RoomResponseData;
+}
+
+interface RoomResponseData {
+	designators: { [key: string]: { values: number[] } };
+	full_names: { [key: string]: { values: number[] } };
+}
+
 const { t } = useI18n();
+const miscStore = useMiscStore();
+const reducedAnimationsEnabled = computed(() => miscStore.reducedAnimationsEnabled);
 
 const search = ref('');
 const rooms = ref<Room[]>([]);
@@ -50,20 +89,18 @@ const error = ref<string | null>(null);
 const fetchRooms = async () => {
 	loading.value = true;
 	try {
-		const response = await axios.get('/api/v1/rooms');
+		const response: RoomResponse = await axios.get('/api/v1/rooms');
 		const designators = response.data.designators;
 		const fullNames = response.data.full_names;
 
-		rooms.value = Object.keys(designators).map((designator) => {
-			const id = designators[designator];
-			const designatorKey = Object.keys(designators).find(key => designators[key] === id);
-			const full_name = Object.keys(fullNames).find((name) => fullNames[name] === id) || '';
-			const display_name = designatorKey && designatorKey !== full_name ? `${full_name} (${designatorKey})` : full_name;
+		rooms.value = Object.entries(designators).map(([designator, { values }]) => {
+			const id = values[0];
+			const full_name = Object.keys(fullNames).find(name => fullNames[name].values.includes(id)) || '';
 
 			return {
 				designator,
 				id,
-				full_name: display_name,
+				full_name,
 			};
 		});
 	} catch (err) {
@@ -85,6 +122,11 @@ const filteredRooms = computed(() => {
 	);
 });
 
+const searchKey = computed(() => search.value);
+const delayStyle = (index: number) => ({
+	animationDelay: `${index * 50}ms`,
+});
+
 onMounted(fetchRooms);
 </script>
 
@@ -155,6 +197,35 @@ onMounted(fetchRooms);
 	overflow: visible;
 }
 
+.animated-item {
+	opacity: 0;
+	transform: translateY(100%);
+	animation: fadeInUp 0.5s forwards;
+}
+
+@keyframes fadeInUp {
+	to {
+		opacity: 1;
+		transform: translateY(0);
+	}
+}
+
+.animated-item.fade-leave-active {
+	animation: fadeOutDown 0.5s forwards;
+}
+
+@keyframes fadeOutDown {
+	from {
+		opacity: 1;
+		transform: translateY(0);
+	}
+
+	to {
+		opacity: 0;
+		transform: translateY(100%);
+	}
+}
+
 .loading,
 .error {
 	display: flex;
diff --git a/web/optivum-better-schedule-frontend/src/components/pages/Settings.vue b/web/optivum-better-schedule-frontend/src/components/pages/Settings.vue
index d0a6049..d38d83c 100644
--- a/web/optivum-better-schedule-frontend/src/components/pages/Settings.vue
+++ b/web/optivum-better-schedule-frontend/src/components/pages/Settings.vue
@@ -1,4 +1,4 @@
-<!-- Settings.vue -->
+<!-- pages/Settings.vue -->
 <template>
 	<v-container class="fill-height fill-width pa-0">
 		<v-slide-y-reverse-transition appear>
@@ -7,7 +7,12 @@
 					<v-col class="d-flex justify-center grid-item">
 						<ThemeSwitcher />
 					</v-col>
-					<LanguageSwitcher />
+					<v-col class="d-flex justify-center grid-item">
+						<LanguageSwitcher />
+					</v-col>
+					<v-col class="d-flex justify-center grid-item">
+						<AnimationsSwitcher />
+					</v-col>
 				</v-row>
 			</v-container>
 		</v-slide-y-reverse-transition>
@@ -17,6 +22,7 @@
 <script setup lang="ts">
 import ThemeSwitcher from '../ThemeSwitcher.vue';
 import LanguageSwitcher from '../LanguageSwitcher.vue';
+import AnimationsSwitcher from '../AnimationsSwitcher.vue';
 </script>
 
 <style scoped>
diff --git a/web/optivum-better-schedule-frontend/src/components/pages/Teacher.vue b/web/optivum-better-schedule-frontend/src/components/pages/Teacher.vue
deleted file mode 100644
index 11f35f7..0000000
--- a/web/optivum-better-schedule-frontend/src/components/pages/Teacher.vue
+++ /dev/null
@@ -1,69 +0,0 @@
-<!-- Home.vue -->
-<template>
-	<!-- <div class="fill-height fill-width pa-0">
-		<v-slide-y-reverse-transition appear>
-			<div class="grid-container pa-0 fill-height">
-				<v-row class="teacher-grid" align="center" justify="center">
-					<ScheduleTable class="grid-item" :index="id" :type="type" />
-				</v-row>
-			</div>
-		</v-slide-y-reverse-transition>
-	</div> -->
-	<ScheduleTable :type="type" />
-</template>
-
-<script setup lang="ts">
-import ScheduleTable from '../ScheduleTable.vue';
-const type = "teacher";
-</script>
-
-<!-- <style scoped>
-.grid-container {
-	display: grid;
-	grid-template-rows: 1fr;
-	align-items: center;
-	justify-items: center;
-	padding: 0;
-	height: 100vh;
-}
-
-.teacher-grid {
-	display: grid;
-	grid-template-rows: auto;
-	width: 100%;
-	align-items: center;
-	justify-items: center;
-	gap: 0;
-	padding: 0;
-	margin: 0;
-	height: 100%;
-}
-
-.grid-item {
-	max-width: 100%;
-	padding: 0;
-}
-
-@media (max-width: 1279px) {
-	.grid-container {
-		align-items: start;
-		justify-items: stretch;
-		height: auto;
-		min-height: 100vh;
-	}
-
-	.division-grid {
-		align-items: start;
-		justify-items: start;
-		grid-template-rows: auto;
-		width: 100%;
-		height: auto;
-	}
-
-	.grid-item {
-		align-self: start;
-		width: 100%;
-		padding-top: 0;
-	}
-}
-</style> -->
\ No newline at end of file
diff --git a/web/optivum-better-schedule-frontend/src/components/pages/Teachers.vue b/web/optivum-better-schedule-frontend/src/components/pages/Teachers.vue
index d97043e..17ed283 100644
--- a/web/optivum-better-schedule-frontend/src/components/pages/Teachers.vue
+++ b/web/optivum-better-schedule-frontend/src/components/pages/Teachers.vue
@@ -1,31 +1,56 @@
-<!-- TeachersPage.vue -->
+<!-- pages/Teachers.vue -->
 <template>
-	<v-slide-y-transition appear>
+	<template v-if="!reducedAnimationsEnabled">
+		<v-slide-y-transition appear>
+			<v-card class="search-container pa-0" elevation="8" rounded="pill">
+				<v-text-field v-model="search" class="search" :label="t('search.teacher')"
+					prepend-inner-icon="mdi-magnify" variant="solo" rounded="pill" hide-details="auto"
+					@input="debouncedSearch" />
+			</v-card>
+		</v-slide-y-transition>
+
+		<v-slide-y-reverse-transition appear>
+			<v-container class="scrollable-grid pa-0">
+				<v-container :key="searchKey" class="teachers-grid pa-0">
+					<v-col v-for="(teacher, index) in filteredTeachers" :key="teacher.id" class="grid-item pa-0"
+						:class="{ 'animated-item': !reducedAnimationsEnabled }"
+						:style="!reducedAnimationsEnabled ? delayStyle(index) : {}">
+						<TeacherButton :text="teacher.full_name" :designator="teacher.designator" :index="index"
+							:id="teacher.id" />
+					</v-col>
+				</v-container>
+
+				<v-empty-state v-if="!loading && !error && filteredTeachers.length === 0"
+					icon="mdi-magnify-remove-outline" class="no-teachers" :title="t('page.no_teachers')" />
+				<v-empty-state v-if="error" icon="mdi-alert-circle" color="error" class="no-teachers"
+					:title="t('page.teachers_error')" />
+			</v-container>
+		</v-slide-y-reverse-transition>
+	</template>
+
+	<template v-else>
 		<v-card class="search-container pa-0" elevation="8" rounded="pill">
 			<v-text-field v-model="search" class="search" :label="t('search.teacher')" prepend-inner-icon="mdi-magnify"
 				variant="solo" rounded="pill" hide-details="auto" @input="debouncedSearch" />
 		</v-card>
-	</v-slide-y-transition>
 
-	<v-slide-y-reverse-transition appear>
 		<v-container class="scrollable-grid pa-0">
-			<v-container class="teachers-grid pa-0">
+			<v-container :key="searchKey" class="teachers-grid pa-0">
 				<v-col v-for="(teacher, index) in filteredTeachers" :key="teacher.id" class="grid-item pa-0">
 					<TeacherButton :text="teacher.full_name" :designator="teacher.designator" :index="index"
 						:id="teacher.id" />
 				</v-col>
 			</v-container>
-			<v-empty-state v-if="!loading && filteredTeachers.length === 0" icon="mdi-magnify-remove-outline"
+
+			<v-empty-state v-if="!loading && !error && filteredTeachers.length === 0" icon="mdi-magnify-remove-outline"
 				class="no-teachers" :title="t('page.no_teachers')" />
+			<v-empty-state v-if="error" icon="mdi-alert-circle" color="error" class="no-teachers"
+				:title="t('page.teachers_error')" />
 		</v-container>
-	</v-slide-y-reverse-transition>
+	</template>
 
 	<div v-if="loading" class="loading">
-		<v-progress-circular indeterminate color="primary"></v-progress-circular>
-	</div>
-
-	<div v-if="error" class="error">
-		{{ error }}
+		<v-progress-circular indeterminate></v-progress-circular>
 	</div>
 </template>
 
@@ -34,7 +59,8 @@ import { ref, onMounted, computed } from 'vue';
 import axios from 'axios';
 import { useI18n } from 'vue-i18n';
 import { debounce } from 'lodash-es';
-import TeacherButton from '@/components/TeacherButton.vue'; // Adjust the path as necessary
+import TeacherButton from '@/components/TeacherButton.vue';
+import { useMiscStore } from '@/stores/miscStore';
 
 interface Teacher {
 	designator: string;
@@ -42,7 +68,18 @@ interface Teacher {
 	full_name: string;
 }
 
+interface TeacherResponse {
+	data: TeacherResponseData;
+}
+
+interface TeacherResponseData {
+	designators: { [key: string]: { values: number[] } };
+	full_names: { [key: string]: { values: number[] } };
+}
+
 const { t } = useI18n();
+const miscStore = useMiscStore();
+const reducedAnimationsEnabled = computed(() => miscStore.reducedAnimationsEnabled);
 
 const search = ref('');
 const teachers = ref<Teacher[]>([]);
@@ -52,18 +89,13 @@ const error = ref<string | null>(null);
 const fetchTeachers = async () => {
 	loading.value = true;
 	try {
-		const response = await axios.get('/api/v1/teachers');
+		const response: TeacherResponse = await axios.get('/api/v1/teachers');
 		const designators = response.data.designators;
 		const fullNames = response.data.full_names;
 
-		teachers.value = Object.keys(designators).map((designator) => {
-			const id = designators[designator];
-			var full_name = Object.keys(fullNames).find((name) => fullNames[name] === id) || '';
-
-			// Temporary fix for missing teacher names due to duplicate full names
-			if (id === 13) {
-				full_name = 'M.Bochniarz';
-			}
+		teachers.value = Object.entries(designators).map(([designator, { values }]) => {
+			const id = values[0];
+			const full_name = Object.keys(fullNames).find(name => fullNames[name].values.includes(id)) || '';
 
 			return {
 				designator,
@@ -73,12 +105,14 @@ const fetchTeachers = async () => {
 		});
 	} catch (err) {
 		console.error('Error fetching teachers:', err);
+		error.value = 'Failed to fetch teacher data.';
 	} finally {
 		loading.value = false;
 	}
 };
 
-const debouncedSearch = debounce(() => {}, 100);
+const debouncedSearch = debounce(() => { }, 100);
+const searchKey = computed(() => search.value);
 
 const filteredTeachers = computed(() => {
 	const searchValue = search.value.toLowerCase().trim();
@@ -89,6 +123,10 @@ const filteredTeachers = computed(() => {
 	);
 });
 
+const delayStyle = (index: number) => ({
+	animationDelay: `${index * 50}ms`,
+});
+
 onMounted(fetchTeachers);
 </script>
 
@@ -159,6 +197,35 @@ onMounted(fetchTeachers);
 	overflow: visible;
 }
 
+.animated-item {
+	opacity: 0;
+	transform: translateY(100%);
+	animation: fadeInUp 0.5s forwards;
+}
+
+@keyframes fadeInUp {
+	to {
+		opacity: 1;
+		transform: translateY(0);
+	}
+}
+
+.animated-item.fade-leave-active {
+	animation: fadeOutDown 0.5s forwards;
+}
+
+@keyframes fadeOutDown {
+	from {
+		opacity: 1;
+		transform: translateY(0);
+	}
+
+	to {
+		opacity: 0;
+		transform: translateY(100%);
+	}
+}
+
 .loading,
 .error {
 	display: flex;
@@ -167,16 +234,15 @@ onMounted(fetchTeachers);
 	padding: 1rem;
 }
 
-.no-results {
+.no-teachers {
 	display: flex;
 	flex-direction: column;
 	align-items: center;
 	justify-content: center;
 	padding: 16px;
-	color: rgba(0, 0, 0, 0.6);
 }
 
-.no-results v-icon {
+.no-teachers v-icon {
 	margin-bottom: 8px;
 }
 
diff --git a/web/optivum-better-schedule-frontend/src/locales/en.js b/web/optivum-better-schedule-frontend/src/locales/en.js
index 5f02a85..d9827b4 100644
--- a/web/optivum-better-schedule-frontend/src/locales/en.js
+++ b/web/optivum-better-schedule-frontend/src/locales/en.js
@@ -1,8 +1,8 @@
 export default {
-	greeting: 'Hello World',
+	greeting: 'Hello world',
 	language: {
 		name: 'Language',
-		select: 'Select Language',
+		select: 'Select language',
 	},
 	theme: {
 		name: 'Theme',
@@ -10,9 +10,12 @@ export default {
 			dracula: 'Dracula',
 			dark: 'Dark',
 			light: 'Light',
-			auto: 'Auto',
+			auto: 'Automatic',
 		},
 	},
+	animations: {
+		name: 'Reduce Animations',
+	},
 	day: {
 		monday: 'Monday',
 		tuesday: 'Tuesday',
@@ -28,101 +31,117 @@ export default {
 		conditions: {
 			// Group 2xx: Thunderstorm
 			'thunderstorm': 'Thunderstorm',
-			'thunderstorm with light rain': 'Thunderstorm with Light Rain',
-			'thunderstorm with rain': 'Thunderstorm with Rain',
-			'thunderstorm with heavy rain': 'Thunderstorm with Heavy Rain',
-			'light thunderstorm': 'Light Thunderstorm',
-			'heavy thunderstorm': 'Heavy Thunderstorm',
-			'ragged thunderstorm': 'Ragged Thunderstorm',
-			'thunderstorm with light drizzle': 'Thunderstorm with Light Drizzle',
-			'thunderstorm with drizzle': 'Thunderstorm with Drizzle',
-			'thunderstorm with heavy drizzle': 'Thunderstorm with Heavy Drizzle',
+			'thunderstorm with light rain': 'Thunderstorm with light rain',
+			'thunderstorm with rain': 'Thunderstorm with rain',
+			'thunderstorm with heavy rain': 'Thunderstorm with heavy rain',
+			'light thunderstorm': 'Light thunderstorm',
+			'heavy thunderstorm': 'Heavy thunderstorm',
+			'ragged thunderstorm': 'Ragged thunderstorm',
+			'thunderstorm with light drizzle': 'Thunderstorm with light drizzle',
+			'thunderstorm with drizzle': 'Thunderstorm with drizzle',
+			'thunderstorm with heavy drizzle': 'Thunderstorm with heavy drizzle',
 
 			// Group 3xx: Drizzle
 			'drizzle': 'Drizzle',
-			'light intensity drizzle': 'Light Intensity Drizzle',
-			'heavy intensity drizzle': 'Heavy Intensity Drizzle',
-			'light intensity drizzle rain': 'Light Intensity Drizzle Rain',
-			'drizzle rain': 'Drizzle Rain',
-			'heavy intensity drizzle rain': 'Heavy Intensity Drizzle Rain',
-			'shower rain and drizzle': 'Shower Rain and Drizzle',
-			'heavy shower rain and drizzle': 'Heavy Shower Rain and Drizzle',
-			'shower drizzle': 'Shower Drizzle',
+			'light intensity drizzle': 'Light intensity drizzle',
+			'heavy intensity drizzle': 'Heavy intensity drizzle',
+			'light intensity drizzle rain': 'Light intensity drizzle rain',
+			'drizzle rain': 'Drizzle rain',
+			'heavy intensity drizzle rain': 'Heavy intensity drizzle rain',
+			'shower rain and drizzle': 'Shower rain and drizzle',
+			'heavy shower rain and drizzle': 'Heavy shower rain and drizzle',
+			'shower drizzle': 'Shower drizzle',
 
 			// Group 5xx: Rain
 			'rain': 'Rain',
-			'light rain': 'Light Rain',
-			'moderate rain': 'Moderate Rain',
-			'heavy intensity rain': 'Heavy Intensity Rain',
-			'very heavy rain': 'Very Heavy Rain',
-			'extreme rain': 'Extreme Rain',
-			'freezing rain': 'Freezing Rain',
-			'light intensity shower rain': 'Light Intensity Shower Rain',
-			'shower rain': 'Shower Rain',
-			'heavy intensity shower rain': 'Heavy Intensity Shower Rain',
-			'ragged shower rain': 'Ragged Shower Rain',
+			'light rain': 'Light rain',
+			'moderate rain': 'Moderate rain',
+			'heavy intensity rain': 'Heavy intensity rain',
+			'very heavy rain': 'Very heavy rain',
+			'extreme rain': 'Extreme rain',
+			'freezing rain': 'Freezing rain',
+			'light intensity shower rain': 'Light intensity shower rain',
+			'shower rain': 'Shower rain',
+			'heavy intensity shower rain': 'Heavy intensity shower rain',
+			'ragged shower rain': 'Ragged shower rain',
 
 			// Group 6xx: Snow
 			'snow': 'Snow',
-			'light snow': 'Light Snow',
-			'heavy snow': 'Heavy Snow',
+			'light snow': 'Light snow',
+			'heavy snow': 'Heavy snow',
 			'sleet': 'Sleet',
-			'light shower sleet': 'Light Shower Sleet',
-			'shower sleet': 'Shower Sleet',
-			'light rain and snow': 'Light Rain and Snow',
-			'rain and snow': 'Rain and Snow',
-			'light shower snow': 'Light Shower Snow',
-			'shower snow': 'Shower Snow',
-			'heavy shower snow': 'Heavy Shower Snow',
+			'light shower sleet': 'Light shower sleet',
+			'shower sleet': 'Shower sleet',
+			'light rain and snow': 'Light rain and snow',
+			'rain and snow': 'Rain and snow',
+			'light shower snow': 'Light shower snow',
+			'shower snow': 'Shower snow',
+			'heavy shower snow': 'Heavy shower snow',
 
 			// Group 7xx: Atmosphere
 			'mist': 'Mist',
 			'smoke': 'Smoke',
 			'haze': 'Haze',
-			'sand/dust whirls': 'Sand/Dust Whirls',
+			'sand/dust whirls': 'Sand/dust whirls',
 			'fog': 'Fog',
 			'sand': 'Sand',
 			'dust': 'Dust',
-			'volcanic ash': 'Volcanic Ash',
+			'volcanic ash': 'Volcanic ash',
 			'squalls': 'Squalls',
 			'tornado': 'Tornado',
 
 			// Group 800: Clear
-			'clear sky': 'Clear Sky',
+			'clear sky': 'Clear sky',
 			'clear': 'Clear',
 
 			// Group 80x: Clouds
-			'few clouds': 'Few Clouds (11-25%)',
-			'scattered clouds': 'Scattered Clouds (25-50%)',
-			'broken clouds': 'Broken Clouds (51-84%)',
-			'overcast clouds': 'Overcast Clouds (85-100%)',
+			'few clouds': 'Few clouds (11-25%)',
+			'scattered clouds': 'Scattered clouds (25-50%)',
+			'broken clouds': 'Broken clouds (51-84%)',
+			'overcast clouds': 'Overcast clouds (85-100%)',
 			'clouds': 'Clouds',
 		},
 	},
+	air_quality: {
+		quality: 'Air quality',
+		conditions: {
+			very_good: 'Very good',
+			good: 'Good',
+			moderate: 'Moderate',
+			unhealthy_for_sensitive_groups: 'Unhealthy for sensitive groups',
+			unhealthy: 'Unhealthy',
+			very_unhealthy: 'Very unhealthy',
+			hazardous: 'Hazardous',
+		},
+	},
 	page: {
-		title: 'Optivum - Better Schedule',
+		title: 'GOptivum - A Better Timetable',
 		not_found: 'Page not found',
 		no_schedule: 'No schedule for this day',
-		no_divisions: 'No divisions found',
+		no_divisions: 'No classes found',
 		no_teachers: 'No teachers found',
-		no_rooms: 'No classrooms found',
+		no_rooms: 'No rooms found',
+		divisions_error: 'Error fetching classes',
+		teachers_error: 'Error fetching teachers',
+		rooms_error: 'Error fetching rooms',
 		home: 'Home',
-		divisions: 'Divisions',
-		division: 'Division - {id}',
+		divisions: 'Classes',
+		division: 'Class - {id}',
 		teachers: 'Teachers',
 		teacher: 'Teacher - {id}',
-		rooms: 'Classrooms',
-		room: 'Classroom - {id}',
+		rooms: 'Rooms',
+		room: 'Room - {id}',
 		settings: 'Settings',
 	},
 	search: {
-		division: 'Search division...',
-		teacher: 'Search teacher...',
-		room: 'Search classroom...',
+		division: 'Search for class...',
+		teacher: 'Search for teacher...',
+		room: 'Search for room...',
 	},
 	schedule: {
 		ordered_number: 'No.',
 		time_range: 'Time',
 		lesson: 'Lesson',
+		room_title_prefix: 'Room {id}',
 	}
-};
\ No newline at end of file
+};
diff --git a/web/optivum-better-schedule-frontend/src/locales/pl.js b/web/optivum-better-schedule-frontend/src/locales/pl.js
index ae1d583..5355f20 100644
--- a/web/optivum-better-schedule-frontend/src/locales/pl.js
+++ b/web/optivum-better-schedule-frontend/src/locales/pl.js
@@ -13,6 +13,9 @@ export default {
 			auto: 'Automatyczny',
 		},
 	},
+	animations: {
+		name: 'Zredukuj Animacje',
+	},
 	day: {
 		monday: 'Poniedziałek',
 		tuesday: 'Wtorek',
@@ -99,13 +102,28 @@ export default {
 			'clouds': 'Chmury',
 		},
 	},
+	air_quality: {
+		quality: 'Jakość powietrza',
+		conditions: {
+			very_good: 'Bardzo dobra',
+			good: 'Dobra',
+			moderate: 'Umiarkowana',
+			unhealthy_for_sensitive_groups: 'Dostateczna',
+			unhealthy: 'Zła',
+			very_unhealthy: 'Bardzo zła',
+			hazardous: 'Zagrożenie dla zdrowia',
+		},
+	},
 	page: {
-		title: 'Optivum - Lepszy Plan Lekcji',
+		title: 'GOptivum - Lepszy Plan Lekcji',
 		not_found: 'Nie znaleziono strony',
 		no_schedule: 'Brak planu na ten dzień',
 		no_divisions: 'Nie znaleziono klas',
 		no_teachers: 'Nie znaleziono nauczycieli',
 		no_rooms: 'Nie znaleziono sali',
+		divisions_error: 'Błąd podczas pobierania klas',
+		teachers_error: 'Błąd podczas pobierania nauczycieli',
+		rooms_error: 'Błąd podczas pobierania sal',
 		home: 'Strona główna',
 		divisions: 'Klasy',
 		division: 'Klasa - {id}',
@@ -124,5 +142,6 @@ export default {
 		ordered_number: 'Nr',
 		time_range: 'Godzina',
 		lesson: 'Lekcja',
+		room_title_prefix: 'Sala {id}' ,
 	}
 };
diff --git a/web/optivum-better-schedule-frontend/src/locales/uk.js b/web/optivum-better-schedule-frontend/src/locales/uk.js
index d17c73d..661bf96 100644
--- a/web/optivum-better-schedule-frontend/src/locales/uk.js
+++ b/web/optivum-better-schedule-frontend/src/locales/uk.js
@@ -1,5 +1,5 @@
 export default {
-	greeting: 'Привіт, світ',
+	greeting: 'Привіт, світе',
 	language: {
 		name: 'Мова',
 		select: 'Виберіть мову',
@@ -10,15 +10,18 @@ export default {
 			dracula: 'Дракула',
 			dark: 'Темна',
 			light: 'Світла',
-			auto: 'Авто',
+			auto: 'Автоматична',
 		},
 	},
+	animations: {
+		name: 'Зменшити анімації',
+	},
 	day: {
 		monday: 'Понеділок',
 		tuesday: 'Вівторок',
 		wednesday: 'Середа',
 		thursday: 'Четвер',
-		friday: "П'ятниця",
+		friday: 'П’ятниця',
 		saturday: 'Субота',
 		sunday: 'Неділя',
 	},
@@ -28,12 +31,12 @@ export default {
 		conditions: {
 			// Група 2xx: Гроза
 			'thunderstorm': 'Гроза',
-			'thunderstorm with light rain': 'Гроза з невеликим дощем',
+			'thunderstorm with light rain': 'Гроза з легким дощем',
 			'thunderstorm with rain': 'Гроза з дощем',
 			'thunderstorm with heavy rain': 'Гроза з сильним дощем',
 			'light thunderstorm': 'Слабка гроза',
 			'heavy thunderstorm': 'Сильна гроза',
-			'ragged thunderstorm': 'Нестійка гроза',
+			'ragged thunderstorm': 'Гроза з поривчастим вітром',
 			'thunderstorm with light drizzle': 'Гроза з легкою мрякою',
 			'thunderstorm with drizzle': 'Гроза з мрякою',
 			'thunderstorm with heavy drizzle': 'Гроза з сильною мрякою',
@@ -45,9 +48,9 @@ export default {
 			'light intensity drizzle rain': 'Слабкий дощ з мрякою',
 			'drizzle rain': 'Дощ з мрякою',
 			'heavy intensity drizzle rain': 'Сильний дощ з мрякою',
-			'shower rain and drizzle': 'Злива і мряка',
-			'heavy shower rain and drizzle': 'Сильна злива і мряка',
-			'shower drizzle': 'Злива з мрякою',
+			'shower rain and drizzle': 'Зливовий дощ і мряка',
+			'heavy shower rain and drizzle': 'Сильний зливовий дощ і мряка',
+			'shower drizzle': 'Зливова мряка',
 
 			// Група 5xx: Дощ
 			'rain': 'Дощ',
@@ -55,31 +58,31 @@ export default {
 			'moderate rain': 'Помірний дощ',
 			'heavy intensity rain': 'Сильний дощ',
 			'very heavy rain': 'Дуже сильний дощ',
-			'extreme rain': 'Екстремальний дощ',
+			'extreme rain': 'Екстремально сильний дощ',
 			'freezing rain': 'Крижаний дощ',
-			'light intensity shower rain': 'Слабка злива',
-			'shower rain': 'Злива',
-			'heavy intensity shower rain': 'Сильна злива',
-			'ragged shower rain': 'Перемінна злива',
+			'light intensity shower rain': 'Слабкий зливовий дощ',
+			'shower rain': 'Зливовий дощ',
+			'heavy intensity shower rain': 'Сильний зливовий дощ',
+			'ragged shower rain': 'Поривчастий зливовий дощ',
 
 			// Група 6xx: Сніг
 			'snow': 'Сніг',
 			'light snow': 'Слабкий сніг',
 			'heavy snow': 'Сильний сніг',
-			'sleet': 'Мокрий сніг',
-			'light shower sleet': 'Слабка злива з мокрим снігом',
-			'shower sleet': 'Злива з мокрим снігом',
-			'light rain and snow': 'Слабкий дощ зі снігом',
-			'rain and snow': 'Дощ зі снігом',
-			'light shower snow': 'Слабка снігова злива',
-			'shower snow': 'Снігова злива',
-			'heavy shower snow': 'Сильна снігова злива',
+			'sleet': 'Дощ зі снігом',
+			'light shower sleet': 'Слабкий зливовий дощ зі снігом',
+			'shower sleet': 'Зливовий дощ зі снігом',
+			'light rain and snow': 'Слабкий дощ і сніг',
+			'rain and snow': 'Дощ і сніг',
+			'light shower snow': 'Слабкий зливовий сніг',
+			'shower snow': 'Зливовий сніг',
+			'heavy shower snow': 'Сильний зливовий сніг',
 
-			// Група 7xx: Атмосферні явища
-			'mist': 'Імла',
+			// Група 7xx: Атмосфера
+			'mist': 'Мла',
 			'smoke': 'Дим',
-			'haze': 'Мгла',
-			'sand/dust whirls': 'Піщані/пилові вихори',
+			'haze': 'Імла',
+			'sand/dust whirls': 'Пилові/піщані вихори',
 			'fog': 'Туман',
 			'sand': 'Пісок',
 			'dust': 'Пил',
@@ -99,11 +102,46 @@ export default {
 			'clouds': 'Хмари',
 		},
 	},
+	air_quality: {
+		quality: 'Якість повітря',
+		conditions: {
+			very_good: 'Дуже добра',
+			good: 'Добра',
+			moderate: 'Помірна',
+			unhealthy_for_sensitive_groups: 'Шкідлива для чутливих груп',
+			unhealthy: 'Шкідлива',
+			very_unhealthy: 'Дуже шкідлива',
+			hazardous: 'Небезпечна',
+		},
+	},
 	page: {
+		title: 'GOptivum - Кращий Розклад',
+		not_found: 'Сторінку не знайдено',
+		no_schedule: 'Розклад на цей день відсутній',
+		no_divisions: 'Класів не знайдено',
+		no_teachers: 'Вчителів не знайдено',
+		no_rooms: 'Кімнат не знайдено',
+		divisions_error: 'Помилка завантаження класів',
+		teachers_error: 'Помилка завантаження вчителів',
+		rooms_error: 'Помилка завантаження кімнат',
 		home: 'Головна',
-		divisions: 'Підрозділи',
-		teachers: 'Викладачі',
-		classrooms: 'Класи',
+		divisions: 'Класи',
+		division: 'Клас - {id}',
+		teachers: 'Вчителі',
+		teacher: 'Вчитель - {id}',
+		rooms: 'Кімнати',
+		room: 'Кімната - {id}',
 		settings: 'Налаштування',
 	},
-};
\ No newline at end of file
+	search: {
+		division: 'Пошук класу...',
+		teacher: 'Пошук вчителя...',
+		room: 'Пошук кімнати...',
+	},
+	schedule: {
+		ordered_number: '№',
+		time_range: 'Час',
+		lesson: 'Урок',
+		room_title_prefix: 'Кімната {id}',
+	}
+};
diff --git a/web/optivum-better-schedule-frontend/src/plugins/vuetify.ts b/web/optivum-better-schedule-frontend/src/plugins/vuetify.ts
index 767bede..9e8b49b 100644
--- a/web/optivum-better-schedule-frontend/src/plugins/vuetify.ts
+++ b/web/optivum-better-schedule-frontend/src/plugins/vuetify.ts
@@ -1,7 +1,7 @@
 /**
  * plugins/vuetify.ts
  *
- * Framework documentation: https://vuetifyjs.com`
+ * Framework documentation: https://vuetifyjs.com
  */
 
 // Styles
@@ -14,44 +14,108 @@ import { createVuetify } from 'vuetify'
 const draculaTheme = {
   dark: true,
   colors: {
-    background: '#1A1C23',     // Darker background for main content
-    surface: '#121218',        // Much darker color for the drawer
-    primary: '#8BE9FD',        // Cyan
-    primaryMuted: '#6EA8B5',   // Muted cyan
-    secondary: '#FF79C6',      // Pink
-    secondaryMuted: '#8A3B64', // Muted pink
-    accent: '#BD93F9',         // Purple
-    error: '#FF5555',          // Red
-    info: '#8BE9FD',           // Cyan variant
-    success: '#50FA7B',        // Green
-    warning: '#F1FA8C',        // Yellow
-    foreground: '#F8F8F2',     // Foreground text color
-    comment: '#6272A4',        // Muted text color for comments
-    drawer: '#0F0F12',         // Darker shade specifically for drawer
-    orange: '#FFB86C',         // Optional orange
+    background: '#1A1C23',
+    surface: '#121218',
+    primary: '#8BE9FD',
+    primaryMuted: '#6EA8B5',
+    secondary: '#FF79C6',
+    secondaryMuted: '#8A3B64',
+    accent: '#BD93F9',
+    error: '#FF5555',
+    info: '#8BE9FD',
+    success: '#50FA7B',
+    warning: '#F1FA8C',
+    foreground: '#F8F8F2',
+    comment: '#6272A4',
+    textPrimary: '#E0E0E0',
+    textSecondary: '#4A90E2',
+    textMuted: '#A8A8A8',
+    gradient1: '#8A3B64',
+    gradient2: '#6EA8B5',
   },
-};
+}
 
-// https://vuetifyjs.com/en/introduction/why-vuetify/#feature-guides
+const lightTheme = {
+  dark: false,
+  colors: {
+    background: '#FFFFFF',
+    surface: '#FAFAFA',
+    primary: '#0079C9',
+    primaryMuted: '#688FDF',
+    secondary: '#A91AD9',
+    secondaryMuted: '#9F67E0',
+    accent: '#512DA8',
+    error: '#C62828',
+    info: '#1565C0',
+    success: '#2E7D32',
+    warning: '#F9A825',
+    foreground: '#212121',
+    comment: '#616161',
+    textPrimary: '#212121',
+    textSecondary: '#0079C9',
+    textMuted: '#9E9E9E',
+    gradient1: '#9F67E0',
+    gradient2: '#688FDF',
+  },
+}
+
+const darkTheme = {
+  dark: true,
+  colors: {
+    background: '#121212',
+    surface: '#1E1E1E',
+    primary: '#4A90E2',
+    primaryMuted: '#5094E2',
+    secondary: '#FF8C00',
+    secondaryMuted: '#FFAB40',
+    accent: '#03DAC6',
+    error: '#E57373',
+    info: '#42A5F5',
+    success: '#81C784',
+    warning: '#FFCA28',
+    foreground: '#E0E0E0',
+    comment: '#B0BEC5',
+    textPrimary: '#E0E0E0',
+    textSecondary: '#4A90E2',
+    textMuted: '#A8A8A8',
+    gradient1: '#5094E2',
+    gradient2: '#FFAB40',
+  },
+}
+
+const oledTheme = {
+  dark: true,
+  colors: {
+    background: '#000000',
+    surface: '#000000',
+    primary: '#1E90FF',
+    primaryMuted: '#0A0A0A',
+    secondary: '#FF4500',
+    secondaryMuted: '#0A0A0A',
+    accent: '#00CED1',
+    error: '#FF6347',
+    info: '#1E90FF',
+    success: '#32CD32',
+    warning: '#FFD700',
+    foreground: '#E0E0E0',
+    comment: '#A9A9A9',
+    textPrimary: '#E0E0E0',
+    textSecondary: '#1E90FF',
+    textMuted: '#A9A9A9',
+    gradient1: '#E0E0E0',
+    gradient2: '#E0E0E0',
+  },
+}
+
+// Export the Vuetify configuration
 export default createVuetify({
   theme: {
-    defaultTheme: 'dark',
+    defaultTheme: 'light',
     themes: {
-      light: {
-        dark: false,
-        colors: {
-          primaryMuted: '#78909C',  // More colorful light muted blue-grey
-          secondaryMuted: '#90A4AE', // More colorful light muted blue-grey variant
-        },
-      },
-      dark: {
-        dark: true,
-        colors: {
-          primaryMuted: '#455A64',  // More colorful dark muted blue-grey
-          secondaryMuted: '#546E7A', // More colorful dark muted blue-grey variant
-        },
-      },
+      light: lightTheme,
+      dark: darkTheme,
       dracula: draculaTheme,
+      oled: oledTheme,
     },
   },
-});
+})
diff --git a/web/optivum-better-schedule-frontend/src/router.ts b/web/optivum-better-schedule-frontend/src/router.ts
index 3d21b2e..41967c6 100644
--- a/web/optivum-better-schedule-frontend/src/router.ts
+++ b/web/optivum-better-schedule-frontend/src/router.ts
@@ -1,13 +1,11 @@
-import { createRouter, createWebHistory } from 'vue-router'
+import { createRouter, createWebHistory, RouteLocationNormalized } from 'vue-router'
 import MainPage from './components/pages/Home.vue'
 import DivisionsPage from './components/pages/Divisions.vue'
 import TeachersPage from './components/pages/Teachers.vue'
 import RoomsPage from './components/pages/Rooms.vue'
 import SettingsPage from './components/pages/Settings.vue'
 
-import DivisionPage from './components/pages/Division.vue'
-import TeacherPage from './components/pages/Teacher.vue'
-import RoomPage from './components/pages/Room.vue'
+import ScheduleTable from './components/ScheduleTable.vue'
 
 const routes = [
   { path: '/', component: MainPage, meta: { titleKey: 'page.home' } },
@@ -16,11 +14,26 @@ const routes = [
   { path: '/teachers', component: TeachersPage, meta: { titleKey: 'page.teachers' } },
   { path: '/rooms', component: RoomsPage, meta: { titleKey: 'page.rooms' } },
   { path: '/settings', component: SettingsPage, meta: { titleKey: 'page.settings' } },
-
-  { path: '/division/:id', component: DivisionPage, props: true, meta: { titleKey: 'page.division' } },
-  { path: '/teacher/:id', component: TeacherPage, props: true, meta: { titleKey: 'page.teacher' } },
-  { path: '/room/:id', component: RoomPage, props: true, meta: { titleKey: 'page.room' } },
-]
+  
+  { 
+    path: '/division/:id', 
+    component: ScheduleTable, 
+    props: (route: RouteLocationNormalized) => ({ id: route.params.id as string, type: 'division' }), 
+    meta: { titleKey: 'page.division' } 
+  },
+  { 
+    path: '/teacher/:id', 
+    component: ScheduleTable, 
+    props: (route: RouteLocationNormalized) => ({ id: route.params.id as string, type: 'teacher' }), 
+    meta: { titleKey: 'page.teacher' } 
+  },
+  { 
+    path: '/room/:id', 
+    component: ScheduleTable, 
+    props: (route: RouteLocationNormalized) => ({ id: route.params.id as string, type: 'room' }), 
+    meta: { titleKey: 'page.room' } 
+  },
+];
 
 const router = createRouter({
   history: createWebHistory(),
diff --git a/web/optivum-better-schedule-frontend/src/stores/localeStore.ts b/web/optivum-better-schedule-frontend/src/stores/localeStore.ts
index 9dab713..2f1a458 100644
--- a/web/optivum-better-schedule-frontend/src/stores/localeStore.ts
+++ b/web/optivum-better-schedule-frontend/src/stores/localeStore.ts
@@ -5,7 +5,7 @@ import { useI18n } from 'vue-i18n';
 
 export const useLocaleStore = defineStore('locale', () => {
 	const { locale } = useI18n();
-	const currentLocale = ref(localStorage.getItem('language') || 'en');
+	const currentLocale = ref(localStorage.getItem('language') || 'pl');
 
 	watch(currentLocale, (newLocale) => {
 		locale.value = newLocale;
diff --git a/web/optivum-better-schedule-frontend/src/stores/miscStore.ts b/web/optivum-better-schedule-frontend/src/stores/miscStore.ts
new file mode 100644
index 0000000..b120d9f
--- /dev/null
+++ b/web/optivum-better-schedule-frontend/src/stores/miscStore.ts
@@ -0,0 +1,22 @@
+// src/stores/miscStore.ts
+import { defineStore } from 'pinia';
+import { ref, watch } from 'vue';
+
+export const useMiscStore = defineStore('misc', () => {
+	const reducedAnimationsEnabled = ref(
+		localStorage.getItem('reducedAnimationsEnabled') === 'true' || false
+	);
+
+	watch(reducedAnimationsEnabled, (newValue) => {
+		localStorage.setItem('reducedAnimationsEnabled', String(newValue));
+	});
+
+	const toggleReducedAnimations = () => {
+		reducedAnimationsEnabled.value = !reducedAnimationsEnabled.value;
+	};
+
+	return {
+		reducedAnimationsEnabled,
+		toggleReducedAnimations,
+	};
+});