diff --git a/app/app.json b/app/app.json
index 792e3fd..fe546c5 100644
--- a/app/app.json
+++ b/app/app.json
@@ -3,7 +3,7 @@
     "name": "Defikarte.ch",
     "slug": "Defikarte-ch",
     "owner": "defikarte",
-    "version": "1.0.35",
+    "version": "1.0.36",
     "orientation": "portrait",
     "icon": "./assets/icon.png",
     "userInterfaceStyle": "light",
@@ -18,14 +18,14 @@
     "ios": {
       "supportsTablet": true,
       "bundleIdentifier": "ch.defikarte.app",
-      "buildNumber": "1.0.35",
+      "buildNumber": "1.0.36",
       "infoPlist": {
         "NSLocationWhenInUseUsageDescription": "Diese App benötigt die Standortdaten deines Gerätes um den nächsten Defi anzeigen zu können."
       }
     },
     "android": {
       "package": "ch.defikarte.app",
-      "versionCode": 35,
+      "versionCode": 36,
       "permissions": [
         "ACCESS_COARSE_LOCATION",
         "ACCESS_FINE_LOCATION"
diff --git a/app/src/screens/CreateScreen.js b/app/src/screens/CreateScreen.js
index 3a7f555..96b676a 100644
--- a/app/src/screens/CreateScreen.js
+++ b/app/src/screens/CreateScreen.js
@@ -86,8 +86,8 @@ const CreateScreen = ({ navigation }) => {
     });
   };
 
-  let bottomBar = { ...styles.bottomBar };
-  bottomBar.paddingBottom = insets.bottom * 0.5;
+  const bottomBar = { ...styles.bottomBar };
+  bottomBar.paddingBottom = insets.bottom;
 
   return (
     <View style={styles.containerStyle}>
@@ -98,17 +98,18 @@ const CreateScreen = ({ navigation }) => {
           {state.latitude.toFixed(4)}, {state.longitude.toFixed(4)}
         </Text>
       </View>
-      <ScrollView keyboardShouldPersistTaps="handled" showsVerticalScrollIndicator={false}>
-        <KeyboardAvoidingView
-          // padding is for ios best, for android it is not the best solution,
-          // but the best available in this context
-          behavior={Platform.OS === 'ios' ? 'padding' : 'padding'}
-          enabled
-        >
+      <KeyboardAvoidingView
+        // padding is for ios best, for android it is not the best solution,
+        // but the best available in this context
+        behavior={Platform.OS === 'ios' ? 'padding' : 'padding'}
+        enabled
+        style={styles.fieldsContainer}
+      >
+        <ScrollView keyboardShouldPersistTaps="handled" showsVerticalScrollIndicator={false}>
           {renderFormComponent()}
           <Text style={styles.errorTextStyle}>{defiState.error}</Text>
-        </KeyboardAvoidingView>
-      </ScrollView>
+        </ScrollView>
+      </KeyboardAvoidingView>
       <View style={bottomBar}>
         <TouchableOpacity disabled={defiState.creating} color="white" title="Erstellen" onPress={handleSubmit(onSubmit)}>
           <Text style={styles.buttonTextStyle}>Erstellen</Text>
@@ -125,6 +126,10 @@ const styles = StyleSheet.create({
   containerStyle: {
     ...StyleSheet.absoluteFillObject,
     backgroundColor: 'white',
+    display: 'flex',
+  },
+  fieldsContainer: {
+    flex: 1,
   },
   coordStyle: {
     flexDirection: 'row',