diff --git a/src/ui/sources/Ui_dialog_generateReport.py b/src/ui/sources/Ui_dialog_generateReport.py
index 258020d..76022fe 100644
--- a/src/ui/sources/Ui_dialog_generateReport.py
+++ b/src/ui/sources/Ui_dialog_generateReport.py
@@ -12,7 +12,7 @@ from PyQt6 import QtCore, QtGui, QtWidgets
 class Ui_Dialog(object):
     def setupUi(self, Dialog):
         Dialog.setObjectName("Dialog")
-        Dialog.resize(375, 206)
+        Dialog.resize(375, 247)
         Dialog.setMinimumSize(QtCore.QSize(40, 0))
         self.verticalLayout = QtWidgets.QVBoxLayout(Dialog)
         self.verticalLayout.setObjectName("verticalLayout")
@@ -36,20 +36,6 @@ class Ui_Dialog(object):
         self.radio_year.setObjectName("radio_year")
         self.horizontalLayout.addWidget(self.radio_year)
         self.gridLayout.addLayout(self.horizontalLayout, 1, 1, 1, 1)
-        self.reportlink = QtWidgets.QLabel(parent=Dialog)
-        self.reportlink.setText("")
-        self.reportlink.setObjectName("reportlink")
-        self.gridLayout.addWidget(self.reportlink, 2, 1, 1, 1)
-        self.dayslider = QtWidgets.QSlider(parent=Dialog)
-        self.dayslider.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus)
-        self.dayslider.setMinimum(1)
-        self.dayslider.setMaximum(365)
-        self.dayslider.setOrientation(QtCore.Qt.Orientation.Horizontal)
-        self.dayslider.setInvertedControls(True)
-        self.dayslider.setTickPosition(QtWidgets.QSlider.TickPosition.TicksAbove)
-        self.dayslider.setTickInterval(10)
-        self.dayslider.setObjectName("dayslider")
-        self.gridLayout.addWidget(self.dayslider, 0, 1, 1, 1)
         self.dayValue = QtWidgets.QLineEdit(parent=Dialog)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Fixed, QtWidgets.QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
@@ -66,7 +52,38 @@ class Ui_Dialog(object):
         self.radioButton.setText("")
         self.radioButton.setCheckable(True)
         self.radioButton.setObjectName("radioButton")
-        self.gridLayout.addWidget(self.radioButton, 2, 2, 1, 1)
+        self.gridLayout.addWidget(self.radioButton, 3, 2, 1, 1)
+        self.reportlink = QtWidgets.QLabel(parent=Dialog)
+        self.reportlink.setText("")
+        self.reportlink.setObjectName("reportlink")
+        self.gridLayout.addWidget(self.reportlink, 3, 1, 1, 1)
+        self.dayslider = QtWidgets.QSlider(parent=Dialog)
+        self.dayslider.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus)
+        self.dayslider.setMinimum(1)
+        self.dayslider.setMaximum(365)
+        self.dayslider.setOrientation(QtCore.Qt.Orientation.Horizontal)
+        self.dayslider.setInvertedControls(True)
+        self.dayslider.setTickPosition(QtWidgets.QSlider.TickPosition.TicksAbove)
+        self.dayslider.setTickInterval(10)
+        self.dayslider.setObjectName("dayslider")
+        self.gridLayout.addWidget(self.dayslider, 0, 1, 1, 1)
+        self.frame = QtWidgets.QFrame(parent=Dialog)
+        self.frame.setFrameShape(QtWidgets.QFrame.Shape.NoFrame)
+        self.frame.setFrameShadow(QtWidgets.QFrame.Shadow.Plain)
+        self.frame.setLineWidth(0)
+        self.frame.setObjectName("frame")
+        self.gridLayout_2 = QtWidgets.QGridLayout(self.frame)
+        self.gridLayout_2.setObjectName("gridLayout_2")
+        self.format_txt = QtWidgets.QRadioButton(parent=self.frame)
+        self.format_txt.setObjectName("format_txt")
+        self.gridLayout_2.addWidget(self.format_txt, 0, 0, 1, 1)
+        self.format_csv = QtWidgets.QRadioButton(parent=self.frame)
+        self.format_csv.setObjectName("format_csv")
+        self.gridLayout_2.addWidget(self.format_csv, 0, 1, 1, 1)
+        self.gridLayout.addWidget(self.frame, 2, 1, 1, 1)
+        self.label_3 = QtWidgets.QLabel(parent=Dialog)
+        self.label_3.setObjectName("label_3")
+        self.gridLayout.addWidget(self.label_3, 2, 0, 1, 1)
         self.verticalLayout.addLayout(self.gridLayout)
         self.label_4 = QtWidgets.QLabel(parent=Dialog)
         self.label_4.setObjectName("label_4")
@@ -95,5 +112,8 @@ class Ui_Dialog(object):
         self.radio_week.setText(_translate("Dialog", "Woche"))
         self.radio_month.setText(_translate("Dialog", "Monat"))
         self.radio_year.setText(_translate("Dialog", "Jahr"))
+        self.format_txt.setText(_translate("Dialog", "Text"))
+        self.format_csv.setText(_translate("Dialog", "Excel"))
+        self.label_3.setText(_translate("Dialog", "Dateiformat"))
         self.label_4.setText(_translate("Dialog", "Fortschritt:"))
         self.generateReport.setText(_translate("Dialog", " Bericht erstellen"))
diff --git a/src/ui/sources/Ui_dialog_settings.py b/src/ui/sources/Ui_dialog_settings.py
index aae6c32..1224deb 100644
--- a/src/ui/sources/Ui_dialog_settings.py
+++ b/src/ui/sources/Ui_dialog_settings.py
@@ -12,7 +12,7 @@ from PyQt6 import QtCore, QtGui, QtWidgets
 class Ui_Dialog(object):
     def setupUi(self, Dialog):
         Dialog.setObjectName("Dialog")
-        Dialog.resize(436, 184)
+        Dialog.resize(422, 184)
         self.formLayout = QtWidgets.QFormLayout(Dialog)
         self.formLayout.setObjectName("formLayout")
         self.label = QtWidgets.QLabel(parent=Dialog)
diff --git a/src/ui/sources/Ui_main_Loans.py b/src/ui/sources/Ui_main_Loans.py
index 5161cfe..6c1edd2 100644
--- a/src/ui/sources/Ui_main_Loans.py
+++ b/src/ui/sources/Ui_main_Loans.py
@@ -80,7 +80,7 @@ class Ui_MainWindow(object):
         MainWindow.setWindowTitle(_translate("MainWindow", "MainWindow"))
         self.radio_all.setText(_translate("MainWindow", "Alle Ausleihen"))
         self.radio_current.setText(_translate("MainWindow", "Aktuell Entliehene Medien"))
-        self.radio_overdue.setText(_translate("MainWindow", "Überzgene Medien"))
+        self.radio_overdue.setText(_translate("MainWindow", "Überzogene Medien"))
         self.searchFields.setItemText(0, _translate("MainWindow", "Titel"))
         self.searchFields.setItemText(1, _translate("MainWindow", "Signatur"))
         self.searchFields.setItemText(2, _translate("MainWindow", "Nutzer"))
diff --git a/src/ui/sources/Ui_main_UserInterface.py b/src/ui/sources/Ui_main_UserInterface.py
index b1374ba..c929a66 100644
--- a/src/ui/sources/Ui_main_UserInterface.py
+++ b/src/ui/sources/Ui_main_UserInterface.py
@@ -47,9 +47,6 @@ class Ui_MainWindow(object):
         self.input_username = QtWidgets.QLineEdit(parent=self.centralwidget)
         self.input_username.setObjectName("input_username")
         self.gridLayout.addWidget(self.input_username, 2, 1, 1, 1)
-        self.duedate = QtWidgets.QDateEdit(parent=self.centralwidget)
-        self.duedate.setObjectName("duedate")
-        self.gridLayout.addWidget(self.duedate, 5, 1, 1, 1)
         self.input_file_ident = QtWidgets.QLineEdit(parent=self.centralwidget)
         self.input_file_ident.setObjectName("input_file_ident")
         self.gridLayout.addWidget(self.input_file_ident, 3, 1, 1, 1)
@@ -67,6 +64,22 @@ class Ui_MainWindow(object):
         self.btn_createNewUser.setObjectName("btn_createNewUser")
         self.horizontalLayout_3.addWidget(self.btn_createNewUser)
         self.gridLayout.addLayout(self.horizontalLayout_3, 0, 1, 1, 1)
+        self.horizontalLayout_4 = QtWidgets.QHBoxLayout()
+        self.horizontalLayout_4.setObjectName("horizontalLayout_4")
+        self.duedate = QtWidgets.QDateEdit(parent=self.centralwidget)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.duedate.sizePolicy().hasHeightForWidth())
+        self.duedate.setSizePolicy(sizePolicy)
+        self.duedate.setMinimumSize(QtCore.QSize(130, 0))
+        self.duedate.setMaximumSize(QtCore.QSize(100, 16777215))
+        self.duedate.setBaseSize(QtCore.QSize(70, 0))
+        self.duedate.setObjectName("duedate")
+        self.horizontalLayout_4.addWidget(self.duedate)
+        spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+        self.horizontalLayout_4.addItem(spacerItem1)
+        self.gridLayout.addLayout(self.horizontalLayout_4, 5, 1, 1, 1)
         self.verticalLayout.addLayout(self.gridLayout)
         self.groupBox = QtWidgets.QGroupBox(parent=self.centralwidget)
         self.groupBox.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus)
@@ -165,7 +178,6 @@ class Ui_MainWindow(object):
         MainWindow.setTabOrder(self.btn_createNewUser, self.input_userno)
         MainWindow.setTabOrder(self.input_userno, self.input_username)
         MainWindow.setTabOrder(self.input_username, self.input_file_ident)
-        MainWindow.setTabOrder(self.input_file_ident, self.duedate)
 
     def retranslateUi(self, MainWindow):
         _translate = QtCore.QCoreApplication.translate
diff --git a/src/ui/sources/Ui_main_userData.py b/src/ui/sources/Ui_main_userData.py
index d517853..e09d822 100644
--- a/src/ui/sources/Ui_main_userData.py
+++ b/src/ui/sources/Ui_main_userData.py
@@ -36,6 +36,8 @@ class Ui_MainWindow(object):
         self.label.setObjectName("label")
         self.gridLayout.addWidget(self.label, 0, 0, 1, 1)
         self.user_no = QtWidgets.QLineEdit(parent=self.centralwidget)
+        self.user_no.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus)
+        self.user_no.setReadOnly(True)
         self.user_no.setObjectName("user_no")
         self.gridLayout.addWidget(self.user_no, 1, 1, 1, 1)
         self.frame = QtWidgets.QFrame(parent=self.centralwidget)
@@ -103,6 +105,7 @@ class Ui_MainWindow(object):
         self.verticalLayout.addLayout(self.horizontalLayout_3)
         self.UserMediaTable = QtWidgets.QTableWidget(parent=self.centralwidget)
         self.UserMediaTable.setMouseTracking(True)
+        self.UserMediaTable.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus)
         self.UserMediaTable.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarPolicy.ScrollBarAlwaysOff)
         self.UserMediaTable.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers)
         self.UserMediaTable.setAlternatingRowColors(True)
@@ -140,6 +143,17 @@ class Ui_MainWindow(object):
 
         self.retranslateUi(MainWindow)
         QtCore.QMetaObject.connectSlotsByName(MainWindow)
+        MainWindow.setTabOrder(self.name, self.mail)
+        MainWindow.setTabOrder(self.mail, self.btn_userChange_save)
+        MainWindow.setTabOrder(self.btn_userChange_save, self.btn_userchange_cancel)
+        MainWindow.setTabOrder(self.btn_userchange_cancel, self.radio_allLoanedMedia)
+        MainWindow.setTabOrder(self.radio_allLoanedMedia, self.radio_currentlyLoaned)
+        MainWindow.setTabOrder(self.radio_currentlyLoaned, self.radio_overdueLoans)
+        MainWindow.setTabOrder(self.radio_overdueLoans, self.searchbox)
+        MainWindow.setTabOrder(self.searchbox, self.searchfilter)
+        MainWindow.setTabOrder(self.searchfilter, self.btn_extendSelectedMedia)
+        MainWindow.setTabOrder(self.btn_extendSelectedMedia, self.UserMediaTable)
+        MainWindow.setTabOrder(self.UserMediaTable, self.user_no)
 
     def retranslateUi(self, MainWindow):
         _translate = QtCore.QCoreApplication.translate
diff --git a/src/ui/sources/dialog_generateReport.ui b/src/ui/sources/dialog_generateReport.ui
index 1aa90e1..1700beb 100644
--- a/src/ui/sources/dialog_generateReport.ui
+++ b/src/ui/sources/dialog_generateReport.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>375</width>
-    <height>206</height>
+    <height>247</height>
    </rect>
   </property>
   <property name="minimumSize">
@@ -61,7 +61,45 @@
        </item>
       </layout>
      </item>
-     <item row="2" column="1">
+     <item row="0" column="2">
+      <widget class="QLineEdit" name="dayValue">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>40</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="focusPolicy">
+        <enum>Qt::NoFocus</enum>
+       </property>
+       <property name="readOnly">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="2">
+      <widget class="QRadioButton" name="radioButton">
+       <property name="text">
+        <string/>
+       </property>
+       <property name="checkable">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1">
       <widget class="QLabel" name="reportlink">
        <property name="text">
         <string/>
@@ -93,41 +131,39 @@
        </property>
       </widget>
      </item>
-     <item row="0" column="2">
-      <widget class="QLineEdit" name="dayValue">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
+     <item row="2" column="1">
+      <widget class="QFrame" name="frame">
+       <property name="frameShape">
+        <enum>QFrame::NoFrame</enum>
        </property>
-       <property name="minimumSize">
-        <size>
-         <width>0</width>
-         <height>0</height>
-        </size>
+       <property name="frameShadow">
+        <enum>QFrame::Plain</enum>
        </property>
-       <property name="maximumSize">
-        <size>
-         <width>40</width>
-         <height>16777215</height>
-        </size>
-       </property>
-       <property name="focusPolicy">
-        <enum>Qt::NoFocus</enum>
-       </property>
-       <property name="readOnly">
-        <bool>true</bool>
+       <property name="lineWidth">
+        <number>0</number>
        </property>
+       <layout class="QGridLayout" name="gridLayout_2">
+        <item row="0" column="0">
+         <widget class="QRadioButton" name="format_txt">
+          <property name="text">
+           <string>Text</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1">
+         <widget class="QRadioButton" name="format_csv">
+          <property name="text">
+           <string>Excel</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
       </widget>
      </item>
-     <item row="2" column="2">
-      <widget class="QRadioButton" name="radioButton">
+     <item row="2" column="0">
+      <widget class="QLabel" name="label_3">
        <property name="text">
-        <string/>
-       </property>
-       <property name="checkable">
-        <bool>true</bool>
+        <string>Dateiformat</string>
        </property>
       </widget>
      </item>
diff --git a/src/ui/sources/dialog_settings.ui b/src/ui/sources/dialog_settings.ui
index 7f1806a..201e573 100644
--- a/src/ui/sources/dialog_settings.ui
+++ b/src/ui/sources/dialog_settings.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>436</width>
+    <width>422</width>
     <height>184</height>
    </rect>
   </property>
@@ -127,12 +127,12 @@
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>248</x>
-     <y>254</y>
+     <x>379</x>
+     <y>174</y>
     </hint>
     <hint type="destinationlabel">
      <x>157</x>
-     <y>274</y>
+     <y>183</y>
     </hint>
    </hints>
   </connection>
@@ -143,12 +143,12 @@
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>316</x>
-     <y>260</y>
+     <x>426</x>
+     <y>174</y>
     </hint>
     <hint type="destinationlabel">
      <x>286</x>
-     <y>274</y>
+     <y>183</y>
     </hint>
    </hints>
   </connection>
diff --git a/src/ui/sources/main_Loans.ui b/src/ui/sources/main_Loans.ui
index cc4ec7e..f7d5a23 100644
--- a/src/ui/sources/main_Loans.ui
+++ b/src/ui/sources/main_Loans.ui
@@ -37,7 +37,7 @@
       <item>
        <widget class="QRadioButton" name="radio_overdue">
         <property name="text">
-         <string>Überzgene Medien</string>
+         <string>Überzogene Medien</string>
         </property>
        </widget>
       </item>
diff --git a/src/ui/sources/main_UserInterface.ui b/src/ui/sources/main_UserInterface.ui
index c8a85ca..32334b0 100644
--- a/src/ui/sources/main_UserInterface.ui
+++ b/src/ui/sources/main_UserInterface.ui
@@ -74,9 +74,6 @@
       <item row="2" column="1">
        <widget class="QLineEdit" name="input_username"/>
       </item>
-      <item row="5" column="1">
-       <widget class="QDateEdit" name="duedate"/>
-      </item>
       <item row="3" column="1">
        <widget class="QLineEdit" name="input_file_ident"/>
       </item>
@@ -114,6 +111,51 @@
         </item>
        </layout>
       </item>
+      <item row="5" column="1">
+       <layout class="QHBoxLayout" name="horizontalLayout_4">
+        <item>
+         <widget class="QDateEdit" name="duedate">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>130</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>100</width>
+            <height>16777215</height>
+           </size>
+          </property>
+          <property name="baseSize">
+           <size>
+            <width>70</width>
+            <height>0</height>
+           </size>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="horizontalSpacer_2">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
      </layout>
     </item>
     <item>
@@ -300,7 +342,6 @@
   <tabstop>input_userno</tabstop>
   <tabstop>input_username</tabstop>
   <tabstop>input_file_ident</tabstop>
-  <tabstop>duedate</tabstop>
  </tabstops>
  <resources/>
  <connections>
diff --git a/src/ui/sources/main_userData.ui b/src/ui/sources/main_userData.ui
index 1ce0cdb..fd6ef9f 100644
--- a/src/ui/sources/main_userData.ui
+++ b/src/ui/sources/main_userData.ui
@@ -48,7 +48,14 @@
        </widget>
       </item>
       <item row="1" column="1">
-       <widget class="QLineEdit" name="user_no"/>
+       <widget class="QLineEdit" name="user_no">
+        <property name="focusPolicy">
+         <enum>Qt::NoFocus</enum>
+        </property>
+        <property name="readOnly">
+         <bool>true</bool>
+        </property>
+       </widget>
       </item>
       <item row="3" column="1">
        <widget class="QFrame" name="frame">
@@ -219,6 +226,9 @@
       <property name="mouseTracking">
        <bool>true</bool>
       </property>
+      <property name="focusPolicy">
+       <enum>Qt::NoFocus</enum>
+      </property>
       <property name="horizontalScrollBarPolicy">
        <enum>Qt::ScrollBarAlwaysOff</enum>
       </property>
@@ -299,6 +309,20 @@
    </property>
   </widget>
  </widget>
+ <tabstops>
+  <tabstop>name</tabstop>
+  <tabstop>mail</tabstop>
+  <tabstop>btn_userChange_save</tabstop>
+  <tabstop>btn_userchange_cancel</tabstop>
+  <tabstop>radio_allLoanedMedia</tabstop>
+  <tabstop>radio_currentlyLoaned</tabstop>
+  <tabstop>radio_overdueLoans</tabstop>
+  <tabstop>searchbox</tabstop>
+  <tabstop>searchfilter</tabstop>
+  <tabstop>btn_extendSelectedMedia</tabstop>
+  <tabstop>UserMediaTable</tabstop>
+  <tabstop>user_no</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>