diff --git a/components/chips/chips.sass b/components/chips/chips.sass
index ca90bd85..ff2b199e 100644
--- a/components/chips/chips.sass
+++ b/components/chips/chips.sass
@@ -10,6 +10,8 @@
     @apply bg-ps-primary text-ps-white
     @apply border-ps-green border-b-2 border-solid
 
+    min-height: 40px
+
     .chip
       @apply flex items-center select-none
       @apply px-2 py-1 m-1
diff --git a/components/chips/chips.vue b/components/chips/chips.vue
index f752fce4..97352fc6 100644
--- a/components/chips/chips.vue
+++ b/components/chips/chips.vue
@@ -4,9 +4,9 @@
   .chip-container
     .chip(v-for='(chip, index) in chips', :key='index')
       span {{ chip }}
-      .close-btn(@click='removeChip(index)')
+      .close-btn(v-if='edittable', @click='removeChip(index)')
         closeIcon(:size='18')/
-    input(v-model='currentInput', @keydown.enter='addChip', @keydown.tab.prevent='addChip', @keydown.delete='backspaceRemove')
+    input(v-if='edittable', v-model='currentInput', @keydown.enter='addChip', @keydown.tab.prevent='addChip', @keydown.delete='backspaceRemove')
   .mt-1.text-sm.text-ps-white.ml-auto.float-right Klíčové slovo potvrdíš tabem/enterem
 </template>
 
@@ -27,6 +27,10 @@ export default defineComponent({
       type: String,
       default: '',
     },
+    edittable: {
+      type: Boolean,
+      default: true,
+    },
   },
   setup(props, { emit }) {
     watch(props, (newProps) => {
diff --git a/components/my-project/my-project.vue b/components/my-project/my-project.vue
index 74746510..2e6a2b55 100644
--- a/components/my-project/my-project.vue
+++ b/components/my-project/my-project.vue
@@ -43,7 +43,7 @@
           .ml-2.underline {{ file.fileName }}
         ps-btn(v-if='modificable', text, @click='removeFile(file.filePath)', :disabled='removing', :loading='removing')
           bin-icon(:size='20')
-      ps-chips(v-model='keywordsRef', placeholder='Klíčová slova')
+      ps-chips(v-model='keywordsRef', :edittable='modificable', placeholder='Klíčová slova')
   .mt-8.w-full.flex.flex.justify-center
     ps-btn.mr-4(@click='saveChanges', :disabled='awaiting || submittedRef || !modificable', :loading='awaiting') Uložit
     ps-btn.ml-4(@click='checkModal', :disabled='awaiting || submittedRef || !modificable', :loading='awaiting') Odevzdat
diff --git a/components/ui/tabs/tabs.sass b/components/ui/tabs/tabs.sass
index b6c635e1..a79fe8c2 100644
--- a/components/ui/tabs/tabs.sass
+++ b/components/ui/tabs/tabs.sass
@@ -9,7 +9,7 @@
     @apply mb-4 px-5 py-1
     @apply bg-ps-secondary shadow rounded-lg cursor-pointer
     @apply text-ps-white capitalize
-    @apply flex flex justify-center
+    @apply flex flex justify-center items-center
 
     transition: border ease-in .1s
 
diff --git a/pages/index.vue b/pages/index.vue
index 67ab0667..b1d5c548 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -29,8 +29,6 @@ export default defineComponent({
     for (let i = 0; i < 5; i++) {
       const year = (new Date().getFullYear() + i).toString();
 
-      console.log(year);
-
       graduationYears.value.push({
         placeholder: year,
         value: year,
diff --git a/pages/students.vue b/pages/students.vue
index 133c81cb..f307563a 100644
--- a/pages/students.vue
+++ b/pages/students.vue
@@ -14,7 +14,7 @@
     )
   ps-tabs(:tabs='extern ? ["oponent"] : ["studenti", "předpřipravené zadání", "oponent"]', :selected='selectedTab', @selected='setTab')
     ps-tab(v-if='!extern', :active='selectedTab == "studenti"')
-      .flex.justify-between
+      .flex.justify-between(v-if='projects.length > 0')
         span.text-2xl.text-ps-white.font-medium Moji studenti
       .flex.flex-col.mt-4.flex-wrap.justify-between(class='lg:flex-row')
         ps-teacher-project(
@@ -29,7 +29,7 @@
           :teacher='project.teacher',
           :opponent='project.opponent'
         )
-      .flex.justify-between.mt-2
+      .flex.justify-between.mt-2(v-if='submittedProjects.length > 0')
         span.text-2xl.text-ps-white.font-medium Projekty k hodnocení
       .flex.flex-col.mt-4.flex-wrap.justify-between(class='lg:flex-row')
         ps-teacher-project(
diff --git a/server/api/proposal/accept.ts b/server/api/proposal/accept.ts
index 153ccb46..067d6559 100644
--- a/server/api/proposal/accept.ts
+++ b/server/api/proposal/accept.ts
@@ -22,7 +22,7 @@ export default async (req: Request, res: Response) => {
   try {
     await admin.firestore().runTransaction(async (transaction) => {
       const sfDoc = await transaction.get(proposalRef);
-      const userDoc = await transaction.get(admin.firestore().collection('users').doc(sfDoc.data()?.currentYear));
+      const userDoc = await transaction.get(admin.firestore().collection('users').doc(sfDoc.data()?.studentId));
 
       const projectRef = admin.firestore().collection('projects').doc();