diff --git a/Gui/ApplicantBankData.qml b/Gui/ApplicantBankData.qml
index bcaa563..43839f5 100644
--- a/Gui/ApplicantBankData.qml
+++ b/Gui/ApplicantBankData.qml
@@ -7,8 +7,10 @@ GridLayout
     id: bankAccount
     columns: 2
     property alias jobstatus: title
+    property alias longest: longest
     Label
     {
+        id: longest
         text: qsTr("Beschäftigungsverhältnis")
         Layout.alignment: Qt.AlignRight
     }
diff --git a/Gui/ApplicantNationalInsurance.qml b/Gui/ApplicantNationalInsurance.qml
index 0cc1966..5554ced 100644
--- a/Gui/ApplicantNationalInsurance.qml
+++ b/Gui/ApplicantNationalInsurance.qml
@@ -10,7 +10,9 @@ GridLayout
 
     Label
     {
+        Layout.preferredWidth: bankAccount.longest.width
         text: qsTr("Herkunftsland")
+        horizontalAlignment: Text.AlignRight
     }
 
     ComboBox
@@ -25,6 +27,7 @@ GridLayout
     Label
     {
         text: qsTr("Sozialversicherungs-Nr")
+        Layout.alignment: Qt.AlignRight
     }
 
     TextField
@@ -37,6 +40,7 @@ GridLayout
     Label
     {
         text: qsTr("Steuer-ID")
+        Layout.alignment: Qt.AlignRight
     }
 
     TextField
@@ -49,6 +53,7 @@ GridLayout
     Label
     {
         text: qsTr("Krankenkasse")
+        Layout.alignment: Qt.AlignRight
     }
 
     TextField
@@ -60,6 +65,7 @@ GridLayout
     Label
     {
         text: qsTr("Knappschaft")
+        Layout.alignment: Qt.AlignRight
         visible: bankAccount.jobstatus.currentText === "Minijob" ? 1:0
     }
 
@@ -71,67 +77,85 @@ GridLayout
         visible: bankAccount.jobstatus.currentText === "Minijob" ? 1:0
     }
 
-    CheckBox
+
+    Label
     {
-        property string name: "worklicense"
-        id: worklicense
-        Layout.columnSpan: 2
-        text: qsTr("Arbeitserlaubnis")
-        visible: nation.currentText === "Deutschland"? false:true
+        text: qsTr("Ausweistyp")
+        Layout.alignment: Qt.AlignRight
+    }
+
+    ComboBox
+    {
+        property string name: "idtype"
+        id: idtype
+        Layout.fillWidth: true
+        editable: true
+        model: [qsTr("Personalausweis"), qsTr("Reisepass")]
     }
     Label
     {
         text: qsTr("Ausweis Nr.")
-        visible: nation.currentText === "Deutschland"? false:true
+        Layout.alignment: Qt.AlignRight
     }
     TextField
     {
         property string name: "passno"
         id: passno
-        visible: nation.currentText === "Deutschland"? false:true
         Layout.fillWidth: true
     }
 
     Label
     {
         text: qsTr("Ausweis gültig bis")
-        visible: nation.currentText === "Deutschland"? false:true
+        Layout.alignment: Qt.AlignRight
     }
     TextField
     {
         property string name: "passduration"
         id: passduration
-        visible: nation.currentText === "Deutschland"? false:true
         Layout.fillWidth: true
     }
     Label
     {
         text: qsTr("Ausstellungsort")
-        visible: nation.currentText === "Deutschland"? false:true
+        Layout.alignment: Qt.AlignRight
     }
     TextField
     {
         property string name: "exhibitionlocation"
         id: exhibitionlocation
-        visible: nation.currentText === "Deutschland"? false:true
         Layout.fillWidth: true
     }
     Label
     {
+        id: test
         text: qsTr("Ausgestellt am")
-        visible: nation.currentText === "Deutschland"? false:true
+        Layout.alignment: Qt.AlignRight
     }
     TextField
     {
         property string name: "exhibitdate"
         id: exhibitdate
-        visible: nation.currentText === "Deutschland"? false:true
         Layout.fillWidth: true
     }
+    CheckBox
+    {
+        Layout.preferredWidth: bankAccount.longest.width
+        property string name: "worklicense"
+        id: worklicense
+        text: qsTr("Arbeitserlaubnis <font color='red'><b>?</b></font>")
+        visible: nation.currentText === "Deutschland"? false:true
+    }
+    Item
+    {
+        Layout.fillWidth: true
+        visible: nation.currentText === "Deutschland"? false:true
+    }
     Label
     {
         text: qsTr("Aufenthaltstitel gültig bis")
         visible: nation.currentText === "Deutschland"? false:true
+        Layout.alignment: Qt.AlignRight
     }
     TextField
     {
diff --git a/Gui/ApplicantVarious.qml b/Gui/ApplicantVarious.qml
index ec44930..7f2ecf3 100644
--- a/Gui/ApplicantVarious.qml
+++ b/Gui/ApplicantVarious.qml
@@ -9,7 +9,9 @@ GridLayout
 
     Label
     {
+        Layout.preferredWidth: bankAccount.longest.width
         text: qsTr("Grad der Behinderung")
+        horizontalAlignment: Text.AlignRight
     }
 
     TextField
@@ -22,6 +24,7 @@ GridLayout
     Label
     {
         text: qsTr("Disponent")
+        Layout.alignment: Qt.AlignRight
     }
 
     TextField
@@ -34,6 +37,7 @@ GridLayout
     Label
     {
         text: qsTr("Kostenstelle")
+        Layout.alignment: Qt.AlignRight
     }
 
     TextField
@@ -46,6 +50,7 @@ GridLayout
     Label
     {
         text: qsTr("Fremdlohn-Nr.")
+        Layout.alignment: Qt.AlignRight
     }
 
     TextField