diff --git a/lib/src/ui/screens/login.dart b/lib/src/ui/screens/login.dart
index 66be3b3..3f5602a 100644
--- a/lib/src/ui/screens/login.dart
+++ b/lib/src/ui/screens/login.dart
@@ -15,7 +15,10 @@ class Login extends StatelessWidget {
     return Scaffold(
       body: Container(
         padding: EdgeInsets.only(
-            top: topPadding, bottom: bottomPadding, left: 20.0, right: 20.0),
+            top: topPadding,
+            bottom: bottomPadding + 10.0,
+            left: 20.0,
+            right: 20.0),
         child: Column(children: <Widget>[
           Row(
               mainAxisAlignment: MainAxisAlignment.center,
@@ -31,7 +34,7 @@ class Login extends StatelessWidget {
           Padding(
               padding: EdgeInsets.only(top: 10.0),
               child: SvgPicture.asset(phoneSvg,
-                  width: MediaQuery.of(context).size.width)),
+                  height: MediaQuery.of(context).size.height / 4.5)),
           PhoneNumberForm(),
           Spacer(),
           TextButton(text: "Continue", onClickCallback: () => print("clicked")),
diff --git a/lib/src/ui/widgets/opt_form.dart b/lib/src/ui/screens/otp.dart
similarity index 100%
rename from lib/src/ui/widgets/opt_form.dart
rename to lib/src/ui/screens/otp.dart
diff --git a/lib/src/ui/widgets/otp_form.dart b/lib/src/ui/widgets/otp_form.dart
new file mode 100644
index 0000000..898a5c8
--- /dev/null
+++ b/lib/src/ui/widgets/otp_form.dart
@@ -0,0 +1,28 @@
+import "package:flutter/material.dart";
+import "phone_input.dart";
+
+class OtpForm extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      child: Padding(
+          padding: EdgeInsets.only(top: 20.0),
+          child: Column(
+              mainAxisSize: MainAxisSize.min,
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: <Widget>[
+                Text("Almost there.",
+                    textAlign: TextAlign.left,
+                    style: Theme.of(context).accentTextTheme.display3),
+                Text(
+                    "I've sent an authentication code via SMS to your device. Do not share this information with anyone!",
+                    style: Theme.of(context)
+                        .accentTextTheme
+                        .title
+                        .copyWith(fontWeight: FontWeight.w400)),
+                Padding(
+                    padding: EdgeInsets.only(top: 20.0), child: PhoneInput()),
+              ])),
+    );
+  }
+}
diff --git a/lib/src/ui/widgets/phone_input.dart b/lib/src/ui/widgets/phone_input.dart
index 0657dbe..796a442 100644
--- a/lib/src/ui/widgets/phone_input.dart
+++ b/lib/src/ui/widgets/phone_input.dart
@@ -22,7 +22,6 @@ class PhoneInput extends StatelessWidget {
           Expanded(
               child: TextField(
                   autocorrect: false,
-                  autofocus: true,
                   cursorWidth: 2.0,
                   cursorColor: Colors.white,
                   style: Theme.of(context).accentTextTheme.title,