diff --git a/gui/firststart.qml b/gui/firststart.qml
index 6c752c4..df2dfd3 100644
--- a/gui/firststart.qml
+++ b/gui/firststart.qml
@@ -21,13 +21,6 @@ import QtQuick.Controls.Material
 
 Item
 {
-    width: 640
-    height: 480
-    visible: true
-
-    Material.theme: Material.Dark
-    Material.accent: Material.BlueGrey
-
     ColumnLayout
     {
         anchors.fill: parent
@@ -72,6 +65,8 @@ Item
                 {
                     id: createUserGrid
                     columns: 2
+                    columnSpacing: 5
+                    rowSpacing: 9
                     anchors.fill: parent
                     Layout.margins: 9
                     Label
@@ -118,6 +113,8 @@ Item
                 {
                     id: dbGrid
                     columns: 2
+                    columnSpacing: 5
+                    rowSpacing: 9
                     anchors.fill: parent
 
                     Label
@@ -378,4 +375,9 @@ Item
             }
         }
     }
+
+    Component.onCompleted:
+    {
+        appLoader.window.title = "PYQCRM - Einstellungen"
+    }
 }
diff --git a/gui/main.qml b/gui/main.qml
index f3b9933..6ce6770 100644
--- a/gui/main.qml
+++ b/gui/main.qml
@@ -5,19 +5,25 @@ import QtQuick.Controls.Material
 
 ApplicationWindow
 {
-    id: window
-    width: 640
-    height: 480
+    id: appWindow
+    width: Screen.width * .6
+    height: Screen.height * .6
     visible: true
     Material.theme: Material.Dark
     Material.accent: Material.BlueGrey
-    title: bad_config? "Pyqcrm Einstellungen":"Pyqcrm"
+    title: "PYQCRM"
     Loader
     {
-        id: mainWindow
-
-
+        id: appLoader
+        anchors.fill: parent
+        // {
+        //     left: parent.left
+        //     right: parent.right
+        //     top: parent.top
+        //     bottom: parent.bottom
+        // }
         source: bad_config? "firststart.qml":"start.qml"
+        property alias window: appWindow
     }