diff --git a/.gitignore b/.gitignore
index a72b227..796e227 100644
--- a/.gitignore
+++ b/.gitignore
@@ -85,4 +85,4 @@ web-build/
 
 # @end expo-cli
 
-src/nb
\ No newline at end of file
+src/nb/
\ No newline at end of file
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 617d76d..0a1b97e 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -22,7 +22,7 @@
   <uses-permission android:name="android.permission.WAKE_LOCK"/>
   <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
   <application android:name=".MainApplication" android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:allowBackup="true" android:theme="@style/AppTheme">
-    <meta-data android:name="expo.modules.updates.EXPO_UPDATE_URL" android:value="https://exp.host/@geekyants/kitchensink-app-native-base" />
+    <meta-data android:name="expo.modules.updates.EXPO_UPDATE_URL" android:value="https://exp.host/@amars29/kitchensink-app-native-base" />
     <meta-data android:name="expo.modules.updates.EXPO_SDK_VERSION" android:value="40.0.0" />
     <meta-data android:name="expo.modules.updates.ENABLED" android:value="true"/>
     <meta-data android:name="expo.modules.updates.EXPO_UPDATES_CHECK_ON_LAUNCH" android:value="ALWAYS"/>
diff --git a/constants.js b/constants.js
index 65e995a..7816ad2 100644
--- a/constants.js
+++ b/constants.js
@@ -1,6 +1,6 @@
 const REPO_LINK = 'https://github.com/GeekyAnts/NativeBase';
 
-const REPO_BRANCH = 'fix/storybook';
+const REPO_BRANCH = 'patch';
 
 module.exports = {
   REPO_LINK,
diff --git a/ios/KitchenSinkappnativebase/Supporting/Expo.plist b/ios/KitchenSinkappnativebase/Supporting/Expo.plist
index 2c68e51..d7b73e3 100644
--- a/ios/KitchenSinkappnativebase/Supporting/Expo.plist
+++ b/ios/KitchenSinkappnativebase/Supporting/Expo.plist
@@ -13,6 +13,6 @@
 	<key>EXUpdatesSDKVersion</key>
 	<string>40.0.0</string>
 	<key>EXUpdatesURL</key>
-	<string>https://exp.host/@geekyants/kitchensink-app-native-base</string>
+	<string>https://exp.host/@amars29/kitchensink-app-native-base</string>
 </dict>
 </plist>
diff --git a/package.json b/package.json
index 571b071..f5c76ab 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,8 @@
 		"android": "react-native run-android",
 		"ios": "react-native run-ios",
 		"web": "expo start --web",
-		"eject": "expo eject"
+		"eject": "expo eject",
+		"web-build": "node ./built-init.js && expo build:web"
 	},
 	"dependencies": {
 		"@react-native-community/masked-view": "0.1.10",
diff --git a/src/nb/NativeBase b/src/nb/NativeBase
index aa06b41..c39a8bb 160000
--- a/src/nb/NativeBase
+++ b/src/nb/NativeBase
@@ -1 +1 @@
-Subproject commit aa06b41dac3a71a8909a9ec163776f4774b34fca
+Subproject commit c39a8bb654b2fc9e44f47ac816f1ec491bd492e8
diff --git a/src/nb/components/basic/KeyboardAvoidingView/Basic.tsx b/src/nb/components/basic/KeyboardAvoidingView/Basic.tsx
index 9cb3593..e18eaf7 100644
--- a/src/nb/components/basic/KeyboardAvoidingView/Basic.tsx
+++ b/src/nb/components/basic/KeyboardAvoidingView/Basic.tsx
@@ -8,6 +8,7 @@ import {
   useBreakpointValue,
 } from 'native-base';
 import { Platform } from 'react-native';
+
 export const Example = () => {
   const isLargeScreen = useBreakpointValue({
     base: false,
@@ -19,7 +20,6 @@ export const Example = () => {
     <KeyboardAvoidingView
       h={{ base: '600px', lg: 'auto' }}
       behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
-      keyboardVerticalOffset={192}
     >
       {isLargeScreen ? (
         <Text>Please see the example in your mobile to observe the effect</Text>
diff --git a/src/nb/components/composites/Actionsheet/index.tsx b/src/nb/components/composites/Actionsheet/index.tsx
index bdd681f..bceb8ea 100644
--- a/src/nb/components/composites/Actionsheet/index.tsx
+++ b/src/nb/components/composites/Actionsheet/index.tsx
@@ -6,6 +6,7 @@ import { Example as Icon } from './Icon';
 import { Example as Usage } from './Usage';
 import { Example as Composition } from './Composition';
 import { Example as DisableOverlay } from './DisableOverlay';
+import { Example as CustomBackdrop } from './CustomBackdrop';
 
 storiesOf('Actionsheet', module)
   .addDecorator(withKnobs)
@@ -13,4 +14,5 @@ storiesOf('Actionsheet', module)
   .add('Usage', () => <Usage />)
   .add('Icon', () => <Icon />)
   .add('DisableOverlay', () => <DisableOverlay />)
-  .add('Composition', () => <Composition />);
+  .add('Composition', () => <Composition />)
+  .add('Custom Backdrop', () => <CustomBackdrop />);
diff --git a/src/nb/components/composites/Menu/MenuPositions.tsx b/src/nb/components/composites/Menu/MenuPositions.tsx
index c043d9d..0f8f5cb 100644
--- a/src/nb/components/composites/Menu/MenuPositions.tsx
+++ b/src/nb/components/composites/Menu/MenuPositions.tsx
@@ -8,7 +8,6 @@ export function Example() {
   return (
     <VStack space={6} alignSelf="flex-start" w="100%">
       <Menu
-        shouldFlip={false}
         shouldOverlapWithTrigger={shouldOverlapWithTrigger}
         // @ts-ignore
         placement={position == 'auto' ? undefined : position}
diff --git a/src/nb/components/composites/Modal/index.tsx b/src/nb/components/composites/Modal/index.tsx
index ce12646..8cdf293 100644
--- a/src/nb/components/composites/Modal/index.tsx
+++ b/src/nb/components/composites/Modal/index.tsx
@@ -8,6 +8,7 @@ import { Example as ModalRefEg } from './ModalRefEg';
 import { Example as MultipleModal } from './MultipleModal';
 import { Example as Size } from './Size';
 import { Example as ModalPlacement } from './ModalPlacement';
+import { Example as CustomBackdrop } from './CustomBackdrop';
 
 storiesOf('Modal', module)
   .addDecorator(withKnobs)
@@ -17,4 +18,5 @@ storiesOf('Modal', module)
   .add('Modal Ref Examples', () => <ModalRefEg />)
   .add('Modal Placement', () => <ModalPlacement />)
   .add('Modal with Keyboard Avoid view', () => <ModalWithAvoidKeyboard />)
-  .add('Modal Size Examples', () => <Size />);
+  .add('Modal Size Examples', () => <Size />)
+  .add('Modal Custom Backdrop', () => <CustomBackdrop />);
diff --git a/src/nb/components/composites/Popover/PopoverPositions.tsx b/src/nb/components/composites/Popover/PopoverPositions.tsx
index 160aac1..c42b36f 100644
--- a/src/nb/components/composites/Popover/PopoverPositions.tsx
+++ b/src/nb/components/composites/Popover/PopoverPositions.tsx
@@ -7,7 +7,6 @@ export function Example() {
   return (
     <VStack space={6} alignSelf="flex-start" w="100%">
       <Popover
-        shouldFlip={false}
         // @ts-ignore
         placement={position == 'auto' ? undefined : position}
         trigger={(triggerProps) => {
diff --git a/src/nb/components/composites/Toast/index.tsx b/src/nb/components/composites/Toast/index.tsx
index d0e4205..3e64a5c 100644
--- a/src/nb/components/composites/Toast/index.tsx
+++ b/src/nb/components/composites/Toast/index.tsx
@@ -7,6 +7,7 @@ import { Example as ToastVariants } from './ToastVariants';
 import { Example as Basic } from './Basic';
 import { Example as CloseToast } from './CloseToast';
 import { Example as CustomComponent } from './CustomComponent';
+import { Example as CustomComponentWithCustomId } from './CustomComponentWithCustomId';
 import { Example as PreventDuplicate } from './PreventDuplicate';
 import { Example as ToastStatus } from './ToastStatus';
 
@@ -16,6 +17,7 @@ storiesOf('Toast', module)
   .add('Basic', () => <Basic />)
   .add('Toast Positions', () => <ToastPositions />)
   .add('Custom Component', () => <CustomComponent />)
+  .add('Custom Component with custom Id', () => <CustomComponentWithCustomId />)
   .add('CloseToast', () => <CloseToast />)
   .add('Prevent Duplicate', () => <PreventDuplicate />)
   .add('Status', () => <ToastStatus />)
diff --git a/src/nb/components/primitives/Button/icons.tsx b/src/nb/components/primitives/Button/icons.tsx
index f09577c..789a397 100644
--- a/src/nb/components/primitives/Button/icons.tsx
+++ b/src/nb/components/primitives/Button/icons.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
-import { Button, Stack, Icon, ArrowForwardIcon } from 'native-base';
-import { MaterialCommunityIcons } from '@expo/vector-icons';
+import { Button, Stack, Icon } from 'native-base';
+import { MaterialCommunityIcons, Ionicons } from '@expo/vector-icons';
 
 export const Example = () => {
   return (
@@ -10,7 +10,10 @@ export const Example = () => {
       >
         Email
       </Button>
-      <Button variant="outline" endIcon={<ArrowForwardIcon size="xs" />}>
+      <Button
+        variant="outline"
+        endIcon={<Icon as={Ionicons} name="arrow-forward" size={4} />}
+      >
         Call us
       </Button>
     </Stack>