diff --git a/Vector/ViewController/AuthenticationViewController.xib b/Vector/ViewController/AuthenticationViewController.xib
index 5ec067a8b..061a0334b 100644
--- a/Vector/ViewController/AuthenticationViewController.xib
+++ b/Vector/ViewController/AuthenticationViewController.xib
@@ -79,10 +79,10 @@
                     <rect key="frame" x="0.0" y="64" width="375" height="603"/>
                     <subviews>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rhx-dD-4EJ" userLabel="Content View">
-                            <rect key="frame" x="0.0" y="0.0" width="600" height="485"/>
+                            <rect key="frame" x="0.0" y="0.0" width="375" height="485"/>
                             <subviews>
                                 <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="logo.png" translatesAutoresizingMaskIntoConstraints="NO" id="d8r-TX-pwX" userLabel="Welcome Image View">
-                                    <rect key="frame" x="240" y="25" width="120" height="99"/>
+                                    <rect key="frame" x="127.5" y="25" width="120" height="99"/>
                                     <accessibility key="accessibilityConfiguration" identifier="AuthenticationVCWelcomeImageView"/>
                                     <constraints>
                                         <constraint firstAttribute="width" constant="120" id="ZFx-Mn-Kzq"/>
@@ -90,22 +90,22 @@
                                     </constraints>
                                 </imageView>
                                 <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xWb-IJ-v7F" userLabel="AuthInputsContainerView">
-                                    <rect key="frame" x="0.0" y="160" width="600" height="200"/>
+                                    <rect key="frame" x="0.0" y="160" width="375" height="200"/>
                                     <subviews>
                                         <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="30E-gm-z6O">
-                                            <rect key="frame" x="290" y="90" width="20" height="20"/>
+                                            <rect key="frame" x="177.5" y="90" width="20" height="20"/>
                                             <userDefinedRuntimeAttributes>
                                                 <userDefinedRuntimeAttribute type="string" keyPath="accessibilityIdentifier" value="AuthenticationVCActivityIndicator"/>
                                             </userDefinedRuntimeAttributes>
                                         </activityIndicatorView>
                                         <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Currently we do not support authentication flows defined by this Home Server" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="54b-4O-ip9" userLabel="noFlowLabel">
-                                            <rect key="frame" x="49" y="8" width="503" height="17"/>
+                                            <rect key="frame" x="9" y="8" width="358" height="17"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                             <color key="textColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="wIH-Kd-r7q" userLabel="retryButton">
-                                            <rect key="frame" x="278" y="30" width="45" height="30"/>
+                                            <rect key="frame" x="165.5" y="30" width="45" height="30"/>
                                             <accessibility key="accessibilityConfiguration" identifier="AuthenticationVCRetryButton"/>
                                             <constraints>
                                                 <constraint firstAttribute="height" constant="30" id="WtO-NT-ei8"/>
@@ -135,7 +135,7 @@
                                     </constraints>
                                 </view>
                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Gg0-TE-OGb">
-                                    <rect key="frame" x="0.0" y="384" width="600" height="300"/>
+                                    <rect key="frame" x="0.0" y="384" width="375" height="300"/>
                                     <subviews>
                                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" hasAttributedTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="AJ2-lJ-NUq">
                                             <rect key="frame" x="19" y="33" width="122" height="30"/>
@@ -158,7 +158,7 @@
                                             </connections>
                                         </button>
                                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="k3J-Eg-itz" userLabel="SubmitBtn">
-                                            <rect key="frame" x="483" y="33" width="106" height="30"/>
+                                            <rect key="frame" x="258" y="33" width="106" height="30"/>
                                             <color key="backgroundColor" red="0.028153735480000001" green="0.82494870580000002" blue="0.051896891280000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             <accessibility key="accessibilityConfiguration" identifier="AuthenticationVCLoginButton"/>
                                             <constraints>
@@ -175,7 +175,7 @@
                                             </connections>
                                         </button>
                                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="middleTruncation" hasAttributedTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="6yx-o1-vbD">
-                                            <rect key="frame" x="19" y="73" width="562" height="30"/>
+                                            <rect key="frame" x="19" y="73" width="337" height="30"/>
                                             <accessibility key="accessibilityConfiguration" identifier="AuthenticationVCOptionTickButton"/>
                                             <constraints>
                                                 <constraint firstAttribute="height" constant="30" id="buF-NU-DPO"/>
@@ -196,13 +196,13 @@
                                             </connections>
                                         </button>
                                         <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="uOi-KN-l9I" userLabel="ServerOptionsContainerView">
-                                            <rect key="frame" x="0.0" y="106" width="600" height="140"/>
+                                            <rect key="frame" x="0.0" y="106" width="375" height="140"/>
                                             <subviews>
                                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1YY-gb-LG4">
-                                                    <rect key="frame" x="0.0" y="0.0" width="600" height="70"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="375" height="70"/>
                                                     <subviews>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Home Server:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kHf-s1-cZa">
-                                                            <rect key="frame" x="18" y="8" width="564" height="20"/>
+                                                            <rect key="frame" x="18" y="8" width="339" height="20"/>
                                                             <accessibility key="accessibilityConfiguration" identifier="AuthenticationVCHSLabel"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="20" id="SgI-dz-C8b"/>
@@ -212,7 +212,7 @@
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="URL (e.g. https://matrix.org)" adjustsFontSizeToFit="NO" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="G8l-AP-iRs">
-                                                            <rect key="frame" x="18" y="36" width="564" height="21"/>
+                                                            <rect key="frame" x="18" y="36" width="339" height="21"/>
                                                             <accessibility key="accessibilityConfiguration" identifier="AuthenticationVCHSTextField"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="21" id="RT2-FT-tLZ"/>
@@ -224,7 +224,7 @@
                                                             </connections>
                                                         </textField>
                                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZZP-eI-bXP">
-                                                            <rect key="frame" x="10" y="69" width="580" height="1"/>
+                                                            <rect key="frame" x="10" y="69" width="355" height="1"/>
                                                             <color key="backgroundColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="1" id="XdZ-tB-v6d"/>
@@ -247,10 +247,10 @@
                                                     </constraints>
                                                 </view>
                                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kjJ-Tb-SIW">
-                                                    <rect key="frame" x="0.0" y="70" width="600" height="70"/>
+                                                    <rect key="frame" x="0.0" y="70" width="375" height="70"/>
                                                     <subviews>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Identity Server:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5CT-Ht-Z3v">
-                                                            <rect key="frame" x="18" y="8" width="564" height="20"/>
+                                                            <rect key="frame" x="18" y="8" width="339" height="20"/>
                                                             <accessibility key="accessibilityConfiguration" identifier="AuthenticationVCISLabel"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="20" id="aWu-GG-POi"/>
@@ -260,7 +260,7 @@
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="URL (e.g. https://matrix.org)" adjustsFontSizeToFit="NO" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="PZC-Hd-Q6a">
-                                                            <rect key="frame" x="18" y="36" width="564" height="21"/>
+                                                            <rect key="frame" x="18" y="36" width="339" height="21"/>
                                                             <accessibility key="accessibilityConfiguration" identifier="AuthenticationVCISTextField"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="21" id="XTt-dw-c6p"/>
@@ -272,7 +272,7 @@
                                                             </connections>
                                                         </textField>
                                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="t08-ua-0mJ">
-                                                            <rect key="frame" x="10" y="69" width="580" height="1"/>
+                                                            <rect key="frame" x="10" y="69" width="355" height="1"/>
                                                             <color key="backgroundColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="1" id="h6p-cH-vPq"/>
@@ -335,7 +335,7 @@
                                 <constraint firstItem="Gg0-TE-OGb" firstAttribute="top" secondItem="rhx-dD-4EJ" secondAttribute="top" priority="250" constant="384" id="UEM-Mh-0H9"/>
                                 <constraint firstItem="xWb-IJ-v7F" firstAttribute="leading" secondItem="rhx-dD-4EJ" secondAttribute="leading" id="YnP-Nk-QxR"/>
                                 <constraint firstItem="Gg0-TE-OGb" firstAttribute="top" relation="greaterThanOrEqual" secondItem="xWb-IJ-v7F" secondAttribute="bottom" id="aGH-m3-xL3"/>
-                                <constraint firstAttribute="width" constant="600" placeholder="YES" id="hOT-Wn-hIb"/>
+                                <constraint firstAttribute="width" constant="375" placeholder="YES" id="hOT-Wn-hIb"/>
                                 <constraint firstAttribute="trailing" secondItem="xWb-IJ-v7F" secondAttribute="trailing" id="hko-ol-XDd"/>
                                 <constraint firstItem="xWb-IJ-v7F" firstAttribute="top" secondItem="rhx-dD-4EJ" secondAttribute="top" constant="160" id="khR-Uj-OTH"/>
                                 <constraint firstItem="d8r-TX-pwX" firstAttribute="top" secondItem="rhx-dD-4EJ" secondAttribute="top" constant="25" id="l68-Ta-YKg"/>