diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AppContainer/AppContainer.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/AppContainer/AppContainer.test.tsx
new file mode 100644
index 00000000000..9b4e97c8251
--- /dev/null
+++ b/openmetadata-ui/src/main/resources/ui/src/components/AppContainer/AppContainer.test.tsx
@@ -0,0 +1,98 @@
+/*
+ *  Copyright 2023 Collate.
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+import { render, screen } from '@testing-library/react';
+import { ROUTES } from 'constants/constants';
+import React from 'react';
+import { MemoryRouter, Switch } from 'react-router-dom';
+import AppContainer from './AppContainer';
+
+jest.mock('../../AppState', () => ({
+  getCurrentUserDetails: jest.fn().mockReturnValue({
+    id: '2e424734-761a-443f-bf2a-a5b361823c80',
+    type: 'user',
+    name: 'aaron_johnson0',
+    fullyQualifiedName: 'aaron_johnson0',
+    displayName: 'Aaron Johnson',
+    deleted: false,
+  }),
+  newUser: {
+    name: 'Sample Name',
+    email: 'sample123@sample.com',
+    picture: 'Profile Picture',
+  },
+}));
+
+jest.mock('../authentication/auth-provider/AuthProvider', () => {
+  return {
+    useAuthContext: jest.fn(() => ({
+      isAuthDisabled: false,
+      isAuthenticated: true,
+      signingIn: false,
+      isProtectedRoute: jest.fn().mockReturnValue(true),
+      isTourRoute: jest.fn().mockReturnValue(false),
+      onLogoutHandler: jest.fn(),
+    })),
+  };
+});
+
+jest.mock('../../hooks/authHooks', () => ({
+  useAuth: () => {
+    return {
+      isSignedIn: true,
+      isSignedOut: false,
+      isAuthenticatedRoute: true,
+      isAuthDisabled: true,
+    };
+  },
+}));
+
+jest.mock('components/MyData/LeftSidebar/LeftSidebar.component', () =>
+  jest.fn().mockReturnValue(<p>Sidebar</p>)
+);
+
+jest.mock('components/AppBar/Appbar', () =>
+  jest.fn().mockReturnValue(<p>Appbar</p>)
+);
+
+jest.mock('pages/signup', () => jest.fn().mockReturnValue(<p>SignUpPage</p>));
+
+jest.mock('components/router/AuthenticatedAppRouter', () =>
+  jest.fn().mockReturnValue(<p>AuthenticatedAppRouter</p>)
+);
+
+describe('AppContainer', () => {
+  it('renders the SignupPage when on the signup route', () => {
+    render(
+      <MemoryRouter initialEntries={[ROUTES.SIGNUP]}>
+        <Switch>
+          <AppContainer />
+        </Switch>
+      </MemoryRouter>
+    );
+
+    expect(screen.getByText('SignUpPage')).toBeInTheDocument();
+    expect(screen.queryByText('Sidebar')).not.toBeInTheDocument();
+  });
+
+  it('renders the Appbar, LeftSidebar, and AuthenticatedAppRouter components', () => {
+    render(
+      <MemoryRouter>
+        <AppContainer />
+      </MemoryRouter>
+    );
+
+    expect(screen.getByText('Appbar')).toBeInTheDocument();
+    expect(screen.getByText('Sidebar')).toBeInTheDocument();
+    expect(screen.getByText('AuthenticatedAppRouter')).toBeInTheDocument();
+  });
+});
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AppContainer/AppContainer.tsx b/openmetadata-ui/src/main/resources/ui/src/components/AppContainer/AppContainer.tsx
index 92a97451421..e76ae9d13f8 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/AppContainer/AppContainer.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/AppContainer/AppContainer.tsx
@@ -39,7 +39,7 @@ const AppContainer = () => {
           <Sider className="left-sidebar-col" width={60}>
             <LeftSidebar />
           </Sider>
-          <Content>
+          <Content className="main-content">
             <AuthenticatedAppRouter />
           </Content>
         </Layout>
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AppContainer/app-container.less b/openmetadata-ui/src/main/resources/ui/src/components/AppContainer/app-container.less
index d4ed6f146af..870fef02340 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/AppContainer/app-container.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/AppContainer/app-container.less
@@ -49,6 +49,9 @@
   .ant-layout-content {
     height: calc(100vh - 64px);
     overflow-y: auto;
-    overflow-x: hidden;
+  }
+  .main-content .my-data-page {
+    min-width: 900px;
+    overflow-x: auto;
   }
 }
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/Explore.style.less b/openmetadata-ui/src/main/resources/ui/src/components/Explore/Explore.style.less
deleted file mode 100644
index f8fcca5a9e5..00000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/Explore.style.less
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *  Copyright 2022 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-.explore-page-container {
-  padding-right: 0px !important;
-
-  .searched-data-container {
-    margin-top: 16px;
-    margin-right: 8px;
-  }
-
-  .ant-tabs-top > .ant-tabs-nav {
-    margin-bottom: 0px;
-    margin-right: 8px;
-  }
-
-  .error-placeholder-text {
-    font-size: 16px;
-  }
-}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/ExploreV1.style.less b/openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/ExploreV1.style.less
index e61578997eb..6706bb7e653 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/ExploreV1.style.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/ExploreV1.style.less
@@ -60,3 +60,7 @@
     line-height: 24px;
   }
 }
+
+.explore-page {
+  overflow-x: hidden;
+}