diff --git a/src/ui/Ui_semesterapparat_ui.py b/src/ui/Ui_semesterapparat_ui.py
index 66946ea..978a742 100644
--- a/src/ui/Ui_semesterapparat_ui.py
+++ b/src/ui/Ui_semesterapparat_ui.py
@@ -25,7 +25,15 @@ class Ui_MainWindow(object):
         MainWindow.setMinimumSize(QtCore.QSize(1278, 800))
         MainWindow.setMaximumSize(QtCore.QSize(1590, 800))
         MainWindow.setContextMenuPolicy(QtCore.Qt.ContextMenuPolicy.NoContextMenu)
-
+        icon = QtGui.QIcon()
+        icon.addPixmap(
+            QtGui.QPixmap(
+                "c:\\Users\\aky547\\GitHub\\SemesterapparatsManager\\src\\ui\\../../icons/logo.ico"
+            ),
+            QtGui.QIcon.Mode.Normal,
+            QtGui.QIcon.State.Off,
+        )
+        MainWindow.setWindowIcon(icon)
         MainWindow.setStatusTip("")
         self.centralwidget = QtWidgets.QWidget(parent=MainWindow)
         sizePolicy = QtWidgets.QSizePolicy(
@@ -91,6 +99,7 @@ class Ui_MainWindow(object):
         self.cancel_active_selection = QtWidgets.QPushButton(
             parent=self.horizontalLayoutWidget_2
         )
+        self.cancel_active_selection.setEnabled(False)
         self.cancel_active_selection.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus)
         self.cancel_active_selection.setObjectName("cancel_active_selection")
         self.verticalLayout_2.addWidget(self.cancel_active_selection)
@@ -190,6 +199,9 @@ class Ui_MainWindow(object):
         self.dokument_list.setFont(font)
         self.dokument_list.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus)
         self.dokument_list.setAcceptDrops(True)
+        self.dokument_list.setHorizontalScrollBarPolicy(
+            QtCore.Qt.ScrollBarPolicy.ScrollBarAlwaysOff
+        )
         self.dokument_list.setSizeAdjustPolicy(
             QtWidgets.QAbstractScrollArea.SizeAdjustPolicy.AdjustToContents
         )
@@ -224,6 +236,7 @@ class Ui_MainWindow(object):
         self.dokument_list.setHorizontalHeaderItem(2, item)
         item = QtWidgets.QTableWidgetItem()
         self.dokument_list.setHorizontalHeaderItem(3, item)
+        self.dokument_list.horizontalHeader().setDefaultSectionSize(107)
         self.frame = QtWidgets.QFrame(parent=self.app_group_box)
         self.frame.setEnabled(True)
         self.frame.setGeometry(QtCore.QRect(10, 30, 1241, 151))
@@ -883,7 +896,7 @@ class Ui_MainWindow(object):
         self.statistics_table.horizontalHeader().setDefaultSectionSize(59)
         self.statistics_table.horizontalHeader().setMinimumSectionSize(24)
         self.statistics_table.horizontalHeader().setSortIndicatorShown(True)
-        self.statistics_table.horizontalHeader().setStretchLastSection(False)
+        self.statistics_table.horizontalHeader().setStretchLastSection(True)
         self.gridLayout_4.addWidget(self.statistics_table, 0, 0, 1, 1)
         self.tabWidget_3.addTab(self.tab_6, "")
         self.tab_7 = QtWidgets.QWidget()
@@ -972,51 +985,15 @@ class Ui_MainWindow(object):
         self.tab_8.setObjectName("tab_8")
         self.create_frame_elsa = QtWidgets.QFrame(parent=self.tab_8)
         self.create_frame_elsa.setEnabled(False)
-        self.create_frame_elsa.setGeometry(QtCore.QRect(20, 60, 1151, 201))
+        self.create_frame_elsa.setGeometry(QtCore.QRect(20, 200, 1221, 201))
         self.create_frame_elsa.setFrameShape(QtWidgets.QFrame.Shape.StyledPanel)
         self.create_frame_elsa.setFrameShadow(QtWidgets.QFrame.Shadow.Raised)
         self.create_frame_elsa.setObjectName("create_frame_elsa")
-        self.formLayoutWidget_4 = QtWidgets.QWidget(parent=self.create_frame_elsa)
-        self.formLayoutWidget_4.setGeometry(QtCore.QRect(0, 10, 401, 91))
-        self.formLayoutWidget_4.setObjectName("formLayoutWidget_4")
-        self.formLayout_8 = QtWidgets.QFormLayout(self.formLayoutWidget_4)
-        self.formLayout_8.setContentsMargins(0, 0, 0, 0)
-        self.formLayout_8.setObjectName("formLayout_8")
-        self.label_27 = QtWidgets.QLabel(parent=self.formLayoutWidget_4)
-        self.label_27.setObjectName("label_27")
-        self.formLayout_8.setWidget(
-            0, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_27
-        )
-        self.label_28 = QtWidgets.QLabel(parent=self.formLayoutWidget_4)
-        self.label_28.setObjectName("label_28")
-        self.formLayout_8.setWidget(
-            1, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_28
-        )
-        self.elsa_date = QtWidgets.QLineEdit(parent=self.formLayoutWidget_4)
-        self.elsa_date.setObjectName("elsa_date")
-        self.formLayout_8.setWidget(
-            1, QtWidgets.QFormLayout.ItemRole.FieldRole, self.elsa_date
-        )
-        self.label_29 = QtWidgets.QLabel(parent=self.formLayoutWidget_4)
-        self.label_29.setObjectName("label_29")
-        self.formLayout_8.setWidget(
-            2, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_29
-        )
-        self.elsa_semester = QtWidgets.QLineEdit(parent=self.formLayoutWidget_4)
-        self.elsa_semester.setObjectName("elsa_semester")
-        self.formLayout_8.setWidget(
-            2, QtWidgets.QFormLayout.ItemRole.FieldRole, self.elsa_semester
-        )
-        self.elsa_prof = QtWidgets.QComboBox(parent=self.formLayoutWidget_4)
-        self.elsa_prof.setObjectName("elsa_prof")
-        self.formLayout_8.setWidget(
-            0, QtWidgets.QFormLayout.ItemRole.FieldRole, self.elsa_prof
-        )
         self.elsa_save = QtWidgets.QPushButton(parent=self.create_frame_elsa)
-        self.elsa_save.setGeometry(QtCore.QRect(10, 110, 75, 24))
+        self.elsa_save.setGeometry(QtCore.QRect(10, 160, 75, 24))
         self.elsa_save.setObjectName("elsa_save")
         self.dokument_list_elsa = QtWidgets.QTableWidget(parent=self.create_frame_elsa)
-        self.dokument_list_elsa.setGeometry(QtCore.QRect(450, 10, 321, 181))
+        self.dokument_list_elsa.setGeometry(QtCore.QRect(720, 10, 321, 181))
         font = QtGui.QFont()
         font.setPointSize(10)
         font.setBold(False)
@@ -1024,6 +1001,9 @@ class Ui_MainWindow(object):
         self.dokument_list_elsa.setFont(font)
         self.dokument_list_elsa.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus)
         self.dokument_list_elsa.setAcceptDrops(True)
+        self.dokument_list_elsa.setHorizontalScrollBarPolicy(
+            QtCore.Qt.ScrollBarPolicy.ScrollBarAlwaysOff
+        )
         self.dokument_list_elsa.setSizeAdjustPolicy(
             QtWidgets.QAbstractScrollArea.SizeAdjustPolicy.AdjustToContents
         )
@@ -1058,8 +1038,11 @@ class Ui_MainWindow(object):
         self.dokument_list_elsa.setHorizontalHeaderItem(2, item)
         item = QtWidgets.QTableWidgetItem()
         self.dokument_list_elsa.setHorizontalHeaderItem(3, item)
+        self.dokument_list_elsa.horizontalHeader().setDefaultSectionSize(107)
+        self.dokument_list_elsa.horizontalHeader().setMinimumSectionSize(41)
+        self.dokument_list_elsa.verticalHeader().setDefaultSectionSize(30)
         self.check_file_elsa = QtWidgets.QPushButton(parent=self.create_frame_elsa)
-        self.check_file_elsa.setGeometry(QtCore.QRect(810, 100, 131, 51))
+        self.check_file_elsa.setGeometry(QtCore.QRect(1080, 100, 131, 51))
         font = QtGui.QFont()
         font.setPointSize(9)
         font.setBold(False)
@@ -1068,7 +1051,7 @@ class Ui_MainWindow(object):
         self.btn_open_document_elsa = QtWidgets.QPushButton(
             parent=self.create_frame_elsa
         )
-        self.btn_open_document_elsa.setGeometry(QtCore.QRect(810, 60, 131, 25))
+        self.btn_open_document_elsa.setGeometry(QtCore.QRect(1080, 60, 131, 25))
         font = QtGui.QFont()
         font.setPointSize(9)
         font.setBold(False)
@@ -1077,14 +1060,72 @@ class Ui_MainWindow(object):
         self.btn_add_document_elsa = QtWidgets.QPushButton(
             parent=self.create_frame_elsa
         )
-        self.btn_add_document_elsa.setGeometry(QtCore.QRect(810, 20, 131, 25))
+        self.btn_add_document_elsa.setGeometry(QtCore.QRect(1080, 20, 131, 25))
         font = QtGui.QFont()
         font.setPointSize(9)
         font.setBold(False)
         self.btn_add_document_elsa.setFont(font)
         self.btn_add_document_elsa.setObjectName("btn_add_document_elsa")
+        self.gridLayoutWidget_6 = QtWidgets.QWidget(parent=self.create_frame_elsa)
+        self.gridLayoutWidget_6.setGeometry(QtCore.QRect(10, 10, 411, 121))
+        self.gridLayoutWidget_6.setObjectName("gridLayoutWidget_6")
+        self.gridLayout_7 = QtWidgets.QGridLayout(self.gridLayoutWidget_6)
+        self.gridLayout_7.setSizeConstraint(
+            QtWidgets.QLayout.SizeConstraint.SetFixedSize
+        )
+        self.gridLayout_7.setContentsMargins(0, 0, 0, 0)
+        self.gridLayout_7.setObjectName("gridLayout_7")
+        self.elsa_date_today = QtWidgets.QPushButton(parent=self.gridLayoutWidget_6)
+        self.elsa_date_today.setObjectName("elsa_date_today")
+        self.gridLayout_7.addWidget(self.elsa_date_today, 1, 2, 1, 1)
+        self.label_29 = QtWidgets.QLabel(parent=self.gridLayoutWidget_6)
+        self.label_29.setObjectName("label_29")
+        self.gridLayout_7.addWidget(self.label_29, 2, 0, 1, 1)
+        spacerItem10 = QtWidgets.QSpacerItem(
+            20,
+            40,
+            QtWidgets.QSizePolicy.Policy.Minimum,
+            QtWidgets.QSizePolicy.Policy.Expanding,
+        )
+        self.gridLayout_7.addItem(spacerItem10, 3, 0, 1, 1)
+        self.elsa_date = QtWidgets.QLineEdit(parent=self.gridLayoutWidget_6)
+        self.elsa_date.setClearButtonEnabled(True)
+        self.elsa_date.setObjectName("elsa_date")
+        self.gridLayout_7.addWidget(self.elsa_date, 1, 1, 1, 1)
+        self.active_semester = QtWidgets.QPushButton(parent=self.gridLayoutWidget_6)
+        self.active_semester.setEnabled(False)
+        self.active_semester.setText("")
+        icon1 = QtGui.QIcon()
+        icon1.addPixmap(
+            QtGui.QPixmap(
+                "c:\\Users\\aky547\\GitHub\\SemesterapparatsManager\\src\\ui\\../../icons/semap.png"
+            ),
+            QtGui.QIcon.Mode.Normal,
+            QtGui.QIcon.State.Off,
+        )
+        self.active_semester.setIcon(icon1)
+        self.active_semester.setIconSize(QtCore.QSize(20, 16))
+        self.active_semester.setFlat(True)
+        self.active_semester.setObjectName("active_semester")
+        self.gridLayout_7.addWidget(self.active_semester, 2, 2, 1, 1)
+        self.label_27 = QtWidgets.QLabel(parent=self.gridLayoutWidget_6)
+        self.label_27.setObjectName("label_27")
+        self.gridLayout_7.addWidget(self.label_27, 0, 0, 1, 1)
+        self.elsa_prof = QtWidgets.QComboBox(parent=self.gridLayoutWidget_6)
+        self.elsa_prof.setEditable(True)
+        self.elsa_prof.setObjectName("elsa_prof")
+        self.gridLayout_7.addWidget(self.elsa_prof, 0, 1, 1, 1)
+        self.label_28 = QtWidgets.QLabel(parent=self.gridLayoutWidget_6)
+        self.label_28.setObjectName("label_28")
+        self.gridLayout_7.addWidget(self.label_28, 1, 0, 1, 1)
+        self.elsa_semester = QtWidgets.QLineEdit(parent=self.gridLayoutWidget_6)
+        self.elsa_semester.setClearButtonEnabled(True)
+        self.elsa_semester.setObjectName("elsa_semester")
+        self.gridLayout_7.addWidget(self.elsa_semester, 2, 1, 1, 1)
         self.table_elsa_list = QtWidgets.QTableWidget(parent=self.tab_8)
-        self.table_elsa_list.setGeometry(QtCore.QRect(20, 410, 721, 271))
+        self.table_elsa_list.setGeometry(QtCore.QRect(20, 410, 771, 271))
+        self.table_elsa_list.setFrameShape(QtWidgets.QFrame.Shape.StyledPanel)
+        self.table_elsa_list.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
         self.table_elsa_list.setEditTriggers(
             QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers
         )
@@ -1101,16 +1142,33 @@ class Ui_MainWindow(object):
         self.table_elsa_list.setHorizontalHeaderItem(3, item)
         self.table_elsa_list.horizontalHeader().setStretchLastSection(True)
         self.elsa_statistic = QtWidgets.QFrame(parent=self.tab_8)
-        self.elsa_statistic.setGeometry(QtCore.QRect(780, 270, 461, 411))
+        self.elsa_statistic.setGeometry(QtCore.QRect(810, 410, 431, 271))
         self.elsa_statistic.setFrameShape(QtWidgets.QFrame.Shape.StyledPanel)
         self.elsa_statistic.setFrameShadow(QtWidgets.QFrame.Shadow.Raised)
         self.elsa_statistic.setObjectName("elsa_statistic")
         self.elsa_cancel_create = QtWidgets.QPushButton(parent=self.tab_8)
-        self.elsa_cancel_create.setGeometry(QtCore.QRect(140, 20, 91, 24))
+        self.elsa_cancel_create.setEnabled(False)
+        self.elsa_cancel_create.setGeometry(QtCore.QRect(30, 90, 91, 24))
         self.elsa_cancel_create.setObjectName("elsa_cancel_create")
         self.elsa_add_new = QtWidgets.QPushButton(parent=self.tab_8)
-        self.elsa_add_new.setGeometry(QtCore.QRect(30, 20, 91, 24))
+        self.elsa_add_new.setGeometry(QtCore.QRect(30, 50, 91, 24))
         self.elsa_add_new.setObjectName("elsa_add_new")
+        self.elsa_table = QtWidgets.QTableWidget(parent=self.tab_8)
+        self.elsa_table.setGeometry(QtCore.QRect(140, 10, 1031, 181))
+        self.elsa_table.setEditTriggers(
+            QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers
+        )
+        self.elsa_table.setObjectName("elsa_table")
+        self.elsa_table.setColumnCount(3)
+        self.elsa_table.setRowCount(0)
+        item = QtWidgets.QTableWidgetItem()
+        self.elsa_table.setHorizontalHeaderItem(0, item)
+        item = QtWidgets.QTableWidgetItem()
+        self.elsa_table.setHorizontalHeaderItem(1, item)
+        item = QtWidgets.QTableWidgetItem()
+        self.elsa_table.setHorizontalHeaderItem(2, item)
+        self.elsa_table.horizontalHeader().setCascadingSectionResizes(False)
+        self.elsa_table.horizontalHeader().setDefaultSectionSize(216)
         self.tabWidget.addTab(self.tab_8, "")
         self.tab_5 = QtWidgets.QWidget()
         self.tab_5.setObjectName("tab_5")
@@ -1150,13 +1208,13 @@ class Ui_MainWindow(object):
         self.label_23 = QtWidgets.QLabel(parent=self.gridLayoutWidget_4)
         self.label_23.setObjectName("label_23")
         self.gridLayout_5.addWidget(self.label_23, 1, 0, 1, 1)
-        spacerItem10 = QtWidgets.QSpacerItem(
+        spacerItem11 = QtWidgets.QSpacerItem(
             40,
             20,
             QtWidgets.QSizePolicy.Policy.Expanding,
             QtWidgets.QSizePolicy.Policy.Minimum,
         )
-        self.gridLayout_5.addItem(spacerItem10, 0, 4, 1, 1)
+        self.gridLayout_5.addItem(spacerItem11, 0, 4, 1, 1)
         self.user_frame_userrole = QtWidgets.QComboBox(parent=self.gridLayoutWidget_4)
         self.user_frame_userrole.setEditable(True)
         self.user_frame_userrole.setObjectName("user_frame_userrole")
@@ -1187,16 +1245,6 @@ class Ui_MainWindow(object):
         self.gridLayout_8.setObjectName("gridLayout_8")
         self.horizontalLayout_8 = QtWidgets.QHBoxLayout()
         self.horizontalLayout_8.setObjectName("horizontalLayout_8")
-        spacerItem11 = QtWidgets.QSpacerItem(
-            40,
-            20,
-            QtWidgets.QSizePolicy.Policy.Expanding,
-            QtWidgets.QSizePolicy.Policy.Minimum,
-        )
-        self.horizontalLayout_8.addItem(spacerItem11)
-        self.pushButton = QtWidgets.QPushButton(parent=self.gridLayoutWidget_7)
-        self.pushButton.setObjectName("pushButton")
-        self.horizontalLayout_8.addWidget(self.pushButton)
         spacerItem12 = QtWidgets.QSpacerItem(
             40,
             20,
@@ -1204,6 +1252,16 @@ class Ui_MainWindow(object):
             QtWidgets.QSizePolicy.Policy.Minimum,
         )
         self.horizontalLayout_8.addItem(spacerItem12)
+        self.pushButton = QtWidgets.QPushButton(parent=self.gridLayoutWidget_7)
+        self.pushButton.setObjectName("pushButton")
+        self.horizontalLayout_8.addWidget(self.pushButton)
+        spacerItem13 = QtWidgets.QSpacerItem(
+            40,
+            20,
+            QtWidgets.QSizePolicy.Policy.Expanding,
+            QtWidgets.QSizePolicy.Policy.Minimum,
+        )
+        self.horizontalLayout_8.addItem(spacerItem13)
         self.gridLayout_8.addLayout(self.horizontalLayout_8, 1, 1, 1, 1)
         self.label_34 = QtWidgets.QLabel(parent=self.gridLayoutWidget_7)
         self.label_34.setObjectName("label_34")
@@ -1223,13 +1281,13 @@ class Ui_MainWindow(object):
         )
         self.user_delete_confirm.setObjectName("user_delete_confirm")
         self.gridLayout_8.addWidget(self.user_delete_confirm, 1, 0, 1, 1)
-        spacerItem13 = QtWidgets.QSpacerItem(
+        spacerItem14 = QtWidgets.QSpacerItem(
             40,
             20,
             QtWidgets.QSizePolicy.Policy.Expanding,
             QtWidgets.QSizePolicy.Policy.Minimum,
         )
-        self.gridLayout_8.addItem(spacerItem13, 0, 2, 1, 1)
+        self.gridLayout_8.addItem(spacerItem14, 0, 2, 1, 1)
         self.user_delete_err_message = QtWidgets.QLabel(parent=self.gridLayoutWidget_7)
         self.user_delete_err_message.setText("")
         self.user_delete_err_message.setObjectName("user_delete_err_message")
@@ -1274,13 +1332,13 @@ class Ui_MainWindow(object):
         self.user_edit_frame_new_password.setMaximumSize(QtCore.QSize(150, 16777215))
         self.user_edit_frame_new_password.setObjectName("user_edit_frame_new_password")
         self.gridLayout_11.addWidget(self.user_edit_frame_new_password, 1, 1, 1, 1)
-        spacerItem14 = QtWidgets.QSpacerItem(
+        spacerItem15 = QtWidgets.QSpacerItem(
             40,
             20,
             QtWidgets.QSizePolicy.Policy.Expanding,
             QtWidgets.QSizePolicy.Policy.Minimum,
         )
-        self.gridLayout_11.addItem(spacerItem14, 0, 4, 1, 1)
+        self.gridLayout_11.addItem(spacerItem15, 0, 4, 1, 1)
         self.edit_faculty_member = QtWidgets.QFrame(parent=self.tab_5)
         self.edit_faculty_member.setGeometry(QtCore.QRect(10, 60, 1051, 241))
         self.edit_faculty_member.setFrameShape(QtWidgets.QFrame.Shape.StyledPanel)
@@ -1553,15 +1611,15 @@ class Ui_MainWindow(object):
         self.btn_copy_adis_command.setWhatsThis("")
         self.btn_copy_adis_command.setAccessibleDescription("")
         self.btn_copy_adis_command.setAutoFillBackground(False)
-        icon1 = QtGui.QIcon()
-        icon1.addPixmap(
+        icon2 = QtGui.QIcon()
+        icon2.addPixmap(
             QtGui.QPixmap(
                 "c:\\Users\\aky547\\GitHub\\SemesterapparatsManager\\src\\ui\\../../../../../../.designer/backup/icons/information.png"
             ),
             QtGui.QIcon.Mode.Normal,
             QtGui.QIcon.State.Off,
         )
-        self.btn_copy_adis_command.setIcon(icon1)
+        self.btn_copy_adis_command.setIcon(icon2)
         self.btn_copy_adis_command.setCheckable(False)
         self.btn_copy_adis_command.setChecked(False)
         self.btn_copy_adis_command.setAutoDefault(False)
@@ -1645,7 +1703,9 @@ class Ui_MainWindow(object):
         self.tabWidget.setCurrentIndex(0)
         self.tabWidget_2.setCurrentIndex(0)
         self.stackedWidget_4.setCurrentIndex(0)
-        self.tabWidget_3.setCurrentIndex(1)
+        self.tabWidget_3.setCurrentIndex(0)
+        self.elsa_semester.textChanged["QString"].connect(self.active_semester.hide)  # type: ignore
+        self.elsa_semester.textChanged["QString"].connect(self.active_semester.show)  # type: ignore
         QtCore.QMetaObject.connectSlotsByName(MainWindow)
         MainWindow.setTabOrder(self.drpdwn_app_nr, self.prof_title)
         MainWindow.setTabOrder(self.prof_title, self.drpdwn_prof_name)
@@ -1874,6 +1934,7 @@ class Ui_MainWindow(object):
         self.btn_notify_for_deletion.setText(
             _translate("MainWindow", "Ausgewählte Benachrichtigen")
         )
+        self.tableWidget.setSortingEnabled(True)
         item = self.tableWidget.horizontalHeaderItem(1)
         item.setText(_translate("MainWindow", "Apparatsname"))
         item = self.tableWidget.horizontalHeaderItem(2)
@@ -1892,9 +1953,6 @@ class Ui_MainWindow(object):
             self.tabWidget.indexOf(self.tab_2),
             _translate("MainWindow", "Suchen / Statistik"),
         )
-        self.label_27.setText(_translate("MainWindow", "Professor"))
-        self.label_28.setText(_translate("MainWindow", "Auftragsdatum"))
-        self.label_29.setText(_translate("MainWindow", "Semester"))
         self.elsa_save.setText(_translate("MainWindow", "Speichern"))
         item = self.dokument_list_elsa.horizontalHeaderItem(0)
         item.setText(_translate("MainWindow", "Dokumentname"))
@@ -1917,6 +1975,13 @@ class Ui_MainWindow(object):
         self.btn_add_document_elsa.setText(
             _translate("MainWindow", "Dokument hinzufügen")
         )
+        self.elsa_date_today.setText(_translate("MainWindow", "📆 heute"))
+        self.label_29.setText(_translate("MainWindow", "Semester"))
+        self.label_27.setText(_translate("MainWindow", "Professor"))
+        self.elsa_prof.setPlaceholderText(
+            _translate("MainWindow", "Vollständiger Name")
+        )
+        self.label_28.setText(_translate("MainWindow", "Auftragsdatum"))
         item = self.table_elsa_list.horizontalHeaderItem(0)
         item.setText(_translate("MainWindow", "Kapiteltitel"))
         item = self.table_elsa_list.horizontalHeaderItem(1)
@@ -1927,6 +1992,12 @@ class Ui_MainWindow(object):
         item.setText(_translate("MainWindow", "Seite"))
         self.elsa_cancel_create.setText(_translate("MainWindow", "Abbrechen"))
         self.elsa_add_new.setText(_translate("MainWindow", "Neuer Auftrag"))
+        item = self.elsa_table.horizontalHeaderItem(0)
+        item.setText(_translate("MainWindow", "Professor"))
+        item = self.elsa_table.horizontalHeaderItem(1)
+        item.setText(_translate("MainWindow", "Datum"))
+        item = self.elsa_table.horizontalHeaderItem(2)
+        item.setText(_translate("MainWindow", "Semester"))
         self.tabWidget.setTabText(
             self.tabWidget.indexOf(self.tab_8), _translate("MainWindow", "ELSA")
         )
diff --git a/src/ui/semesterapparat_ui.ui b/src/ui/semesterapparat_ui.ui
index 2540db2..4c6367a 100644
--- a/src/ui/semesterapparat_ui.ui
+++ b/src/ui/semesterapparat_ui.ui
@@ -138,6 +138,9 @@
                   </item>
                   <item>
                    <widget class="QPushButton" name="cancel_active_selection">
+                    <property name="enabled">
+                     <bool>false</bool>
+                    </property>
                     <property name="focusPolicy">
                      <enum>Qt::NoFocus</enum>
                     </property>
@@ -306,6 +309,9 @@
                  <property name="acceptDrops">
                   <bool>true</bool>
                  </property>
+                 <property name="horizontalScrollBarPolicy">
+                  <enum>Qt::ScrollBarAlwaysOff</enum>
+                 </property>
                  <property name="sizeAdjustPolicy">
                   <enum>QAbstractScrollArea::AdjustToContents</enum>
                  </property>
@@ -321,6 +327,9 @@
                  <property name="selectionMode">
                   <enum>QAbstractItemView::SingleSelection</enum>
                  </property>
+                 <attribute name="horizontalHeaderDefaultSectionSize">
+                  <number>107</number>
+                 </attribute>
                  <column>
                   <property name="text">
                    <string>Dokumentname</string>
@@ -1669,7 +1678,7 @@
                    </rect>
                   </property>
                   <property name="currentIndex">
-                   <number>1</number>
+                   <number>0</number>
                   </property>
                   <widget class="QWidget" name="tab_6">
                    <attribute name="title">
@@ -1721,7 +1730,7 @@
                         <bool>true</bool>
                        </attribute>
                        <attribute name="horizontalHeaderStretchLastSection">
-                        <bool>false</bool>
+                        <bool>true</bool>
                        </attribute>
                        <column>
                         <property name="text">
@@ -1830,6 +1839,9 @@
                     <property name="editTriggers">
                      <set>QAbstractItemView::NoEditTriggers</set>
                     </property>
+                    <property name="sortingEnabled">
+                     <bool>true</bool>
+                    </property>
                     <column>
                      <property name="text">
                       <string/>
@@ -1917,8 +1929,8 @@
              <property name="geometry">
               <rect>
                <x>20</x>
-               <y>60</y>
-               <width>1151</width>
+               <y>200</y>
+               <width>1221</width>
                <height>201</height>
               </rect>
              </property>
@@ -1928,53 +1940,11 @@
              <property name="frameShadow">
               <enum>QFrame::Raised</enum>
              </property>
-             <widget class="QWidget" name="formLayoutWidget_4">
-              <property name="geometry">
-               <rect>
-                <x>0</x>
-                <y>10</y>
-                <width>401</width>
-                <height>91</height>
-               </rect>
-              </property>
-              <layout class="QFormLayout" name="formLayout_8">
-               <item row="0" column="0">
-                <widget class="QLabel" name="label_27">
-                 <property name="text">
-                  <string>Professor</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="1" column="0">
-                <widget class="QLabel" name="label_28">
-                 <property name="text">
-                  <string>Auftragsdatum</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="1" column="1">
-                <widget class="QLineEdit" name="elsa_date"/>
-               </item>
-               <item row="2" column="0">
-                <widget class="QLabel" name="label_29">
-                 <property name="text">
-                  <string>Semester</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="2" column="1">
-                <widget class="QLineEdit" name="elsa_semester"/>
-               </item>
-               <item row="0" column="1">
-                <widget class="QComboBox" name="elsa_prof"/>
-               </item>
-              </layout>
-             </widget>
              <widget class="QPushButton" name="elsa_save">
               <property name="geometry">
                <rect>
                 <x>10</x>
-                <y>110</y>
+                <y>160</y>
                 <width>75</width>
                 <height>24</height>
                </rect>
@@ -1986,7 +1956,7 @@
              <widget class="QTableWidget" name="dokument_list_elsa">
               <property name="geometry">
                <rect>
-                <x>450</x>
+                <x>720</x>
                 <y>10</y>
                 <width>321</width>
                 <height>181</height>
@@ -2005,6 +1975,9 @@
               <property name="acceptDrops">
                <bool>true</bool>
               </property>
+              <property name="horizontalScrollBarPolicy">
+               <enum>Qt::ScrollBarAlwaysOff</enum>
+              </property>
               <property name="sizeAdjustPolicy">
                <enum>QAbstractScrollArea::AdjustToContents</enum>
               </property>
@@ -2020,6 +1993,15 @@
               <property name="selectionMode">
                <enum>QAbstractItemView::SingleSelection</enum>
               </property>
+              <attribute name="horizontalHeaderMinimumSectionSize">
+               <number>41</number>
+              </attribute>
+              <attribute name="horizontalHeaderDefaultSectionSize">
+               <number>107</number>
+              </attribute>
+              <attribute name="verticalHeaderDefaultSectionSize">
+               <number>30</number>
+              </attribute>
               <column>
                <property name="text">
                 <string>Dokumentname</string>
@@ -2062,7 +2044,7 @@
              <widget class="QPushButton" name="check_file_elsa">
               <property name="geometry">
                <rect>
-                <x>810</x>
+                <x>1080</x>
                 <y>100</y>
                 <width>131</width>
                 <height>51</height>
@@ -2085,7 +2067,7 @@
              <widget class="QPushButton" name="btn_open_document_elsa">
               <property name="geometry">
                <rect>
-                <x>810</x>
+                <x>1080</x>
                 <y>60</y>
                 <width>131</width>
                 <height>25</height>
@@ -2104,7 +2086,7 @@
              <widget class="QPushButton" name="btn_add_document_elsa">
               <property name="geometry">
                <rect>
-                <x>810</x>
+                <x>1080</x>
                 <y>20</y>
                 <width>131</width>
                 <height>25</height>
@@ -2120,16 +2102,125 @@
                <string>Dokument hinzufügen</string>
               </property>
              </widget>
+             <widget class="QWidget" name="gridLayoutWidget_6">
+              <property name="geometry">
+               <rect>
+                <x>10</x>
+                <y>10</y>
+                <width>411</width>
+                <height>121</height>
+               </rect>
+              </property>
+              <layout class="QGridLayout" name="gridLayout_7">
+               <property name="sizeConstraint">
+                <enum>QLayout::SetFixedSize</enum>
+               </property>
+               <item row="1" column="2">
+                <widget class="QPushButton" name="elsa_date_today">
+                 <property name="text">
+                  <string>📆 heute</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="2" column="0">
+                <widget class="QLabel" name="label_29">
+                 <property name="text">
+                  <string>Semester</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="3" column="0">
+                <spacer name="verticalSpacer_5">
+                 <property name="orientation">
+                  <enum>Qt::Vertical</enum>
+                 </property>
+                 <property name="sizeHint" stdset="0">
+                  <size>
+                   <width>20</width>
+                   <height>40</height>
+                  </size>
+                 </property>
+                </spacer>
+               </item>
+               <item row="1" column="1">
+                <widget class="QLineEdit" name="elsa_date">
+                 <property name="clearButtonEnabled">
+                  <bool>true</bool>
+                 </property>
+                </widget>
+               </item>
+               <item row="2" column="2">
+                <widget class="QPushButton" name="active_semester">
+                 <property name="enabled">
+                  <bool>false</bool>
+                 </property>
+                 <property name="text">
+                  <string/>
+                 </property>
+                 <property name="icon">
+                  <iconset>
+                   <normaloff>../../icons/semap.png</normaloff>../../icons/semap.png</iconset>
+                 </property>
+                 <property name="iconSize">
+                  <size>
+                   <width>20</width>
+                   <height>16</height>
+                  </size>
+                 </property>
+                 <property name="flat">
+                  <bool>true</bool>
+                 </property>
+                </widget>
+               </item>
+               <item row="0" column="0">
+                <widget class="QLabel" name="label_27">
+                 <property name="text">
+                  <string>Professor</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="0" column="1">
+                <widget class="QComboBox" name="elsa_prof">
+                 <property name="editable">
+                  <bool>true</bool>
+                 </property>
+                 <property name="placeholderText">
+                  <string>Vollständiger Name</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="1" column="0">
+                <widget class="QLabel" name="label_28">
+                 <property name="text">
+                  <string>Auftragsdatum</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="2" column="1">
+                <widget class="QLineEdit" name="elsa_semester">
+                 <property name="clearButtonEnabled">
+                  <bool>true</bool>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </widget>
             </widget>
             <widget class="QTableWidget" name="table_elsa_list">
              <property name="geometry">
               <rect>
                <x>20</x>
                <y>410</y>
-               <width>721</width>
+               <width>771</width>
                <height>271</height>
               </rect>
              </property>
+             <property name="frameShape">
+              <enum>QFrame::StyledPanel</enum>
+             </property>
+             <property name="frameShadow">
+              <enum>QFrame::Sunken</enum>
+             </property>
              <property name="editTriggers">
               <set>QAbstractItemView::NoEditTriggers</set>
              </property>
@@ -2160,10 +2251,10 @@
             <widget class="QFrame" name="elsa_statistic">
              <property name="geometry">
               <rect>
-               <x>780</x>
-               <y>270</y>
-               <width>461</width>
-               <height>411</height>
+               <x>810</x>
+               <y>410</y>
+               <width>431</width>
+               <height>271</height>
               </rect>
              </property>
              <property name="frameShape">
@@ -2174,10 +2265,13 @@
              </property>
             </widget>
             <widget class="QPushButton" name="elsa_cancel_create">
+             <property name="enabled">
+              <bool>false</bool>
+             </property>
              <property name="geometry">
               <rect>
-               <x>140</x>
-               <y>20</y>
+               <x>30</x>
+               <y>90</y>
                <width>91</width>
                <height>24</height>
               </rect>
@@ -2190,7 +2284,7 @@
              <property name="geometry">
               <rect>
                <x>30</x>
-               <y>20</y>
+               <y>50</y>
                <width>91</width>
                <height>24</height>
               </rect>
@@ -2199,6 +2293,40 @@
               <string>Neuer Auftrag</string>
              </property>
             </widget>
+            <widget class="QTableWidget" name="elsa_table">
+             <property name="geometry">
+              <rect>
+               <x>140</x>
+               <y>10</y>
+               <width>1031</width>
+               <height>181</height>
+              </rect>
+             </property>
+             <property name="editTriggers">
+              <set>QAbstractItemView::NoEditTriggers</set>
+             </property>
+             <attribute name="horizontalHeaderCascadingSectionResizes">
+              <bool>false</bool>
+             </attribute>
+             <attribute name="horizontalHeaderDefaultSectionSize">
+              <number>216</number>
+             </attribute>
+             <column>
+              <property name="text">
+               <string>Professor</string>
+              </property>
+             </column>
+             <column>
+              <property name="text">
+               <string>Datum</string>
+              </property>
+             </column>
+             <column>
+              <property name="text">
+               <string>Semester</string>
+              </property>
+             </column>
+            </widget>
            </widget>
            <widget class="QWidget" name="tab_5">
             <attribute name="title">
@@ -3228,5 +3356,38 @@
  <resources>
   <include location="../../resources.qrc"/>
  </resources>
- <connections/>
+ <connections>
+  <connection>
+   <sender>elsa_semester</sender>
+   <signal>textChanged(QString)</signal>
+   <receiver>active_semester</receiver>
+   <slot>hide()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>242</x>
+     <y>331</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>407</x>
+     <y>331</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>elsa_semester</sender>
+   <signal>textChanged(QString)</signal>
+   <receiver>active_semester</receiver>
+   <slot>show()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>242</x>
+     <y>331</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>407</x>
+     <y>331</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
 </ui>