diff --git a/AvH Plan.xcodeproj/project.pbxproj b/AvH Plan.xcodeproj/project.pbxproj
index 96ef2d0..162238a 100644
--- a/AvH Plan.xcodeproj/project.pbxproj	
+++ b/AvH Plan.xcodeproj/project.pbxproj	
@@ -76,6 +76,7 @@
 		A9378D342336015000C07D07 /* LoginViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginViewController.swift; sourceTree = "<group>"; };
 		A9378D36233619F300C07D07 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
 		A9378D382336300700C07D07 /* FirstTimeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FirstTimeViewController.swift; sourceTree = "<group>"; };
+		A9378D3B2337736700C07D07 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Main.strings; sourceTree = "<group>"; };
 		A957A74F22DDC15500E0A2ED /* MenuViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuViewCell.swift; sourceTree = "<group>"; };
 		A957A75022DDC15500E0A2ED /* MenuViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MenuViewCell.xib; sourceTree = "<group>"; };
 		A958A92322DF5388007052B0 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
@@ -94,7 +95,6 @@
 		A96133A32299867A00B541D4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		A96D4CC722DDE01A006BAB34 /* GeneralPlanViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GeneralPlanViewController.swift; sourceTree = "<group>"; };
 		A96D4CC922DDE184006BAB34 /* PersonalPlanViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersonalPlanViewController.swift; sourceTree = "<group>"; };
-		A989B31122F58D4700353714 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Main.strings; sourceTree = "<group>"; };
 		A996BFF322E05AAB00E7BE42 /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Base; path = Base.lproj/Info.plist; sourceTree = "<group>"; };
 		A996BFFC22E05AAB00E7BE42 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		A996BFFD22E05AAB00E7BE42 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/InfoPlist.strings; sourceTree = "<group>"; };
@@ -554,7 +554,7 @@
 			isa = PBXVariantGroup;
 			children = (
 				A96133862299867400B541D4 /* Base */,
-				A989B31122F58D4700353714 /* de */,
+				A9378D3B2337736700C07D07 /* de */,
 			);
 			name = Main.storyboard;
 			sourceTree = "<group>";
diff --git a/AvH Plan/Base.lproj/Main.storyboard b/AvH Plan/Base.lproj/Main.storyboard
index bcc61bf..0f020d4 100644
--- a/AvH Plan/Base.lproj/Main.storyboard	
+++ b/AvH Plan/Base.lproj/Main.storyboard	
@@ -75,7 +75,7 @@
                                 </items>
                             </navigationBar>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="iAl-ff-skU">
-                                <rect key="frame" x="0.0" y="88" width="414" height="231"/>
+                                <rect key="frame" x="0.0" y="89" width="414" height="231"/>
                                 <subviews>
                                     <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Your name" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="TpM-Mz-EpI">
                                         <rect key="frame" x="24" y="16" width="366" height="30"/>
@@ -149,7 +149,7 @@
                                 </constraints>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3ae-Qn-llh">
-                                <rect key="frame" x="0.0" y="319" width="414" height="543"/>
+                                <rect key="frame" x="0.0" y="320" width="414" height="542"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" text="Custom colours" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rks-gf-AM4">
                                         <rect key="frame" x="24" y="0.0" width="366" height="21"/>
@@ -158,7 +158,7 @@
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="hWP-3N-RUn">
-                                        <rect key="frame" x="8" y="37" width="398" height="506"/>
+                                        <rect key="frame" x="8" y="37" width="398" height="505"/>
                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <collectionViewLayout key="collectionViewLayout" id="sCM-Sc-0Zw" customClass="MagazineLayout" customModule="MagazineLayout"/>
                                         <cells/>
@@ -186,7 +186,7 @@
                             <constraint firstItem="iN7-lf-GS3" firstAttribute="trailing" secondItem="iAl-ff-skU" secondAttribute="trailing" id="AoD-6m-Zah"/>
                             <constraint firstItem="iN7-lf-GS3" firstAttribute="bottom" secondItem="3ae-Qn-llh" secondAttribute="bottom" id="H2b-Bw-SPo"/>
                             <constraint firstItem="3ae-Qn-llh" firstAttribute="leading" secondItem="iN7-lf-GS3" secondAttribute="leading" id="JSj-x6-uUy"/>
-                            <constraint firstItem="iAl-ff-skU" firstAttribute="top" secondItem="1XB-6S-dGV" secondAttribute="bottom" id="KyF-sn-SYG"/>
+                            <constraint firstItem="iAl-ff-skU" firstAttribute="top" secondItem="1XB-6S-dGV" secondAttribute="bottom" constant="1" id="KyF-sn-SYG"/>
                             <constraint firstItem="3ae-Qn-llh" firstAttribute="leading" secondItem="iAl-ff-skU" secondAttribute="trailing" id="Ojd-xl-Edq"/>
                             <constraint firstItem="iAl-ff-skU" firstAttribute="leading" secondItem="3L4-c2-Pow" secondAttribute="leading" id="SI9-hB-Om4"/>
                             <constraint firstItem="3ae-Qn-llh" firstAttribute="top" secondItem="1XB-6S-dGV" secondAttribute="bottom" constant="16" id="T5g-Sq-0j2"/>
@@ -301,7 +301,7 @@
                                 </items>
                             </navigationBar>
                             <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="PuQ-HH-9DW">
-                                <rect key="frame" x="0.0" y="88" width="414" height="774"/>
+                                <rect key="frame" x="0.0" y="89" width="414" height="773"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="U1s-L9-Ptw" customClass="MagazineLayout" customModule="MagazineLayout">
                                     <size key="itemSize" width="50" height="50"/>
@@ -322,7 +322,7 @@
                             <constraint firstItem="hA8-ki-X8m" firstAttribute="top" secondItem="sxo-IA-DXC" secondAttribute="top" id="cSc-da-pRP"/>
                             <constraint firstItem="hA8-ki-X8m" firstAttribute="trailing" secondItem="sxo-IA-DXC" secondAttribute="trailing" id="eLY-V4-1lX"/>
                             <constraint firstItem="sxo-IA-DXC" firstAttribute="trailing" secondItem="PuQ-HH-9DW" secondAttribute="trailing" id="iAf-Pv-Hl8"/>
-                            <constraint firstItem="PuQ-HH-9DW" firstAttribute="top" secondItem="hA8-ki-X8m" secondAttribute="bottom" id="lNF-lt-wSq"/>
+                            <constraint firstItem="PuQ-HH-9DW" firstAttribute="top" secondItem="hA8-ki-X8m" secondAttribute="bottom" constant="1" id="lNF-lt-wSq"/>
                             <constraint firstItem="sxo-IA-DXC" firstAttribute="bottom" secondItem="PuQ-HH-9DW" secondAttribute="bottom" id="m44-uV-U72"/>
                             <constraint firstItem="hA8-ki-X8m" firstAttribute="leading" secondItem="sxo-IA-DXC" secondAttribute="leading" id="vWh-ct-B5X"/>
                         </constraints>
@@ -470,10 +470,12 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZIX-7y-psY">
-                                <rect key="frame" x="20" y="156" width="374" height="142.33333333333337"/>
+                                <rect key="frame" x="20" y="156" width="374" height="203"/>
                                 <string key="text">Please click the button above to enter your username and password to verify that you're occupied at the Alexander-von-Humboldt-Gymnasium.
 
-This login is only required once and your information will not be shared with anybody.</string>
+This login is only required once and your information will not be shared with anybody.
+
+If you have logged in successfully, but the setup does not continue, please go back and try again.</string>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
diff --git a/AvH Plan/de.lproj/Main.strings b/AvH Plan/de.lproj/Main.strings
index 092587a..4340e6d 100644
--- a/AvH Plan/de.lproj/Main.strings	
+++ b/AvH Plan/de.lproj/Main.strings	
@@ -1,3 +1,4 @@
+
 /* Class = "UITabBarController"; title = "AvH Plan"; ObjectID = "49e-Tb-3d3"; */
 "49e-Tb-3d3.title" = "AvH-Plan";
 
@@ -7,8 +8,8 @@
 /* Class = "UITextField"; placeholder = "Your courses"; ObjectID = "69O-Fo-TQF"; */
 "69O-Fo-TQF.placeholder" = "Deine Kurse";
 
-/* Class = "UILabel"; text = "Label"; ObjectID = "6H8-lj-boN"; */
-"6H8-lj-boN.text" = "Label";
+/* Class = "UIBarButtonItem"; title = "Finish"; ObjectID = "6Ce-T9-ZJX"; */
+"6Ce-T9-ZJX.title" = "Fertigstellen";
 
 /* Class = "UINavigationItem"; title = "Customize"; ObjectID = "9Pf-pB-wLS"; */
 "9Pf-pB-wLS.title" = "Anpassen";
@@ -16,35 +17,62 @@
 /* Class = "UIViewController"; title = "AvH Plan"; ObjectID = "9pv-A4-QxB"; */
 "9pv-A4-QxB.title" = "AvH-Plan";
 
+/* Class = "UINavigationItem"; title = "Hello there!"; ObjectID = "AmM-kS-Dd7"; */
+"AmM-kS-Dd7.title" = "Hallo!";
+
 /* Class = "UITabBarItem"; title = "Information"; ObjectID = "BQ7-VO-yI4"; */
 "BQ7-VO-yI4.title" = "Informationen";
 
+/* Class = "UILabel"; text = "Lastly, please pick the type of substitution plan you want to see when you launch the app. Click the button at the top to finish setup."; ObjectID = "Eor-Sq-zqK"; */
+"Eor-Sq-zqK.text" = "Wähle bitte zuletzt den Plan aus, den du sehen möchtest, wenn du die App öffnest. Klick die Schaltfläche oben, um die Einrichtung abzuschließen.";
+
+/* Class = "UILabel"; text = "If you're in senior phase (E-Phase, Q-Phase), please also tell me which courses you're enrolled in."; ObjectID = "F3r-Ao-Iih"; */
+"F3r-Ao-Iih.text" = "Falls du in der Oberstufe bist, nenne mir bitte auch deine Kurse.";
+
 /* Class = "UINavigationItem"; title = "Title"; ObjectID = "HYG-gj-KYl"; */
 "HYG-gj-KYl.title" = "Title";
 
 /* Class = "UITabBarItem"; title = "Menu"; ObjectID = "IfX-2p-YWq"; */
-"IfX-2p-YWq.title" = "Menü";
+"IfX-2p-YWq.title" = "Speiseplan";
+
+/* Class = "UINavigationItem"; title = "Welcome!"; ObjectID = "KbA-z7-Ss6"; */
+"KbA-z7-Ss6.title" = "Willkommen!";
+
+/* Class = "UIBarButtonItem"; title = "Log in"; ObjectID = "NUo-Rl-vf4"; */
+"NUo-Rl-vf4.title" = "Einloggen";
 
 /* Class = "UIBarButtonItem"; title = "Save"; ObjectID = "PWA-cp-z6o"; */
 "PWA-cp-z6o.title" = "Speichern";
 
+/* Class = "UILabel"; text = "Next, tell me which grade you're in."; ObjectID = "QEa-bk-RFE"; */
+"QEa-bk-RFE.text" = "Sag mir als nächstes, in welcher Klasse du bist.";
+
 /* Class = "UITextField"; accessibilityHint = "Name"; ObjectID = "TpM-Mz-EpI"; */
 "TpM-Mz-EpI.accessibilityHint" = "Name";
 
 /* Class = "UITextField"; placeholder = "Your name"; ObjectID = "TpM-Mz-EpI"; */
 "TpM-Mz-EpI.placeholder" = "Dein Name";
 
+/* Class = "UIViewController"; title = "Log in"; ObjectID = "VcC-PU-4w2"; */
+"VcC-PU-4w2.title" = "Einloggen";
+
 /* Class = "UIBarButtonItem"; title = "Save"; ObjectID = "ZI8-Ec-yYU"; */
 "ZI8-Ec-yYU.title" = "Speichern";
 
+/* Class = "UILabel"; text = "Please click the button above to enter your username and password to verify that you're occupied at the Alexander-von-Humboldt-Gymnasium.\n\nThis login is only required once and your information will not be shared with anybody."; ObjectID = "ZIX-7y-psY"; */
+"ZIX-7y-psY.text" = "Bitte klicke die Schaltfläche oben und gib deinen Nutzernamen und dein Passwort ein, um zu zeigen, dass du am Alexander-von-Humboldt-Gymnasium beschäftigt bist.\n\nDieser Login ist nur einmalig und deine Informationen werden nicht mit anderen geteilt.\n\nFalls du dich erfolgreich eingeloggt hast, die Einrichtung aber nicht fortfährt, dann geh bitte zurück und versuche es noch mal.";
+
 /* Class = "UITabBarItem"; title = "General"; ObjectID = "acW-dT-cKf"; */
 "acW-dT-cKf.title" = "Allgemein";
 
+/* Class = "UITextField"; placeholder = "Your grade"; ObjectID = "b6K-FB-rfo"; */
+"b6K-FB-rfo.placeholder" = "Deine Klasse";
+
 /* Class = "UITextField"; accessibilityHint = "Classes"; ObjectID = "bCV-w1-hVY"; */
-"bCV-w1-hVY.accessibilityHint" = "Klassen";
+"bCV-w1-hVY.accessibilityHint" = "Klasse";
 
 /* Class = "UITextField"; placeholder = "Your classes"; ObjectID = "bCV-w1-hVY"; */
-"bCV-w1-hVY.placeholder" = "Deine Klassen";
+"bCV-w1-hVY.placeholder" = "Deine Kurse";
 
 /* Class = "UIBarButtonItem"; title = "Customize"; ObjectID = "bae-uC-OAx"; */
 "bae-uC-OAx.title" = "Anpassen";
@@ -52,6 +80,9 @@
 /* Class = "UITabBarItem"; title = "Personal"; ObjectID = "cPa-gy-q4n"; */
 "cPa-gy-q4n.title" = "Persönlich";
 
+/* Class = "UITextField"; placeholder = "Your course"; ObjectID = "dWO-0U-i1C"; */
+"dWO-0U-i1C.placeholder" = "Deine Kurse";
+
 /* Class = "UILabel"; text = "Default plan"; ObjectID = "hkV-XP-jXe"; */
 "hkV-XP-jXe.text" = "Standardplan";
 
@@ -61,8 +92,20 @@
 /* Class = "UISegmentedControl"; omP-RH-Hlh.segmentTitles[1] = "Personal"; ObjectID = "omP-RH-Hlh"; */
 "omP-RH-Hlh.segmentTitles[1]" = "Persönlich";
 
+/* Class = "UITextField"; placeholder = "Your name"; ObjectID = "pH1-JE-B6v"; */
+"pH1-JE-B6v.placeholder" = "Dein Name";
+
 /* Class = "UILabel"; text = "Custom colours"; ObjectID = "rks-gf-AM4"; */
 "rks-gf-AM4.text" = "Benutzerdefinierte Farben";
 
+/* Class = "UILabel"; text = "First, let's setup some things.\n\nTell me your name."; ObjectID = "szd-aA-XdS"; */
+"szd-aA-XdS.text" = "Lass uns erst einige Sachen einrichten.\n\nNenne mir deinen Namen.";
+
+/* Class = "UISegmentedControl"; xXa-1j-Cw3.segmentTitles[0] = "General"; ObjectID = "xXa-1j-Cw3"; */
+"xXa-1j-Cw3.segmentTitles[0]" = "Allgemein";
+
+/* Class = "UISegmentedControl"; xXa-1j-Cw3.segmentTitles[1] = "Personal"; ObjectID = "xXa-1j-Cw3"; */
+"xXa-1j-Cw3.segmentTitles[1]" = "Persönlich";
+
 /* Class = "UIBarButtonItem"; title = "Customize"; ObjectID = "zsF-Jh-U3n"; */
 "zsF-Jh-U3n.title" = "Anpassen";