diff --git a/.gitignore b/.gitignore
index 96a3de3..a036b73 100644
--- a/.gitignore
+++ b/.gitignore
@@ -208,7 +208,7 @@ dmypy.json
 # pytype static type analyzer
 .pytype/
 .qtcreator/
-pyqcrm.pyproject.user
+*.pyproject.user
 
 # Cython debug symbols
 cython_debug/
@@ -220,3 +220,8 @@ cython_debug/
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 #.idea/
 
+.*.bkp
+
+.directory
+
+
diff --git a/gui/Programmeinstellungen.qml b/gui/Programmeinstellungen.qml
index 27f0b9b..6532046 100644
--- a/gui/Programmeinstellungen.qml
+++ b/gui/Programmeinstellungen.qml
@@ -32,7 +32,7 @@ ApplicationWindow
         TabBar
         {
             id: bar
-            anchors.fill: parent
+            Layout.fillWidth: true
             TabButton
             {
                 text: qsTr("Benutzer erstellen")
@@ -46,40 +46,60 @@ ApplicationWindow
 
         StackLayout
         {
-            anchors.fill: parent
+            Layout.fillWidth: true
+            Layout.fillHeight: true
             currentIndex: bar.currentIndex
 
             Item
             {
                 id: createUser
-
-                GridLayout
+                Layout.fillWidth: parent.width
+                Rectangle
                 {
-                    id: createUserGrid
-                    columns: 2
                     anchors.fill: parent
+                    anchors.rightMargin: 9
+                    anchors.leftMargin: 9
+                    anchors.topMargin: 9
+                    anchors.bottomMargin: 9
 
-                    Label
+                    GridLayout
                     {
-                        text: qsTr("Benutzername:")
-                    }
+                        id: createUserGrid
+                        columns: 2
+                        anchors.fill: parent
 
-                    TextField
-                    {
-                        id: benutzerName
-                        placeholderText: qsTr("Hier Benutzername eingeben")
-                    }
+                        Label
+                        {
+                            text: qsTr("Benutzername:")
+                            Layout.alignment: Qt.AlignRight
+                        }
 
-                    Label
-                    {
-                        text: qsTr("Passwort:")
-                    }
+                        TextField
+                        {
+                            id: benutzerName
+                            placeholderText: qsTr("Hier Benutzername eingeben")
+                            Layout.fillWidth: true
+                            height: 3
+                        }
 
-                    TextField
-                    {
-                        id: password
-                        echoMode: TextInput.Password
-                        placeholderText: qsTr("Hier Passwort eingeben")
+                        Label
+                        {
+                            text: qsTr("Passwort:")
+                            Layout.alignment: Qt.AlignRight
+                        }
+
+                        TextField
+                        {
+                            id: password
+                            echoMode: TextInput.Password
+                            placeholderText: qsTr("Hier Passwort eingeben")
+                            Layout.fillWidth: true
+                        }
+
+                        Item
+                        {
+                            Layout.fillHeight: true
+                        }
                     }
                 }
             }
@@ -87,75 +107,100 @@ ApplicationWindow
             Item
             {
                 id: settingsDB
-
-
-                GridLayout
+                Layout.fillWidth: parent.width
+                Rectangle
                 {
-                    id: dbGrid
-                    columns: 2
-
-
-
-                    Label
+                    anchors.rightMargin: 9
+                    anchors.leftMargin: 9
+                    anchors.topMargin: 9
+                    anchors.bottomMargin: 9
+                    anchors.fill: parent
+                    GridLayout
                     {
-                        text: qsTr("DB-Host:")
-                    }
+                        id: dbGrid
+                        columns: 2
+                        anchors.fill: parent
+                        Label
+                        {
+                            text: qsTr("DB-Host:")
+                            Layout.alignment: Qt.AlignRight
+                        }
 
-                    TextField
-                    {
-                        id: dbHost
-                        placeholderText: qsTr("Hier Host eingeben")
-                    }
+                        TextField
+                        {
+                            id: dbHost
+                            placeholderText: qsTr("Hier Host eingeben")
+                            Layout.fillWidth: true
+                        }
 
-                    Label
-                    {
-                        text: qsTr("DB-Port:")
-                    }
+                        Label
+                        {
+                            text: qsTr("DB-Port:")
+                            Layout.alignment: Qt.AlignRight
+                        }
 
-                    TextField
-                    {
-                        id: dbPort
-                        placeholderText: qsTr("Hier DB-Port eingeben")
-                    }
+                        TextField
+                        {
+                            id: dbPort
+                            placeholderText: qsTr("Hier DB-Port eingeben")
+                            Layout.fillWidth: true
+                        }
 
-                    Label
-                    {
-                        text: qsTr("DB-Name:")
-                    }
+                        Label
+                        {
+                            text: qsTr("DB-Name:")
+                            Layout.alignment: Qt.AlignRight
+                        }
 
-                    TextField
-                    {
-                        id: dbName
-                        placeholderText: qsTr("Hier DB-Name eingeben")
-                    }
+                        TextField
+                        {
+                            id: dbName
+                            placeholderText: qsTr("Hier DB-Name eingeben")
+                            Layout.fillWidth: true
+                        }
 
-                    Label
-                    {
-                        text: qsTr("DB-Benutzername:")
-                    }
+                        Label
+                        {
+                            text: qsTr("DB-Benutzername:")
+                            Layout.alignment: Qt.AlignRight
+                        }
 
-                    TextField
-                    {
-                        id: dbUserName
-                        placeholderText: qsTr("Hier DB-Benutzername eingeben")
-                    }
+                        TextField
+                        {
+                            id: dbUserName
+                            placeholderText: qsTr("Hier DB-Benutzername eingeben")
+                            Layout.fillWidth: true
+                        }
 
-                    Label
-                    {
-                        text: qsTr("DB-Passwort:")
-                    }
+                        Label
+                        {
+                            text: qsTr("DB-Passwort:")
+                            Layout.alignment: Qt.AlignRight
+                        }
 
-                    TextField
-                    {
-                        id: dbPassword
-                        echoMode: TextInput.Password
-                        placeholderText: qsTr("Hier DB-Passwort eingeben")
+                        TextField
+                        {
+                            id: dbPassword
+                            echoMode: TextInput.Password
+                            placeholderText: qsTr("Hier DB-Passwort eingeben")
+                            Layout.fillWidth: true
+                        }
+
+                        Item
+                        {
+                            Layout.fillHeight: true
+                        }
                     }
                 }
             }
         }
         RowLayout
         {
+            Item
+            {
+                Layout.fillWidth: true
+            }
+
             Button
             {
                 id: cancelBtn