diff --git a/src/App.vue b/src/App.vue
index fc56476..63dca98 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,6 @@
 <template>
   <NavBar />
-  <router-view/>
+  <router-view />
 </template>
 
 <script>
diff --git a/src/components/EventRow.vue b/src/components/EventRow.vue
index 7c23691..58bda4b 100644
--- a/src/components/EventRow.vue
+++ b/src/components/EventRow.vue
@@ -54,7 +54,7 @@ export default{
         align-items: center;
         padding: 11px 11Spx;
         gap: 24px;
-        height: 80px;
+        height: min-content;
         background: #F8F8F8;
 
         /* Inside auto layout */
diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue
index 933c1b6..dc7d432 100644
--- a/src/components/NavBar.vue
+++ b/src/components/NavBar.vue
@@ -79,7 +79,8 @@ export default {
   },
   watch: {
     date() {
-      this.$store.commit("changeDate", this.date);
+      if(this.date)
+        this.$store.commit("changeDate", this.date);
     },
   },
   methods: {
@@ -135,7 +136,7 @@ header {
   right: 0;
   margin-top: 56px;
   height: min-content;
-  z-index: 1;
+  z-index: 100;
 }
 
 .date {
diff --git a/src/views/Init.vue b/src/views/Init.vue
index 86db788..57431dd 100644
--- a/src/views/Init.vue
+++ b/src/views/Init.vue
@@ -13,7 +13,7 @@
           class="form-select form-select-sm mb-3 group-selector"
           v-model="groupId"
         >
-          <option selected value=null>Не выбрано</option>
+          <option selected value=-1>Не выбрано</option>
           <option
             v-for="group in groupList.items"
             :key="group.id"
@@ -38,7 +38,8 @@
 export default {
   methods: {
     saveGroup() {
-      if (this.groupId) {
+      console.log("groupId:", this.groupId);
+      if (this.groupId && this.groupId != "-1") {
         localStorage.setItem("timetable-group-id", this.groupId);
           this.$router.push("/timetable");
       } else {
@@ -149,4 +150,4 @@ img {
   height: auto;
   max-width: 200px;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/Timetable.vue b/src/views/Timetable.vue
index 52e01c6..a0d97f2 100644
--- a/src/views/Timetable.vue
+++ b/src/views/Timetable.vue
@@ -48,11 +48,9 @@ export default {
   methods: {
     loadGroupInfo(){
       var url = new URL(`${process.env.VUE_APP_API_TIMETABLE}/timetable/group/${this.groupId}`);
-      this.loaded = false;
       fetch(url).then(response => response.json())
         .then(json => {
           this.groupInfo = json;
-          this.loaded = true;
         })
     },
     loadTimetableOnDate(date) {
@@ -139,31 +137,4 @@ ul {
   flex-grow: 0;
 }
 
-.lds-dual-ring {
-  display: inline-block;
-  width: 80px;
-  height: 80px;
-}
-
-.lds-dual-ring:after {
-  content: " ";
-  display: block;
-  width: 64px;
-  height: 64px;
-  margin: 8px;
-  border-radius: 50%;
-  border: 6px solid lightgray;
-  border-color: lightgray transparent lightgray transparent;
-  animation: lds-dual-ring 1.2s linear infinite;
-}
-
-@keyframes lds-dual-ring {
-  0% {
-    transform: rotate(0deg);
-  }
-
-  100% {
-    transform: rotate(360deg);
-  }
-}
 </style>