diff --git a/src/components/CreateEditComponents/CreateTeacher.vue b/src/components/CreateEditComponents/CreateTeacher.vue
index 1f5ff6bbe778c771339b274c39b0c5e3e953608b..b582838decf317f5a601e3acafa91a290fb12461 100644
--- a/src/components/CreateEditComponents/CreateTeacher.vue
+++ b/src/components/CreateEditComponents/CreateTeacher.vue
@@ -63,7 +63,7 @@
           <div class="col-md-11 mb-3">
             <h1  class="formTitle" style="margin-top: 10px">zusätzliche Adresse</h1>
             <div class="input_container">
-              <input name="addaddress" v-model="teacher.addaddress" class="form-control inputField" placeholder="zusätzliche Adresse" aria-label="addaddress" required>
+              <input name="addaddress" v-model="teacher.school_branch" class="form-control inputField" placeholder="zusätzliche Adresse" aria-label="addaddress" required>
             </div>
           </div>
         </div>
diff --git a/src/components/CreateEditComponents/EditTeacher.vue b/src/components/CreateEditComponents/EditTeacher.vue
index 3f818c45806546480df664f7871e52c04649f1a2..3b4122dbc22bd26613a88e760ee8d6bbba2386c4 100644
--- a/src/components/CreateEditComponents/EditTeacher.vue
+++ b/src/components/CreateEditComponents/EditTeacher.vue
@@ -5,9 +5,17 @@
         <form @submit="validateBeforeSubmit" class="col-md-10" style="margin-bottom: 20px">
           <div class="form-row">
             <div class="col-md-11 mb-3">
-              <h1 class="formTitle" style="margin-top: 30px">Anrede</h1>
+              <h1 class="formTitle" style="margin-top: 30px">Personalnummer</h1>
               <div class="input_container">
-                <input v-model="teacher.anrede" type="text" class="form-control inputField" placeholder="Anrede" aria-label="anrede" required>
+                <input v-model="teacher.personal_number" type="text" class="form-control inputField" placeholder="Personalnummer" aria-label="personal_number" required>
+              </div>
+            </div>
+          </div>
+          <div class="form-row">
+            <div class="col-md-11 mb-3">
+              <h1 class="formTitle" style="margin-top: 30px">Geschlecht</h1>
+              <div class="input_container">
+                <input v-model="teacher.gender" type="text" class="form-control inputField" placeholder="Geschlecht" aria-label="gender" required>
               </div>
             </div>
           </div>
@@ -37,81 +45,81 @@
           </div>
           <div class="form-row">
             <div class="col-md-11 mb-3">
-              <h1  class="formTitle" style="margin-top: 10px">Straße</h1>
+              <h1 class="formTitle" style="margin-top: 30px">E-Mail</h1>
               <div class="input_container">
-                <input name="street" v-model="teacher.street" class="form-control inputField" placeholder="Straße" aria-label="street" required>
+                <input v-model="teacher.email" type="text" class="form-control inputField" placeholder="E-Mail" aria-label="email" required>
               </div>
             </div>
           </div>
           <div class="form-row">
             <div class="col-md-11 mb-3">
-              <h1  class="formTitle" style="margin-top: 10px">Postleitzahl</h1>
+              <h1 class="formTitle" style="margin-top: 30px">Telefon</h1>
               <div class="input_container">
-                <input name="zip" v-model="teacher.zip" class="form-control inputField" placeholder="Postleitzahl" aria-label="zip" required>
+                <input v-model="teacher.telephone" type="text" class="form-control inputField" placeholder="Telefon" aria-label="telephone" required>
               </div>
             </div>
           </div>
           <div class="form-row">
             <div class="col-md-11 mb-3">
-              <h1  class="formTitle" style="margin-top: 10px">Ort</h1>
+              <h1  class="formTitle" style="margin-top: 10px">Straße</h1>
               <div class="input_container">
-                <input name="city" v-model="teacher.city" class="form-control inputField" placeholder="Ort" aria-label="city" required>
+                <input name="street" v-model="teacher.street" class="form-control inputField" placeholder="Straße" aria-label="street" required>
               </div>
             </div>
           </div>
           <div class="form-row">
             <div class="col-md-11 mb-3">
-              <h1  class="formTitle" style="margin-top: 10px">zusätzliche Adresse</h1>
+              <h1  class="formTitle" style="margin-top: 10px">Postleitzahl</h1>
               <div class="input_container">
-                <input name="addaddress" v-model="teacher.addaddress" class="form-control inputField" placeholder="zusätzliche Adresse" aria-label="addaddress" required>
+                <input name="zip" v-model="teacher.zip" class="form-control inputField" placeholder="Postleitzahl" aria-label="zip" required>
               </div>
             </div>
           </div>
           <div class="form-row">
             <div class="col-md-11 mb-3">
-              <h1  class="formTitle" style="margin-top: 10px">persönlicher Fragebogen</h1>
+              <h1  class="formTitle" style="margin-top: 10px">Ort</h1>
               <div class="input_container">
-                <input name="personal_questionnaire" v-model="teacher.personal_questionnaire" class="form-control inputField" placeholder="persönlicher Fragebogen" aria-label="personal_questionnaire" required>
+                <input name="city" v-model="teacher.city" class="form-control inputField" placeholder="Ort" aria-label="city" required>
               </div>
             </div>
           </div>
           <div class="form-row">
             <div class="col-md-11 mb-3">
-              <h1  class="formTitle" style="margin-top: 10px">SommerUni 17</h1>
+              <h1  class="formTitle" style="margin-top: 10px">Schulfächer</h1>
               <div class="input_container">
-                <input name="sommeruni_17" v-model="teacher.summeruni_17" class="form-control inputField" placeholder="SommerUni 17" aria-label="summeruni_17" required>
+                <input name="subject" v-model="teacher.subject" class="form-control inputField" placeholder="Schulfächer" aria-label="subject" required>
               </div>
             </div>
           </div>
           <div class="form-row">
             <div class="col-md-11 mb-3">
-              <h1  class="formTitle" style="margin-top: 10px">SommerUni 18</h1>
+              <h1  class="formTitle" style="margin-top: 10px">Schulart</h1>
               <div class="input_container">
-                <input name="sommeruni_18" v-model="teacher.summeruni_18" class="form-control inputField" placeholder="SommerUni 18" aria-label="summeruni_18" required>
+                <input name="school_branch" v-model="teacher.school_branch" class="form-control inputField" placeholder="zusätzliche Adresse" aria-label="school_branch" required>
               </div>
             </div>
           </div>
           <div class="form-row">
             <div class="col-md-11 mb-3">
-              <h1  class="formTitle" style="margin-top: 10px">SommerUni 19</h1>
+              <h1  class="formTitle" style="margin-top: 10px">Schulname</h1>
               <div class="input_container">
-                <input name="sommeruni_19" v-model="teacher.summeruni_19" class="form-control inputField" placeholder="SommerUni 19" aria-label="summeruni_19" required>
+                <input name="school_name" v-model="teacher.school_name" class="form-control inputField" placeholder="Schulname" aria-label="school_name" required>
               </div>
             </div>
           </div>
           <div class="form-row">
             <div class="col-md-11 mb-3">
-              <h1  class="formTitle" style="margin-top: 10px">SommerUni 20</h1>
+              <h1  class="formTitle" style="margin-top: 10px">Schulnummer</h1>
               <div class="input_container">
-                <input name="sommeruni_20" v-model="teacher.summeruni_20" class="form-control inputField" placeholder="SommerUni 20" aria-label="summeruni_20" required>
+                <input name="school_number" v-model="teacher.school_number" class="form-control inputField" placeholder="Schulnummer" aria-label="school_number" required>
               </div>
             </div>
           </div>
           <div class="form-row">
             <div class="col-md-11 mb-3">
-              <h1  class="formTitle" style="margin-top: 10px">NatLab 20</h1>
+              <h1  class="formTitle" style="margin-top: 10px">aktiv?</h1>
               <div class="input_container">
-                <input name="natlab_20" v-model="teacher.natlab_20" class="form-control inputField" placeholder="NatLab 20" aria-label="natlab_20" required>
+                <input name="status" v-model="teacher.status" class="form-control inputField" placeholder="aktiv?" aria-label="status" required>
               </div>
             </div>
           </div>
@@ -140,7 +148,7 @@ export default {
     return {
       id: JSON.parse(localStorage.getItem('checkedBoxID')),
       message: "",
-      teacher: new Teacher('','', '', '', '', '', '', '', '', '', '', '', '', ''),
+      teacher: new Teacher('','', '', '', '', '', '', '', '', '', '', '', '', '', ''),
     }
   },
 
@@ -155,7 +163,21 @@ export default {
       this.$store.dispatch('teacher/getByID', this.id).then(
           (data) => {
             console.log(data);
-            //this.teacher.anrede = data.courseNumber;
+            this.teacher.personal_number = data.personal_number;
+            this.teacher.gender = data.gender;
+            this.teacher.grad = data.grad;
+            this.teacher.firstname = data.firstname;
+            this.teacher.lastname = data.lastname;
+            this.teacher.email = data.email;
+            this.teacher.telephone = data.telephone;
+            this.teacher.street = data.street;
+            this.teacher.zip = data.zip;
+            this.teacher.city = data.city;
+            this.teacher.subject = data.subject;
+            this.teacher.school_branch = data.school_branch;
+            this.teacher.school_name = data.school_name;
+            this.teacher.school_number = data.school_number;
+            this.teacher.status = data.status;
 
           },
           error => {
diff --git a/src/components/Teachers.vue b/src/components/Teachers.vue
index b820ce73cc3db40151d83a6d5b4c213c0114458a..f90729566d13f75f934d590c9e25cd3171c0042f 100644
--- a/src/components/Teachers.vue
+++ b/src/components/Teachers.vue
@@ -20,42 +20,44 @@
             <label class="form-check-label" for="checkbox_headerline"></label>
           </div>
         </th>
-        <th v-on:click="sortTable('anrede')"><img id='imgsortanrede' :src="require('../assets/'+sortImg)">Anrede</th>
+        <th v-on:click="sortTable('personal_number')"><img id='imgsortpersonalnumber' :src="require('../assets/'+sortImg)">Personalnummer</th>
+        <th v-on:click="sortTable('gender')"><img id='imgsortgender' :src="require('../assets/'+sortImg)">Geschlecht</th>
         <th v-on:click="sortTable('grad')"><img id='imgsortgrad' :src="require('../assets/'+sortImg)">Grad</th>
         <th v-on:click="sortTable('firstname')"><img id='imgsortfirstname' :src="require('../assets/'+sortImg)">Vorname</th>
         <th v-on:click="sortTable('lastname')"><img id='imgsortlastname' :src="require('../assets/'+sortImg)">Nachname</th>
+        <th v-on:click="sortTable('email')"><img id='imgsortemail' :src="require('../assets/'+sortImg)">E-Mail</th>
+        <th v-on:click="sortTable('telephone')"><img id='imgsorttelephone' :src="require('../assets/'+sortImg)">Telefon</th>
         <th v-on:click="sortTable('street')"><img id='imgsortstreet' :src="require('../assets/'+sortImg)">Straße</th>
         <th v-on:click="sortTable('zip')"><img id='imgsortzip' :src="require('../assets/'+sortImg)">Postleitzahl</th>
         <th v-on:click="sortTable('city')"><img id='imgsortcity' :src="require('../assets/'+sortImg)">Ort</th>
-        <th v-on:click="sortTable('addaddress')"><img id='imgsortaddaddress' :src="require('../assets/'+sortImg)">zusätzliche Adresse</th>
-        <th v-on:click="sortTable('personal_questionnaire')"><img id='imgsortpersonal_questionaire' :src="require('../assets/'+sortImg)">persönlicher Fragebogen</th>
-        <th v-on:click="sortTable('summeruni_17')"><img id='imgsortsummeruni_17' :src="require('../assets/'+sortImg)">SommerUni 17</th>
-        <th v-on:click="sortTable('summeruni_18')"><img id='imgsortsummeruni_18' :src="require('../assets/'+sortImg)">SommerUni 18</th>
-        <th v-on:click="sortTable('summeruni_19')"><img id='imgsortsummeruni_19' :src="require('../assets/'+sortImg)">SommerUni 19</th>
-        <th v-on:click="sortTable('summeruni_20')"><img id='imgsortsummeruni_20' :src="require('../assets/'+sortImg)">SommerUni 20</th>
-        <th v-on:click="sortTable('natlab_20')"><img id='imgsortnatlab_20' :src="require('../assets/'+sortImg)">NatLab 20</th>
+        <th v-on:click="sortTable('subject')"><img id='imgsortsubject' :src="require('../assets/'+sortImg)">Fächer</th>
+        <th v-on:click="sortTable('school_branch')"><img id="imgsortschoolbranch" :src="require('../assets/'+sortImg)">Schulart</th>
+        <th v-on:click="sortTable('school_name')"><img id='imgsortschoolname' :src="require('../assets/'+sortImg)">Schulname</th>
+        <th v-on:click="sortTable('school_number')"><img id='imgsortschoolnumber' :src="require('../assets/'+sortImg)">Schulnummer</th>
+       <th v-on:click="sortTable('status')"><img id='imgsortstatus' :src="require('../assets/'+sortImg)">Status</th>
       </tr>
-      <tr v-for="row in filteredRows" :key="row.lastname">
+      <tr v-for="row in filteredRows" :key="row.personal_number">
         <td scope="row">
           <div class="form-check">
-            <input type="checkbox" class="form-check-input" name="checkbox_tablerow" id="checkbox_tablerow" v-model="checkedBoxes" :value="row.lastname">
+            <input type="checkbox" class="form-check-input" name="checkbox_tablerow" id="checkbox_tablerow" v-model="checkedBoxes" :value="row.personal_number">
             <label class="form-check-label" for="checkbox_tablerow"></label>
           </div>
         </td>
-        <td>{{row.anrede}}</td>
+        <td>{{row.personal_number}}</td>
+        <td>{{row.gender}}</td>
         <td>{{row.grad}}</td>
         <td>{{row.firstname}}</td>
         <td>{{row.lastname}}</td>
+        <td>{{row.email}}</td>
+        <td>{{row.telephone}}</td>
         <td>{{row.street}}</td>
         <td>{{row.zip}}</td>
         <td>{{row.city}}</td>
-        <td>{{row.addaddress}}</td>
-        <td>{{row.personal_questionnaire}}</td>
-        <td>{{row.summeruni_17}}</td>
-        <td>{{row.summeruni_18}}</td>
-        <td>{{row.summeruni_19}}</td>
-        <td>{{row.summeruni_20}}</td>
-        <td>{{row.natlab_20}}</td>
+        <td>{{row.subject}}</td>
+        <td>{{row.school_branch}}</td>
+        <td>{{row.school_name}}</td>
+        <td>{{row.school_number}}</td>
+        <td>{{row.status}}</td>
       </tr>
     </table>
   </div>
@@ -69,7 +71,7 @@ export default {
       rows: [],
       checkedBoxes: [],
       filter:'',
-      currentSort:'lastname',
+      currentSort:'personal_number',
       currentSortDir:'asc',
       sortImg: 'sort_def.svg',
     }
@@ -97,12 +99,12 @@ export default {
       }
     },
 
-    /*loadData(){
+    loadData(){
       this.$store.dispatch('course/getAll').then(
           (data) => {
             let x;
             for(x = 0; x < data.length; x++){
-              this.rows.push({id: data[x].id, angebotsnummer: data[x].courseNumber, angebot: data[x].courseOffer, kursname: data[x].name, veranstaltungsart: data[x].eventType, kursdatum: data[x].courseDate, thema: data[x].topic, kursort: data[x].location, begleitendeLehrkraft: data[x].accompanyingTeacher, betreuendeStudenten: data[x].supervisingStudents, anzahlderAnwesenden: data[x].presentStudents, anzahlderAngemeldeten: data[x].registeredStudents, kursleiter: data[x].instructor, notiz: data[x].noteField});
+              this.rows.push({id: data[x].id, personal_number: data[x].personal_number, gender: data[x].gender, grad: data[x].grad, firstname: data[x].firstname, lastname: data[x].lastname, email: data[x].email, telephone: data[x].telephone, street: data[x].street, zip: data[x].zip, city: data[x].city, subject: data[x].subject, school_branch: data[x].school_branch, school_name: data[x].school_name, school_number: data[x].school_number, status: data[x].status});
             }
           },
           error => {
@@ -110,7 +112,7 @@ export default {
             this.successful = false;
           }
       );
-    },*/
+    },
 
     "sortTable": function sortTable(col) {
       this.currentSort = col;
@@ -118,229 +120,260 @@ export default {
         this.currentSortDir = 'desc';
 
         switch (this.currentSort){
-          case 'anrede':
-            document.getElementById("imgsortanrede").src = require('../assets/sort_asc.svg');
+          case 'personal_number':
+            document.getElementById("imgsortpersonalnumber").src = require('../assets/sort_asc.svg');
+            document.getElementById("imgsortgender").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortlastname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortemail").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsorttelephone").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortstreet").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortzip").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortcity").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortaddaddress").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortpersonal_questionaire").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_17").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_18").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_19").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_20").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortnatlab_20").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortsubject").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolbranch").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortstatus").src = require('../assets/sort_def.svg');
+            break;
+          case 'gender':
+            document.getElementById("imgsortgender").src = require('../assets/sort_asc.svg');
+            document.getElementById("imgsortpersonalnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortlastname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortemail").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsorttelephone").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortstreet").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortzip").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortcity").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortsubject").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolbranch").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortstatus").src = require('../assets/sort_def.svg');
             break;
           case 'grad':
             document.getElementById("imgsortgrad").src = require('../assets/sort_asc.svg');
-            document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortpersonalnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortgender").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortlastname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortemail").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsorttelephone").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortstreet").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortzip").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortcity").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortaddaddress").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortpersonal_questionaire").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_17").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_18").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_19").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_20").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortnatlab_20").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortsubject").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolbranch").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortstatus").src = require('../assets/sort_def.svg');
             break;
           case 'firstname':
             document.getElementById("imgsortfirstname").src = require('../assets/sort_asc.svg');
-            document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortpersonalnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortgender").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortlastname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortemail").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsorttelephone").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortstreet").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortzip").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortcity").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortaddaddress").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortpersonal_questionaire").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_17").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_18").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_19").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_20").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortnatlab_20").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortsubject").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolbranch").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortstatus").src = require('../assets/sort_def.svg');
             break;
           case 'lastname':
             document.getElementById("imgsortlastname").src = require('../assets/sort_asc.svg');
-            document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortpersonalnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortgender").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortemail").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsorttelephone").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortstreet").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortzip").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortcity").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortaddaddress").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortpersonal_questionaire").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_17").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_18").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_19").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_20").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortnatlab_20").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortsubject").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolbranch").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortstatus").src = require('../assets/sort_def.svg');
             break;
-          case 'street':
-            document.getElementById("imgsortstreet").src = require('../assets/sort_asc.svg');
-            document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg');
+          case 'email':
+            document.getElementById("imgsortemail").src = require('../assets/sort_asc.svg');
+            document.getElementById("imgsortpersonalnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortgender").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortlastname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsorttelephone").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortstreet").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortzip").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortcity").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortaddaddress").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortpersonal_questionaire").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_17").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_18").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_19").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_20").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortnatlab_20").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortsubject").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolbranch").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortstatus").src = require('../assets/sort_def.svg');
             break;
-          case 'zip':
-            document.getElementById("imgsortzip").src = require('../assets/sort_asc.svg');
-            document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg');
+          case 'telephone':
+            document.getElementById("imgsorttelephone").src = require('../assets/sort_asc.svg');
+            document.getElementById("imgsortpersonalnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortgender").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortlastname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortemail").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortstreet").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortzip").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortcity").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortaddaddress").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortpersonal_questionaire").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_17").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_18").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_19").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_20").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortnatlab_20").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortsubject").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolbranch").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortstatus").src = require('../assets/sort_def.svg');
             break;
-          case 'city':
-            document.getElementById("imgsortcity").src = require('../assets/sort_asc.svg');
-            document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg');
+          case 'street':
+            document.getElementById("imgsortstreet").src = require('../assets/sort_asc.svg');
+            document.getElementById("imgsortpersonalnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortgender").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortlastname").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortstreet").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortemail").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsorttelephone").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortzip").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortaddaddress").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortpersonal_questionaire").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_17").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_18").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_19").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_20").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortnatlab_20").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortcity").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortsubject").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolbranch").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortstatus").src = require('../assets/sort_def.svg');
             break;
-          case 'addaddress':
-            document.getElementById("imgsortaddaddress").src = require('../assets/sort_asc.svg');
-            document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg');
+          case 'zip':
+            document.getElementById("imgsortzip").src = require('../assets/sort_asc.svg');
+            document.getElementById("imgsortpersonalnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortgender").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortlastname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortemail").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsorttelephone").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortstreet").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortzip").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortcity").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortpersonal_questionaire").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_17").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_18").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_19").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_20").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortnatlab_20").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortsubject").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolbranch").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortstatus").src = require('../assets/sort_def.svg');
             break;
-          case 'personal_questionnaire':
-            document.getElementById("imgsortpersonal_questionaire").src = require('../assets/sort_asc.svg');
-            document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg');
+          case 'city':
+            document.getElementById("imgsortcity").src = require('../assets/sort_asc.svg');
+            document.getElementById("imgsortpersonalnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortgender").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortlastname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortemail").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsorttelephone").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortstreet").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortzip").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortcity").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortaddaddress").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_17").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_18").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_19").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_20").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortnatlab_20").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortsubject").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolbranch").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortstatus").src = require('../assets/sort_def.svg');
             break;
-          case 'summeruni_17':
-            document.getElementById("imgsortsummeruni_17").src = require('../assets/sort_asc.svg');
-            document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg');
+          case 'subject':
+            document.getElementById("imgsortsubject").src = require('../assets/sort_asc.svg');
+            document.getElementById("imgsortpersonalnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortgender").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortlastname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortemail").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsorttelephone").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortstreet").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortzip").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortcity").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortaddaddress").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortpersonal_questionaire").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_18").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_19").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_20").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortnatlab_20").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolbranch").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortstatus").src = require('../assets/sort_def.svg');
             break;
-          case 'summeruni_18':
-            document.getElementById("imgsortsummeruni_18").src = require('../assets/sort_asc.svg');
-            document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg');
+          case 'school_branch':
+            document.getElementById("imgsortschoolbranch").src = require('../assets/sort_asc.svg');
+            document.getElementById("imgsortpersonalnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortgender").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortlastname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortemail").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsorttelephone").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortstreet").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortzip").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortcity").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortaddaddress").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortpersonal_questionaire").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_17").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_19").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_20").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortnatlab_20").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortsubject").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortstatus").src = require('../assets/sort_def.svg');
             break;
-          case 'summeruni_19':
-            document.getElementById("imgsortsummeruni_19").src = require('../assets/sort_asc.svg');
-            document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg');
+          case 'school_name':
+            document.getElementById("imgsortschoolname").src = require('../assets/sort_asc.svg');
+            document.getElementById("imgsortpersonalnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortgender").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortlastname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortemail").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsorttelephone").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortstreet").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortzip").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortcity").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortaddaddress").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortpersonal_questionaire").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_17").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_18").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_20").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortnatlab_20").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortsubject").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolbranch").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortstatus").src = require('../assets/sort_def.svg');
             break;
-          case 'summeruni_20':
-            document.getElementById("imgsortsummeruni_20").src = require('../assets/sort_asc.svg');
-            document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg');
+          case 'school_number':
+            document.getElementById("imgsortschoolnumber").src = require('../assets/sort_asc.svg');
+            document.getElementById("imgsortpersonalnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortgender").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortlastname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortemail").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsorttelephone").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortstreet").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortzip").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortcity").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortaddaddress").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortpersonal_questionaire").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_17").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_18").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_19").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortnatlab_20").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortsubject").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolbranch").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortstatus").src = require('../assets/sort_def.svg');
             break;
-          case 'natlab_20':
-            document.getElementById("imgsortnatlab_20").src = require('../assets/sort_asc.svg');
-            document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg');
+          case 'status':
+            document.getElementById("imgsortstatus").src = require('../assets/sort_asc.svg');
+            document.getElementById("imgsortpersonalnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortgender").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortlastname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortemail").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsorttelephone").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortstreet").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortzip").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortcity").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortaddaddress").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortpersonal_questionaire").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_17").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_18").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_19").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_20").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortsubject").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolbranch").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolnumber").src = require('../assets/sort_def.svg');
             break;
         }
 
@@ -364,229 +397,260 @@ export default {
         this.currentSortDir = 'asc';
 
         switch (this.currentSort){
-          case 'anrede':
-            document.getElementById("imgsortanrede").src = require('../assets/sort_desc.svg');
+          case 'personal_number':
+            document.getElementById("imgsortpersonalnumber").src = require('../assets/sort_desc.svg');
+            document.getElementById("imgsortgender").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortlastname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortemail").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsorttelephone").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortstreet").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortzip").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortcity").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortaddaddress").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortpersonal_questionaire").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_17").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_18").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_19").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_20").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortnatlab_20").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortsubject").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolbranch").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortstatus").src = require('../assets/sort_def.svg');
+            break;
+          case 'gender':
+            document.getElementById("imgsortgender").src = require('../assets/sort_desc.svg');
+            document.getElementById("imgsortpersonalnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortlastname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortemail").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsorttelephone").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortstreet").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortzip").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortcity").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortsubject").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolbranch").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortstatus").src = require('../assets/sort_def.svg');
             break;
           case 'grad':
             document.getElementById("imgsortgrad").src = require('../assets/sort_desc.svg');
-            document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortpersonalnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortgender").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortlastname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortemail").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsorttelephone").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortstreet").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortzip").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortcity").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortaddaddress").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortpersonal_questionaire").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_17").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_18").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_19").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_20").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortnatlab_20").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortsubject").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolbranch").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortstatus").src = require('../assets/sort_def.svg');
             break;
           case 'firstname':
             document.getElementById("imgsortfirstname").src = require('../assets/sort_desc.svg');
-            document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortpersonalnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortgender").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortlastname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortemail").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsorttelephone").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortstreet").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortzip").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortcity").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortaddaddress").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortpersonal_questionaire").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_17").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_18").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_19").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_20").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortnatlab_20").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortsubject").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolbranch").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortstatus").src = require('../assets/sort_def.svg');
             break;
           case 'lastname':
             document.getElementById("imgsortlastname").src = require('../assets/sort_desc.svg');
-            document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortpersonalnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortgender").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortemail").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsorttelephone").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortstreet").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortzip").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortcity").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortaddaddress").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortpersonal_questionaire").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_17").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_18").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_19").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_20").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortnatlab_20").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortsubject").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolbranch").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortstatus").src = require('../assets/sort_def.svg');
             break;
-          case 'street':
-            document.getElementById("imgsortstreet").src = require('../assets/sort_desc.svg');
-            document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg');
+          case 'email':
+            document.getElementById("imgsortemail").src = require('../assets/sort_desc.svg');
+            document.getElementById("imgsortpersonalnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortgender").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortlastname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsorttelephone").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortstreet").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortzip").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortcity").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortaddaddress").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortpersonal_questionaire").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_17").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_18").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_19").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_20").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortnatlab_20").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortsubject").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolbranch").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortstatus").src = require('../assets/sort_def.svg');
             break;
-          case 'zip':
-            document.getElementById("imgsortzip").src = require('../assets/sort_desc.svg');
-            document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg');
+          case 'telephone':
+            document.getElementById("imgsorttelephone").src = require('../assets/sort_desc.svg');
+            document.getElementById("imgsortpersonalnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortgender").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortlastname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortemail").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortstreet").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortzip").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortcity").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortaddaddress").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortpersonal_questionaire").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_17").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_18").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_19").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_20").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortnatlab_20").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortsubject").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolbranch").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortstatus").src = require('../assets/sort_def.svg');
             break;
-          case 'city':
-            document.getElementById("imgsortcity").src = require('../assets/sort_desc.svg');
-            document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg');
+          case 'street':
+            document.getElementById("imgsortstreet").src = require('../assets/sort_desc.svg');
+            document.getElementById("imgsortpersonalnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortgender").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortlastname").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortstreet").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortemail").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsorttelephone").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortzip").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortaddaddress").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortpersonal_questionaire").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_17").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_18").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_19").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_20").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortnatlab_20").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortcity").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortsubject").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolbranch").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortstatus").src = require('../assets/sort_def.svg');
             break;
-          case 'addaddress':
-            document.getElementById("imgsortaddaddress").src = require('../assets/sort_desc.svg');
-            document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg');
+          case 'zip':
+            document.getElementById("imgsortzip").src = require('../assets/sort_desc.svg');
+            document.getElementById("imgsortpersonalnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortgender").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortlastname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortemail").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsorttelephone").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortstreet").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortzip").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortcity").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortpersonal_questionaire").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_17").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_18").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_19").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_20").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortnatlab_20").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortsubject").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolbranch").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortstatus").src = require('../assets/sort_def.svg');
             break;
-          case 'personal_questionnaire':
-            document.getElementById("imgsortpersonal_questionaire").src = require('../assets/sort_desc.svg');
-            document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg');
+          case 'city':
+            document.getElementById("imgsortcity").src = require('../assets/sort_desc.svg');
+            document.getElementById("imgsortpersonalnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortgender").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortlastname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortemail").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsorttelephone").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortstreet").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortzip").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortcity").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortaddaddress").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_17").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_18").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_19").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_20").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortnatlab_20").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortsubject").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolbranch").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortstatus").src = require('../assets/sort_def.svg');
             break;
-          case 'summeruni_17':
-            document.getElementById("imgsortsummeruni_17").src = require('../assets/sort_desc.svg');
-            document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg');
+          case 'subject':
+            document.getElementById("imgsortsubject").src = require('../assets/sort_desc.svg');
+            document.getElementById("imgsortpersonalnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortgender").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortlastname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortemail").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsorttelephone").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortstreet").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortzip").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortcity").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortaddaddress").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortpersonal_questionaire").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_18").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_19").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_20").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortnatlab_20").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolbranch").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortstatus").src = require('../assets/sort_def.svg');
             break;
-          case 'summeruni_18':
-            document.getElementById("imgsortsummeruni_18").src = require('../assets/sort_desc.svg');
-            document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg');
+          case 'school_branch':
+            document.getElementById("imgsortschoolbranch").src = require('../assets/sort_desc.svg');
+            document.getElementById("imgsortpersonalnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortgender").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortlastname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortemail").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsorttelephone").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortstreet").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortzip").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortcity").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortaddaddress").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortpersonal_questionaire").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_17").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_19").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_20").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortnatlab_20").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortsubject").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortstatus").src = require('../assets/sort_def.svg');
             break;
-          case 'summeruni_19':
-            document.getElementById("imgsortsummeruni_19").src = require('../assets/sort_desc.svg');
-            document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg');
+          case 'school_name':
+            document.getElementById("imgsortschoolname").src = require('../assets/sort_desc.svg');
+            document.getElementById("imgsortpersonalnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortgender").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortlastname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortemail").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsorttelephone").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortstreet").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortzip").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortcity").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortaddaddress").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortpersonal_questionaire").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_17").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_18").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_20").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortnatlab_20").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortsubject").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolbranch").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortstatus").src = require('../assets/sort_def.svg');
             break;
-          case 'summeruni_20':
-            document.getElementById("imgsortsummeruni_20").src = require('../assets/sort_desc.svg');
-            document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg');
+          case 'school_number':
+            document.getElementById("imgsortschoolnumber").src = require('../assets/sort_desc.svg');
+            document.getElementById("imgsortpersonalnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortgender").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortlastname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortemail").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsorttelephone").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortstreet").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortzip").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortcity").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortaddaddress").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortpersonal_questionaire").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_17").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_18").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_19").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortnatlab_20").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortsubject").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolbranch").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortstatus").src = require('../assets/sort_def.svg');
             break;
-          case 'natlab_20':
-            document.getElementById("imgsortnatlab_20").src = require('../assets/sort_desc.svg');
-            document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg');
+          case 'status':
+            document.getElementById("imgsortstatus").src = require('../assets/sort_desc.svg');
+            document.getElementById("imgsortpersonalnumber").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortgender").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortlastname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortemail").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsorttelephone").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortstreet").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortzip").src = require('../assets/sort_def.svg');
             document.getElementById("imgsortcity").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortaddaddress").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortpersonal_questionaire").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_17").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_18").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_19").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortsummeruni_20").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortsubject").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolbranch").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolname").src = require('../assets/sort_def.svg');
+            document.getElementById("imgsortschoolnumber").src = require('../assets/sort_def.svg');
             break;
         }
 
@@ -630,23 +694,24 @@ export default {
     },
     filteredRows() {
       return this.rows.filter(row => {
-        const anrede = row.anrede.toLowerCase();
+        const personal_number = row.personal_number.toLowerCase();
+        const gender = row.gender.toLowerCase();
         const grad = row.grad.toLowerCase();
         const firstname = row.firstname.toLowerCase();
         const lastname = row.lastname.toLowerCase();
+        const email = row.email.toLowerCase();
+        const telephone = row.telephone.toLowerCase();
         const street = row.street.toLowerCase();
-        const zip = row.zip.toLowerCase();
+        const zip = row.zip;
         const city = row.city.toLowerCase();
-        const addaddress = row.addaddress.toLowerCase();
-        const personal_questionnaire = row.personal_questionnaire.toLowerCase();
-        const summeruni_17 = row.summeruni_17.toLowerCase();
-        const summeruni_18 = row.summeruni_18.toLowerCase();
-        const summeruni_19 = row.summeruni_19.toLowerCase();
-        const summeruni_20 = row.summeruni_20.toLowerCase();
-        const natlab_20 = row.natlab_20.toLowerCase();
+        const school_branch = row.school_branch.toLowerCase();
+        const school_name = row.school_name.toLowerCase();
+        const school_number = row.school_number;
+        const status = row.status;
+
         const searchTerm = this.filter.toLowerCase();
 
-        return anrede.includes(searchTerm) || grad.includes(searchTerm) || firstname.includes(searchTerm) || lastname.includes(searchTerm) || street.includes(searchTerm) || zip.includes(searchTerm) || city.includes(searchTerm) || addaddress.includes(searchTerm) || personal_questionnaire.includes(searchTerm) || summeruni_17.includes(searchTerm) || summeruni_18.includes(searchTerm) || summeruni_19.includes(searchTerm) || summeruni_20.includes(searchTerm) || natlab_20.includes(searchTerm);
+        return personal_number.includes(searchTerm) || gender.includes(searchTerm) || grad.includes(searchTerm) || firstname.includes(searchTerm) || lastname.includes(searchTerm) || email.includes(searchTerm) || telephone.includes(searchTerm) || street.includes(searchTerm) || zip.includes(searchTerm) || city.includes(searchTerm) || school_branch.includes(searchTerm) || school_name.includes(searchTerm) || school_number.includes(searchTerm) || status.includes(searchTerm);
       });
     }
   }
diff --git a/src/models/teacher.js b/src/models/teacher.js
index 46bcd78c6445d7d0a3aad0335d9d70f7f4e44006..804023a7cadb98f0d753a0eea6f8487aa5142db1 100644
--- a/src/models/teacher.js
+++ b/src/models/teacher.js
@@ -1,20 +1,21 @@
 export default class Teacher {
 
-        constructor(anrede, grad, firstname, lastname, street, zip, city, addaddress, personal_questionnaire, summeruni_17, summeruni_18, summeruni_19, summeruni_20, natlab_20) {
-            this.anrede = anrede;
+        constructor(personal_number, gender, grad, firstname, lastname, email, telephone, street, zip, city, subject, school_branch, school_name, school_number, status) {
+            this.personal_number = personal_number;
+            this.gender = gender;
             this.grad = grad;
             this.firstname = firstname;
             this.lastname = lastname;
+            this.email = email;
+            this.telephone = telephone;
             this.street = street;
             this.zip = zip;
             this.city = city;
-            this.addaddress = addaddress;
-            this.personal_questionnaire = personal_questionnaire;
-            this.summeruni_17 = summeruni_17;
-            this.summeruni_18 = summeruni_18;
-            this.summeruni_19 = summeruni_19;
-            this.summeruni_20 = summeruni_20;
-            this.natlab_20 = natlab_20;
+            this.subject = subject;
+            this.school_branch = school_branch;
+            this.school_name = school_name;
+            this.school_number = school_number;
+            this.status = status;
     }
 
 }
\ No newline at end of file
diff --git a/src/services/teacher.service.js b/src/services/teacher.service.js
index a20b323c3434e078dd0c10e7a5e76b6c95863d03..0c4c25e1262fefd8f5266f18edec7871d18035aa 100644
--- a/src/services/teacher.service.js
+++ b/src/services/teacher.service.js
@@ -8,20 +8,21 @@ class TeacherService {
     insert(teacher) {
         return axios
             .post(API_URL + 'insertTeacher', {
-                    anrede: teacher.anrede,
+                    personal_number: teacher.personal_number,
+                    gender: teacher.gender,
                     grad: teacher.grad,
                     firstname: teacher.firstname,
                     lastname: teacher.lastname,
+                    email: teacher.email,
+                    telephone: teacher.telephone,
                     street: teacher.street,
                     zip: teacher.zip,
                     city: teacher.city,
-                    addaddress: teacher.addaddress,
-                    personal_questionnaire: teacher.personal_questionnaire,
-                    summeruni_17: teacher.summeruni_17,
-                    summeruni_18: teacher.summeruni_18,
-                    summeruni_19: teacher.summeruni_19,
-                    summeruni_20: teacher.summeruni_20,
-                    natlab_20: teacher.natlab_20,
+                    subject: teacher.subject,
+                    school_branch: teacher.school_branch,
+                    school_name: teacher.school_name,
+                    school_number: teacher.school_number,
+                    status: teacher.status,
                 }
 
                 ,{headers: authHeader() })
@@ -33,20 +34,21 @@ class TeacherService {
     update(teacher) {
         return axios
             .post(API_URL + 'updateTeacher', {
-                    anrede: teacher.anrede,
+                    personal_number: teacher.personal_number,
+                    gender: teacher.gender,
                     grad: teacher.grad,
                     firstname: teacher.firstname,
                     lastname: teacher.lastname,
+                    email: teacher.email,
+                    telephone: teacher.telephone,
                     street: teacher.street,
                     zip: teacher.zip,
                     city: teacher.city,
-                    addaddress: teacher.addaddress,
-                    personal_questionnaire: teacher.personal_questionnaire,
-                    summeruni_17: teacher.summeruni_17,
-                    summeruni_18: teacher.summeruni_18,
-                    summeruni_19: teacher.summeruni_19,
-                    summeruni_20: teacher.summeruni_20,
-                    natlab_20: teacher.natlab_20,
+                    subject: teacher.subject,
+                    school_branch: teacher.school_branch,
+                    school_name: teacher.school_name,
+                    school_number: teacher.school_number,
+                    status: teacher.status,
                 }
                 ,{headers: authHeader() })
             .then(response => {