diff --git a/src/components/form/index.tsx b/src/components/form/index.tsx
index 55c4b1bd..b8365b5a 100644
--- a/src/components/form/index.tsx
+++ b/src/components/form/index.tsx
@@ -46,6 +46,7 @@ import { GenericFunctionArgs, GenericType } from '../../common/GenericTypes';
 import { setDocumentInteractionId, setDocumentsToUpload } from '../../reducer/feedbackImagesSlice';
 import NudgeSuspiciousFeedbackBottomSheet from './NudgeSuspiciousFeedbackBottomSheet';
 import { API_STATUS_CODE } from '../utlis/apiHelper';
+import NavigationHeader, { Icon } from '../../../RN-UI-LIB/src/components/NavigationHeader';
 
 interface IWidget {
   route: {
@@ -384,16 +385,8 @@ const Widget: React.FC<IWidget> = (props) => {
   return (
     <Layout>
       <SafeAreaView style={[GenericStyles.silverBackground, GenericStyles.fill]}>
-        <View style={[styles.header, GenericStyles.row, { alignItems: 'center' }]}>
-          <TouchableHighlight
-            style={styles.iconContainer}
-            underlayColor={COLORS.HIGHLIGHTER.DARK_BUTTON}
-            onPress={handleCloseIconPress}
-            testID="close-form-btn"
-          >
-            <CloseIcon color={COLORS.BACKGROUND.PRIMARY} />
-          </TouchableHighlight>
-          <View style={[GenericStyles.ml10, GenericStyles.w100]}>
+        <NavigationHeader
+          title={
             <Heading
               type={'h5'}
               bold
@@ -402,11 +395,13 @@ const Widget: React.FC<IWidget> = (props) => {
             >
               Add feedback for {caseData?.customerInfo?.customerName || caseData?.customerName}
             </Heading>
-            {isJourneyNameExists ? (
-              <Text light>{templateData?.journey?.[journey].name}</Text>
-            ) : null}
-          </View>
-        </View>
+          }
+          subTitle={
+            isJourneyNameExists ? <Text light>{templateData?.journey?.[journey].name}</Text> : null
+          }
+          icon={Icon.close}
+          onBack={handleCloseIconPress}
+        />
         <ScrollView
           contentContainerStyle={[
             GenericStyles.p16,
diff --git a/src/screens/addressGeolocation/index.tsx b/src/screens/addressGeolocation/index.tsx
index c9c88903..d4d0b3ba 100644
--- a/src/screens/addressGeolocation/index.tsx
+++ b/src/screens/addressGeolocation/index.tsx
@@ -209,21 +209,23 @@ const AddressGeolocation: React.FC<IAddressGeolocation> = ({ route: routeParams
                 handlePageRouting={handleRouting}
                 loanAccountNumber={loanAccountNumber}
               />
-              <View style={[GenericStyles.p16, styles.btnContainer]}>
-                <Button
-                  title="New address"
-                  style={GenericStyles.w100}
-                  onPress={handleNewAddressCta}
-                  leftIcon={
-                    <View style={GenericStyles.mr10}>
-                      <PlusIcon />
-                    </View>
-                  }
-                />
-              </View>
             </View>
           </SuspenseLoader>
         </ScrollView>
+        {!isLoading ? (
+          <View style={[GenericStyles.p16, styles.btnContainer, GenericStyles.elevation10]}>
+            <Button
+              title="New address"
+              style={GenericStyles.w100}
+              onPress={handleNewAddressCta}
+              leftIcon={
+                <View style={GenericStyles.mr10}>
+                  <PlusIcon />
+                </View>
+              }
+            />
+          </View>
+        ) : null}
       </View>
     </Layout>
   );