diff --git a/client/src/pages/manage/manage.page.component.jsx b/client/src/pages/manage/manage.page.component.jsx
index 58658b39b..a654ee98a 100644
--- a/client/src/pages/manage/manage.page.component.jsx
+++ b/client/src/pages/manage/manage.page.component.jsx
@@ -362,11 +362,10 @@ export function Manage({conflict, bodyshop}) {
 
     return (
         <>
-            <ChatAffixContainer bodyshop={bodyshop} chatVisible={chatVisible} />
-            <Layout className="layout-container">
+            <ChatAffixContainer bodyshop={bodyshop} chatVisible={chatVisible}/>
+            <Layout style={{minHeight: '100vh'}}className="layout-container">
                 <UpdateAlert/>
                 <HeaderContainer/>
-
                 <Content className="content-container">
                     <PartnerPingComponent/>
                     <Sentry.ErrorBoundary fallback={<ErrorBoundary/>} showDialog>
@@ -374,30 +373,31 @@ export function Manage({conflict, bodyshop}) {
                     </Sentry.ErrorBoundary>
 
                     <FloatButton.BackTop style={{right: 100, bottom: 25}}/>
-                    <Footer>
-                        <div
-                            style={{
-                                display: "flex",
-                                flexDirection: "column",
-                                justifyContent: "center",
-                                alignItems: "center",
-                                margin: "1rem 0rem",
-                            }}
-                        >
-                            <div style={{display: "flex"}}>
-                                <div>
-                                    {`ImEX Online ${
-                                        process.env.REACT_APP_GIT_SHA
-                                    } - ${preval`module.exports = new Date().toLocaleString("en-US", {timeZone: "America/Los_Angeles"});`}`}
-                                </div>
-                                <div id="noticeable-widget" style={{marginLeft: "1rem"}}/>
-                            </div>
-                            <Link to="/disclaimer" target="_blank" style={{color: "#ccc"}}>
-                                Disclaimer & Notices
-                            </Link>
-                        </div>
-                    </Footer>
+
                 </Content>
+                <Footer>
+                    <div
+                        style={{
+                            display: "flex",
+                            flexDirection: "column",
+                            justifyContent: "center",
+                            alignItems: "center",
+                            margin: "1rem 0rem",
+                        }}
+                    >
+                        <div style={{display: "flex"}}>
+                            <div>
+                                {`ImEX Online ${
+                                    process.env.REACT_APP_GIT_SHA
+                                } - ${preval`module.exports = new Date().toLocaleString("en-US", {timeZone: "America/Los_Angeles"});`}`}
+                            </div>
+                            <div id="noticeable-widget" style={{marginLeft: "1rem"}}/>
+                        </div>
+                        <Link to="/disclaimer" target="_blank" style={{color: "#ccc"}}>
+                            Disclaimer & Notices
+                        </Link>
+                    </div>
+                </Footer>
             </Layout>
         </>
     );