diff --git a/.github/workflows/misc.dependabot-automerge.yaml b/.github/workflows/misc.dependabot-automerge.yaml.skip
similarity index 100%
rename from .github/workflows/misc.dependabot-automerge.yaml
rename to .github/workflows/misc.dependabot-automerge.yaml.skip
diff --git a/CommonUI/src/Components/ModelFormModal/ModelFormModal.tsx b/CommonUI/src/Components/ModelFormModal/ModelFormModal.tsx
index f574c00728..80cd72d948 100644
--- a/CommonUI/src/Components/ModelFormModal/ModelFormModal.tsx
+++ b/CommonUI/src/Components/ModelFormModal/ModelFormModal.tsx
@@ -14,17 +14,18 @@ import FormValues from '../Forms/Types/FormValues';
 
 export interface ComponentProps<TBaseModel extends BaseModel> {
     title: string;
-    modelType: { new (): TBaseModel };
+    modelType: { new(): TBaseModel };
     initialValues?: FormValues<TBaseModel> | undefined;
     onClose?: undefined | (() => void);
     submitButtonText?: undefined | string;
     onSuccess?:
-        | undefined
-        | ((data: TBaseModel | JSONObjectOrArray | Array<TBaseModel>) => void);
+    | undefined
+    | ((data: TBaseModel | JSONObjectOrArray | Array<TBaseModel>) => void);
     submitButtonStyleType?: undefined | ButtonStyleType;
     formProps: ModelFormComponentProps<TBaseModel>;
     modelIdToEdit?: ObjectID | undefined;
     onBeforeCreate?: ((item: TBaseModel) => Promise<TBaseModel>) | undefined;
+    footer?: ReactElement | undefined;
 }
 
 const ModelFormModal: Function = <TBaseModel extends BaseModel>(
@@ -47,26 +48,30 @@ const ModelFormModal: Function = <TBaseModel extends BaseModel>(
             error={error}
         >
             {!error ? (
-                <ModelForm<TBaseModel>
-                    {...props.formProps}
-                    modelType={props.modelType}
-                    modelIdToEdit={props.modelIdToEdit}
-                    hideSubmitButton={true}
-                    onLoadingChange={(isFormLoading: boolean) => {
-                        setIsFormLoading(isFormLoading);
-                    }}
-                    formRef={formRef}
-                    initialValues={props.initialValues}
-                    onSuccess={(
-                        data: TBaseModel | JSONObjectOrArray | Array<TBaseModel>
-                    ) => {
-                        props.onSuccess && props.onSuccess(data);
-                    }}
-                    onError={(error: string) => {
-                        setError(error);
-                    }}
-                    onBeforeCreate={props.onBeforeCreate}
-                />
+                <>
+                    <ModelForm<TBaseModel>
+                        {...props.formProps}
+                        modelType={props.modelType}
+                        modelIdToEdit={props.modelIdToEdit}
+                        hideSubmitButton={true}
+                        onLoadingChange={(isFormLoading: boolean) => {
+                            setIsFormLoading(isFormLoading);
+                        }}
+                        formRef={formRef}
+                        initialValues={props.initialValues}
+                        onSuccess={(
+                            data: TBaseModel | JSONObjectOrArray | Array<TBaseModel>
+                        ) => {
+                            props.onSuccess && props.onSuccess(data);
+                        }}
+                        onError={(error: string) => {
+                            setError(error);
+                        }}
+                        onBeforeCreate={props.onBeforeCreate}
+                    />
+
+                    {props.footer}
+                </>
             ) : (
                 <></>
             )}
diff --git a/CommonUI/src/Components/ModelTable/ModelTable.tsx b/CommonUI/src/Components/ModelTable/ModelTable.tsx
index ea64c31917..60e1206cc1 100644
--- a/CommonUI/src/Components/ModelTable/ModelTable.tsx
+++ b/CommonUI/src/Components/ModelTable/ModelTable.tsx
@@ -340,6 +340,7 @@ const ModelTable: Function = <TBaseModel extends BaseModel>(
     };
 
     const fetchItems: Function = async () => {
+
         setError('');
         setIsLoading(true);
 
@@ -394,10 +395,6 @@ const ModelTable: Function = <TBaseModel extends BaseModel>(
         }
     }, [showTableFilter]);
 
-    useEffect(() => {
-        fetchItems();
-    }, [props.refreshToggle]);
-
     const getSelect: Function = (): Select<TBaseModel> => {
         const selectFields: Select<TBaseModel> = {
             _id: true,
@@ -540,11 +537,7 @@ const ModelTable: Function = <TBaseModel extends BaseModel>(
 
     useEffect(() => {
         fetchItems();
-    }, [currentPageNumber, sortBy, sortOrder, itemsOnPage, query]);
-
-    useEffect(() => {
-        setHeaderButtons();
-    }, [showTableFilter]);
+    }, [currentPageNumber, sortBy, sortOrder, itemsOnPage, query, props.refreshToggle]);
 
     const shouldDisableSort: Function = (columnName: string): boolean => {
         return model.isEntityColumn(columnName);
diff --git a/Dashboard/src/Components/Header/ProjectPicker.tsx b/Dashboard/src/Components/Header/ProjectPicker.tsx
index ec94e39753..c3f34dffe8 100644
--- a/Dashboard/src/Components/Header/ProjectPicker.tsx
+++ b/Dashboard/src/Components/Header/ProjectPicker.tsx
@@ -166,21 +166,6 @@ const DashboardProjectPicker: FunctionComponent<ComponentProps> = (
                         ),
                     title: 'Please select a plan.',
                     required: true,
-                    footerElement: (
-                        <div
-                            className="show-as-link"
-                            onClick={() => {
-                                setIsSubscriptionPlanYearly(false);
-                                refreshFields();
-                            }}
-                        >
-                            {isSubsriptionPlanYearly ? (
-                                <span>Switch to monthly pricing?</span>
-                            ) : (
-                                <span> Switch to yearly pricing?</span>
-                            )}
-                        </div>
-                    ),
                 },
             ];
         }
@@ -230,6 +215,19 @@ const DashboardProjectPicker: FunctionComponent<ComponentProps> = (
                         fields: [...fields],
                         formType: FormType.Create,
                     }}
+                    footer={<div
+                        className="show-as-link"
+                        onClick={() => {
+                            setIsSubscriptionPlanYearly(!isSubsriptionPlanYearly);
+                            refreshFields();
+                        }}
+                    >
+                        {isSubsriptionPlanYearly ? (
+                            <span>Switch to monthly pricing?</span>
+                        ) : (
+                            <span> Switch to yearly pricing?</span>
+                        )}
+                    </div>}
                 />
             ) : (
                 <></>
diff --git a/Dashboard/src/Index.tsx b/Dashboard/src/Index.tsx
index bcda0676c1..64fbf65f30 100644
--- a/Dashboard/src/Index.tsx
+++ b/Dashboard/src/Index.tsx
@@ -9,9 +9,7 @@ const root: any = ReactDOM.createRoot(
 );
 
 root.render(
-    <React.StrictMode>
         <BrowserRouter>
             <App />
         </BrowserRouter>
-    </React.StrictMode>
 );