diff --git a/src/features/misc/modals/main/Main.jsx b/src/components/Elements/MainModal/Main.jsx
similarity index 82%
rename from src/features/misc/modals/main/Main.jsx
rename to src/components/Elements/MainModal/Main.jsx
index 77cc787b..71c235f8 100644
--- a/src/features/misc/modals/main/Main.jsx
+++ b/src/components/Elements/MainModal/Main.jsx
@@ -4,9 +4,9 @@ import { MdClose } from 'react-icons/md';
 
 import './scss/index.scss';
 import { Tooltip } from 'components/Elements';
-const Settings = lazy(() => import('./tabs/Settings'));
-const Addons = lazy(() => import('./tabs/Addons'));
-const Marketplace = lazy(() => import('./tabs/Marketplace'));
+const Settings = lazy(() => import('../../../features/misc/views/Settings'));
+const Addons = lazy(() => import('../../../features/misc/views/Addons'));
+const Marketplace = lazy(() => import('../../../features/misc/views/Marketplace'));
 
 const renderLoader = () => (
   <div style={{ display: 'flex', width: '100%', minHeight: '100%' }}>
@@ -60,4 +60,5 @@ function MainModal({ modalClose }) {
   );
 }
 
-export default memo(MainModal);
+const MemoizedMainModal = memo(MainModal);
+export { MemoizedMainModal as default, MemoizedMainModal as MainModal };
diff --git a/src/features/misc/modals/main/tabs/backend/Tab.jsx b/src/components/Elements/MainModal/backend/Tab.jsx
similarity index 100%
rename from src/features/misc/modals/main/tabs/backend/Tab.jsx
rename to src/components/Elements/MainModal/backend/Tab.jsx
diff --git a/src/features/misc/modals/main/tabs/backend/Tabs.jsx b/src/components/Elements/MainModal/backend/Tabs.jsx
similarity index 97%
rename from src/features/misc/modals/main/tabs/backend/Tabs.jsx
rename to src/components/Elements/MainModal/backend/Tabs.jsx
index 0c2f9f6e..591a9769 100644
--- a/src/features/misc/modals/main/tabs/backend/Tabs.jsx
+++ b/src/components/Elements/MainModal/backend/Tabs.jsx
@@ -9,7 +9,7 @@ import {
 } from 'react-icons/md';
 import Tab from './Tab';
 import { Button } from 'components/Elements';
-import ErrorBoundary from '../../../ErrorBoundary';
+import ErrorBoundary from '../../../../features/misc/modals/ErrorBoundary';
 
 class Tabs extends PureComponent {
   constructor(props) {
diff --git a/src/components/Elements/MainModal/index.jsx b/src/components/Elements/MainModal/index.jsx
new file mode 100644
index 00000000..9e300675
--- /dev/null
+++ b/src/components/Elements/MainModal/index.jsx
@@ -0,0 +1 @@
+export * from './Main';
diff --git a/src/features/misc/modals/main/scss/index.scss b/src/components/Elements/MainModal/scss/index.scss
similarity index 100%
rename from src/features/misc/modals/main/scss/index.scss
rename to src/components/Elements/MainModal/scss/index.scss
diff --git a/src/features/misc/modals/main/scss/marketplace/_main.scss b/src/components/Elements/MainModal/scss/marketplace/_main.scss
similarity index 100%
rename from src/features/misc/modals/main/scss/marketplace/_main.scss
rename to src/components/Elements/MainModal/scss/marketplace/_main.scss
diff --git a/src/features/misc/modals/main/scss/marketplace/modules/_buttons.scss b/src/components/Elements/MainModal/scss/marketplace/modules/_buttons.scss
similarity index 100%
rename from src/features/misc/modals/main/scss/marketplace/modules/_buttons.scss
rename to src/components/Elements/MainModal/scss/marketplace/modules/_buttons.scss
diff --git a/src/features/misc/modals/main/scss/marketplace/modules/_item.scss b/src/components/Elements/MainModal/scss/marketplace/modules/_item.scss
similarity index 100%
rename from src/features/misc/modals/main/scss/marketplace/modules/_item.scss
rename to src/components/Elements/MainModal/scss/marketplace/modules/_item.scss
diff --git a/src/features/misc/modals/main/scss/marketplace/modules/_lightbox.scss b/src/components/Elements/MainModal/scss/marketplace/modules/_lightbox.scss
similarity index 100%
rename from src/features/misc/modals/main/scss/marketplace/modules/_lightbox.scss
rename to src/components/Elements/MainModal/scss/marketplace/modules/_lightbox.scss
diff --git a/src/features/misc/modals/main/scss/modules/_links.scss b/src/components/Elements/MainModal/scss/modules/_links.scss
similarity index 100%
rename from src/features/misc/modals/main/scss/modules/_links.scss
rename to src/components/Elements/MainModal/scss/modules/_links.scss
diff --git a/src/features/misc/modals/main/scss/modules/_modalTabContent.scss b/src/components/Elements/MainModal/scss/modules/_modalTabContent.scss
similarity index 100%
rename from src/features/misc/modals/main/scss/modules/_modalTabContent.scss
rename to src/components/Elements/MainModal/scss/modules/_modalTabContent.scss
diff --git a/src/features/misc/modals/main/scss/modules/_navbar.scss b/src/components/Elements/MainModal/scss/modules/_navbar.scss
similarity index 100%
rename from src/features/misc/modals/main/scss/modules/_navbar.scss
rename to src/components/Elements/MainModal/scss/modules/_navbar.scss
diff --git a/src/features/misc/modals/main/scss/modules/_scrollbars.scss b/src/components/Elements/MainModal/scss/modules/_scrollbars.scss
similarity index 100%
rename from src/features/misc/modals/main/scss/modules/_scrollbars.scss
rename to src/components/Elements/MainModal/scss/modules/_scrollbars.scss
diff --git a/src/features/misc/modals/main/scss/modules/_sidebar.scss b/src/components/Elements/MainModal/scss/modules/_sidebar.scss
similarity index 100%
rename from src/features/misc/modals/main/scss/modules/_sidebar.scss
rename to src/components/Elements/MainModal/scss/modules/_sidebar.scss
diff --git a/src/features/misc/modals/main/scss/settings/_main.scss b/src/components/Elements/MainModal/scss/settings/_main.scss
similarity index 100%
rename from src/features/misc/modals/main/scss/settings/_main.scss
rename to src/components/Elements/MainModal/scss/settings/_main.scss
diff --git a/src/features/misc/modals/main/scss/settings/modules/_material-ui.scss b/src/components/Elements/MainModal/scss/settings/modules/_material-ui.scss
similarity index 100%
rename from src/features/misc/modals/main/scss/settings/modules/_material-ui.scss
rename to src/components/Elements/MainModal/scss/settings/modules/_material-ui.scss
diff --git a/src/features/misc/modals/main/scss/settings/modules/tabs/_about.scss b/src/components/Elements/MainModal/scss/settings/modules/tabs/_about.scss
similarity index 100%
rename from src/features/misc/modals/main/scss/settings/modules/tabs/_about.scss
rename to src/components/Elements/MainModal/scss/settings/modules/tabs/_about.scss
diff --git a/src/features/misc/modals/main/scss/settings/modules/tabs/_changelog.scss b/src/components/Elements/MainModal/scss/settings/modules/tabs/_changelog.scss
similarity index 100%
rename from src/features/misc/modals/main/scss/settings/modules/tabs/_changelog.scss
rename to src/components/Elements/MainModal/scss/settings/modules/tabs/_changelog.scss
diff --git a/src/features/misc/modals/main/scss/settings/modules/tabs/_order.scss b/src/components/Elements/MainModal/scss/settings/modules/tabs/_order.scss
similarity index 100%
rename from src/features/misc/modals/main/scss/settings/modules/tabs/_order.scss
rename to src/components/Elements/MainModal/scss/settings/modules/tabs/_order.scss
diff --git a/src/features/misc/modals/main/scss/settings/modules/tabs/_stats.scss b/src/components/Elements/MainModal/scss/settings/modules/tabs/_stats.scss
similarity index 100%
rename from src/features/misc/modals/main/scss/settings/modules/tabs/_stats.scss
rename to src/components/Elements/MainModal/scss/settings/modules/tabs/_stats.scss
diff --git a/src/components/Elements/index.jsx b/src/components/Elements/index.jsx
index 31a8ba4a..bf7a8d6e 100644
--- a/src/components/Elements/index.jsx
+++ b/src/components/Elements/index.jsx
@@ -3,3 +3,4 @@ export * from './Tooltip';
 export * from './ShareModal';
 export * from './AddModal';
 export * from './ResetModal';
+export * from './MainModal';
diff --git a/src/features/background/scss/_photoinformation.scss b/src/features/background/scss/_photoinformation.scss
index 75eedb59..d86116df 100644
--- a/src/features/background/scss/_photoinformation.scss
+++ b/src/features/background/scss/_photoinformation.scss
@@ -404,10 +404,6 @@
   display: none;
 }
 
-.stats {
-  display: none;
-}
-
 .buttons {
   align-items: center;
   gap: 20px;
diff --git a/src/features/misc/modals/Modals.jsx b/src/features/misc/modals/Modals.jsx
index d7c1e97d..eaa6b2ed 100644
--- a/src/features/misc/modals/Modals.jsx
+++ b/src/features/misc/modals/Modals.jsx
@@ -2,7 +2,7 @@ import variables from 'config/variables';
 import { PureComponent } from 'react';
 import Modal from 'react-modal';
 
-import Main from './main/Main';
+import { MainModal } from 'components/Elements';
 import Navbar from '../../navbar/Navbar';
 import Preview from '../../helpers/preview/Preview';
 
@@ -90,7 +90,7 @@ export default class Modals extends PureComponent {
           overlayClassName="Overlay"
           ariaHideApp={false}
         >
-          <Main modalClose={() => this.toggleModal('mainModal', false)} />
+          <MainModal modalClose={() => this.toggleModal('mainModal', false)} />
         </Modal>
         <Modal
           closeTimeoutMS={300}
diff --git a/src/features/misc/modals/main/tabs/Addons.jsx b/src/features/misc/views/Addons.jsx
similarity index 72%
rename from src/features/misc/modals/main/tabs/Addons.jsx
rename to src/features/misc/views/Addons.jsx
index 47883ba2..ec85d7ba 100644
--- a/src/features/misc/modals/main/tabs/Addons.jsx
+++ b/src/features/misc/views/Addons.jsx
@@ -1,9 +1,9 @@
 import variables from 'config/variables';
 import { memo } from 'react';
-import Tabs from './backend/Tabs';
+import Tabs from '../../../components/Elements/MainModal/backend/Tabs';
 
-import Added from '../../../../marketplace/views/Added';
-import Create from '../../../../marketplace/views/Create';
+import Added from '../../marketplace/views/Added';
+import Create from '../../marketplace/views/Create';
 
 function Addons(props) {
   return (
diff --git a/src/features/misc/modals/main/tabs/Marketplace.jsx b/src/features/misc/views/Marketplace.jsx
similarity index 88%
rename from src/features/misc/modals/main/tabs/Marketplace.jsx
rename to src/features/misc/views/Marketplace.jsx
index 64495084..58556c42 100644
--- a/src/features/misc/modals/main/tabs/Marketplace.jsx
+++ b/src/features/misc/views/Marketplace.jsx
@@ -1,8 +1,8 @@
 import variables from 'config/variables';
 import { memo } from 'react';
 
-import Tabs from './backend/Tabs';
-import MarketplaceTab from '../../../../marketplace/views/Browse';
+import Tabs from '../../../components/Elements/MainModal/backend/Tabs';
+import MarketplaceTab from '../../marketplace/views/Browse';
 
 function Marketplace(props) {
   return (
diff --git a/src/features/misc/modals/main/tabs/Settings.jsx b/src/features/misc/views/Settings.jsx
similarity index 82%
rename from src/features/misc/modals/main/tabs/Settings.jsx
rename to src/features/misc/views/Settings.jsx
index 0c469637..40fe0710 100644
--- a/src/features/misc/modals/main/tabs/Settings.jsx
+++ b/src/features/misc/views/Settings.jsx
@@ -1,9 +1,9 @@
 import variables from 'config/variables';
 import { memo } from 'react';
 
-import Tabs from './backend/Tabs';
+import Tabs from '../../../components/Elements/MainModal/backend/Tabs';
 
-import Overview from '../settings/sections/Overview';
+import Overview from '../modals/main/settings/sections/Overview';
 import { NavbarOptions } from 'features/navbar';
 import { GreetingOptions } from 'features/greeting';
 import { TimeOptions, DateOptions } from 'features/time';
@@ -13,13 +13,13 @@ import { MessageOptions } from 'features/message';
 import { BackgroundOptions } from 'features/background';
 import { SearchOptions } from 'features/search';
 import { WeatherOptions } from 'features/weather';
-import Appearance from '../settings/sections/Appearance';
-import Language from '../settings/sections/Language';
-import Advanced from '../settings/sections/Advanced';
-import Stats from '../settings/sections/Stats';
-import Experimental from '../settings/sections/Experimental';
-import Changelog from '../settings/sections/Changelog';
-import About from '../settings/sections/About';
+import Appearance from '../modals/main/settings/sections/Appearance';
+import Language from '../modals/main/settings/sections/Language';
+import Advanced from '../modals/main/settings/sections/Advanced';
+import Stats from '../modals/main/settings/sections/Stats';
+import Experimental from '../modals/main/settings/sections/Experimental';
+import Changelog from '../modals/main/settings/sections/Changelog';
+import About from '../modals/main/settings/sections/About';
 
 const sections = [
   { label: 'modals.main.marketplace.product.overview', name: 'order', component: Overview },