diff --git a/src/ui/sources/Ui_dialog_extendLoanDuration.py b/src/ui/sources/Ui_dialog_extendLoanDuration.py
index d542ee7..e6572a7 100644
--- a/src/ui/sources/Ui_dialog_extendLoanDuration.py
+++ b/src/ui/sources/Ui_dialog_extendLoanDuration.py
@@ -12,6 +12,7 @@ from PyQt6 import QtCore, QtGui, QtWidgets
 class Ui_Dialog(object):
     def setupUi(self, Dialog):
         Dialog.setObjectName("Dialog")
+        Dialog.setWindowModality(QtCore.Qt.WindowModality.ApplicationModal)
         Dialog.resize(400, 300)
         self.gridLayout = QtWidgets.QGridLayout(Dialog)
         self.gridLayout.setObjectName("gridLayout")
diff --git a/src/ui/sources/Ui_main_UserInterface.py b/src/ui/sources/Ui_main_UserInterface.py
index 450504c..999aee7 100644
--- a/src/ui/sources/Ui_main_UserInterface.py
+++ b/src/ui/sources/Ui_main_UserInterface.py
@@ -175,4 +175,4 @@ class Ui_MainWindow(object):
         self.actionRueckgabemodus.setText(_translate("MainWindow", "Rückgabemodus"))
         self.actionRueckgabemodus.setShortcut(_translate("MainWindow", "F5"))
         self.actionNutzer.setText(_translate("MainWindow", "Nutzer"))
-        self.actionNutzer.setShortcut(_translate("MainWindow", "U"))
+        self.actionNutzer.setShortcut(_translate("MainWindow", "F6"))
diff --git a/src/ui/sources/Ui_main_userData.py b/src/ui/sources/Ui_main_userData.py
index 9f058f3..5b6d55d 100644
--- a/src/ui/sources/Ui_main_userData.py
+++ b/src/ui/sources/Ui_main_userData.py
@@ -12,7 +12,7 @@ from PyQt6 import QtCore, QtGui, QtWidgets
 class Ui_MainWindow(object):
     def setupUi(self, MainWindow):
         MainWindow.setObjectName("MainWindow")
-        MainWindow.setWindowModality(QtCore.Qt.WindowModality.ApplicationModal)
+        MainWindow.setWindowModality(QtCore.Qt.WindowModality.WindowModal)
         MainWindow.resize(800, 600)
         self.centralwidget = QtWidgets.QWidget(parent=MainWindow)
         self.centralwidget.setObjectName("centralwidget")
@@ -71,6 +71,7 @@ class Ui_MainWindow(object):
         self.horizontalLayout_2 = QtWidgets.QHBoxLayout()
         self.horizontalLayout_2.setObjectName("horizontalLayout_2")
         self.radio_allLoanedMedia = QtWidgets.QRadioButton(parent=self.centralwidget)
+        self.radio_allLoanedMedia.setChecked(True)
         self.radio_allLoanedMedia.setObjectName("radio_allLoanedMedia")
         self.horizontalLayout_2.addWidget(self.radio_allLoanedMedia)
         self.radio_currentlyLoaned = QtWidgets.QRadioButton(parent=self.centralwidget)
@@ -120,6 +121,7 @@ class Ui_MainWindow(object):
         self.UserMediaTable.setHorizontalHeaderItem(5, item)
         self.UserMediaTable.horizontalHeader().setDefaultSectionSize(156)
         self.UserMediaTable.horizontalHeader().setMinimumSectionSize(43)
+        self.UserMediaTable.horizontalHeader().setSortIndicatorShown(True)
         self.UserMediaTable.verticalHeader().setDefaultSectionSize(31)
         self.UserMediaTable.verticalHeader().setMinimumSectionSize(25)
         self.verticalLayout.addWidget(self.UserMediaTable)
@@ -150,13 +152,16 @@ class Ui_MainWindow(object):
         self.radio_overdueLoans.setText(_translate("MainWindow", "Überzogen"))
         self.btn_searchTableContent.setText(_translate("MainWindow", "Suchen"))
         self.btn_extendSelectedMedia.setText(_translate("MainWindow", "Ausgewählte Verlängern"))
-        item = self.UserMediaTable.horizontalHeaderItem(1)
+        self.UserMediaTable.setSortingEnabled(True)
+        item = self.UserMediaTable.horizontalHeaderItem(0)
         item.setText(_translate("MainWindow", "ISBN"))
-        item = self.UserMediaTable.horizontalHeaderItem(2)
+        item = self.UserMediaTable.horizontalHeaderItem(1)
         item.setText(_translate("MainWindow", "Signatur"))
-        item = self.UserMediaTable.horizontalHeaderItem(3)
+        item = self.UserMediaTable.horizontalHeaderItem(2)
         item.setText(_translate("MainWindow", "Titel"))
-        item = self.UserMediaTable.horizontalHeaderItem(4)
+        item = self.UserMediaTable.horizontalHeaderItem(3)
         item.setText(_translate("MainWindow", "entliehen am"))
-        item = self.UserMediaTable.horizontalHeaderItem(5)
+        item = self.UserMediaTable.horizontalHeaderItem(4)
         item.setText(_translate("MainWindow", "entliehen bis"))
+        item = self.UserMediaTable.horizontalHeaderItem(5)
+        item.setText(_translate("MainWindow", "Rückgabe am"))
diff --git a/src/ui/sources/dialog_extendLoanDuration.ui b/src/ui/sources/dialog_extendLoanDuration.ui
index c4c4c1c..ce3374e 100644
--- a/src/ui/sources/dialog_extendLoanDuration.ui
+++ b/src/ui/sources/dialog_extendLoanDuration.ui
@@ -2,6 +2,9 @@
 <ui version="4.0">
  <class>Dialog</class>
  <widget class="QDialog" name="Dialog">
+  <property name="windowModality">
+   <enum>Qt::ApplicationModal</enum>
+  </property>
   <property name="geometry">
    <rect>
     <x>0</x>
diff --git a/src/ui/sources/main_UserInterface.ui b/src/ui/sources/main_UserInterface.ui
index a905129..ec53b9a 100644
--- a/src/ui/sources/main_UserInterface.ui
+++ b/src/ui/sources/main_UserInterface.ui
@@ -238,7 +238,7 @@
     <string>Nutzer</string>
    </property>
    <property name="shortcut">
-    <string>U</string>
+    <string>F6</string>
    </property>
   </action>
  </widget>
diff --git a/src/ui/sources/main_userData.ui b/src/ui/sources/main_userData.ui
index 13e0cb6..97d572c 100644
--- a/src/ui/sources/main_userData.ui
+++ b/src/ui/sources/main_userData.ui
@@ -3,7 +3,7 @@
  <class>MainWindow</class>
  <widget class="QMainWindow" name="MainWindow">
   <property name="windowModality">
-   <enum>Qt::ApplicationModal</enum>
+   <enum>Qt::WindowModal</enum>
   </property>
   <property name="geometry">
    <rect>
@@ -133,6 +133,9 @@
         <property name="text">
          <string>Alle Ausleihen</string>
         </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
        </widget>
       </item>
       <item>
@@ -218,23 +221,24 @@
       <property name="selectionBehavior">
        <enum>QAbstractItemView::SelectRows</enum>
       </property>
+      <property name="sortingEnabled">
+       <bool>true</bool>
+      </property>
       <attribute name="horizontalHeaderMinimumSectionSize">
        <number>43</number>
       </attribute>
       <attribute name="horizontalHeaderDefaultSectionSize">
        <number>156</number>
       </attribute>
+      <attribute name="horizontalHeaderShowSortIndicator" stdset="0">
+       <bool>true</bool>
+      </attribute>
       <attribute name="verticalHeaderMinimumSectionSize">
        <number>25</number>
       </attribute>
       <attribute name="verticalHeaderDefaultSectionSize">
        <number>31</number>
       </attribute>
-      <column>
-       <property name="text">
-        <string/>
-       </property>
-      </column>
       <column>
        <property name="text">
         <string>ISBN</string>
@@ -260,6 +264,11 @@
         <string>entliehen bis</string>
        </property>
       </column>
+      <column>
+       <property name="text">
+        <string>Rückgabe am</string>
+       </property>
+      </column>
      </widget>
     </item>
    </layout>