diff --git a/native-example/yarn.lock b/native-example/yarn.lock
index 4e38f3b..c7f290f 100644
--- a/native-example/yarn.lock
+++ b/native-example/yarn.lock
@@ -2897,7 +2897,7 @@
   "version" "0.1.2"
 
 "easybase-react@github:easybase/easybase-react#dev":
-  "resolved" "git+ssh://git@github.com/easybase/easybase-react.git#99dfd2a7710f42b1efb8ab56d38a56b7a63d8ec1"
+  "resolved" "git+ssh://git@github.com/easybase/easybase-react.git#484afb17adb4f2fbf41d1a50a4b8b3b5ed5374d3"
   "version" "2.1.15"
   dependencies:
     "easybasejs" "4.2.13"
diff --git a/src/ui/NativeAuth/NativeAuth.tsx b/src/ui/NativeAuth/NativeAuth.tsx
index 56286db..3fb8162 100644
--- a/src/ui/NativeAuth/NativeAuth.tsx
+++ b/src/ui/NativeAuth/NativeAuth.tsx
@@ -2,7 +2,7 @@ import React, { useState, lazy, Suspense, Fragment, useEffect } from 'react';
 import { ThemeProvider } from 'styled-components/native';
 import { defaultDictionary } from '../utils';
 import { INativeAuth } from '../uiTypes';
-import { Toast, Container } from './components';
+import { Toast } from './components';
 
 const { useEasybase } = require('easybase-react');
 
@@ -72,9 +72,9 @@ export default function ({ customStyles, children, dictionary, signUpFields }: I
         return (
             <ThemeProvider theme={typeof customStyles === "object" ? customStyles : {}}>
                 <Toast toastMessage={toastMessage} toastOpen={toastOpen} setToastOpen={setToastOpen} />
-                <Container behavior="position" enabled>
+                {/* <Container behavior="position" enabled> */}
                     {getCurrentPage()}
-                </Container>
+                {/* </Container> */}
             </ThemeProvider>
         )
     }
diff --git a/src/ui/NativeAuth/components.tsx b/src/ui/NativeAuth/components.tsx
index 731fd37..209a964 100644
--- a/src/ui/NativeAuth/components.tsx
+++ b/src/ui/NativeAuth/components.tsx
@@ -13,31 +13,33 @@ export const MainView = styled(View)({
 
 export const FormRoot = styled.ScrollView((props: any) => ({
     backgroundColor: '#fff',
-    paddingTop: '20%',
-    paddingBottom: '10%',
-    paddingRight: 33,
-    paddingLeft: 33,
-    flexGrow: 1,
+    flex: 1,
     ...(props.theme.form ? { ...props.theme.form } : {})
 }))
 
-export const Form = (props: any) => <FormRoot 
-        keyboardShouldPersistTaps="handled"
-        keyboardDismissMode="on-drag"
-        contentContainerStyle={{ flexGrow: 1 }}
-        bounces={false}
-        alwaysBounceVertical={false}
-    >
-        <View style={{ flex: 1, justifyContent: 'space-between', alignItems: 'center' }}>
-            {props.children}
-        </View>
-    </FormRoot>
-
-export const Container = styled.KeyboardAvoidingView((props: any) => ({
-    flex: 1,
-    justifyContent: 'center',
-    ...(props.theme.container ? { ...props.theme.container } : {})
-}))
+export const Form = (props: any) => <FormRoot
+    keyboardShouldPersistTaps="handled"
+    keyboardDismissMode="on-drag"
+    contentContainerStyle={{
+        flexGrow: 1,
+        paddingTop: '20%',
+        paddingBottom: '10%',
+        paddingRight: 33,
+        paddingLeft: 33
+    }}
+    bounces={false}
+    alwaysBounceVertical={false}
+>
+    <View style={{ flex: 1, justifyContent: 'space-between', alignItems: 'center' }}>
+        {props.children}
+    </View>
+</FormRoot>
+
+// export const Container = styled.KeyboardAvoidingView((props: any) => ({
+//     flex: 1,
+//     justifyContent: 'center',
+//     ...(props.theme.container ? { ...props.theme.container } : {})
+// }))
 
 export const HeaderText = styled.Text((props: any) => ({
     fontSize: 37,