diff --git a/rare/components/tabs/games/game_info/game_dlc.py b/rare/components/tabs/games/game_info/game_dlc.py
index f1348890..7f0c375b 100644
--- a/rare/components/tabs/games/game_info/game_dlc.py
+++ b/rare/components/tabs/games/game_info/game_dlc.py
@@ -33,7 +33,7 @@ class GameDlc(QWidget, Ui_GameDlc):
     def update_dlcs(self, app_name):
         self.game = self.core.get_game(app_name)
         dlcs = self.dlcs[self.game.catalog_item_id]
-        self.game_title.setText(f"<h2>{self.game.app_title}</h2>")
+        self.title.setTitle(self.game.app_title)
 
         if self.installed_dlc_widgets:
             for dlc_widget in self.installed_dlc_widgets:
diff --git a/rare/components/tabs/games/game_info/game_info.py b/rare/components/tabs/games/game_info/game_info.py
index 5d24b15b..4b005515 100644
--- a/rare/components/tabs/games/game_info/game_info.py
+++ b/rare/components/tabs/games/game_info/game_info.py
@@ -138,7 +138,7 @@ class GameInfo(QWidget, Ui_GameInfo):
     def update_game(self, app_name: str):
         self.game = self.core.get_game(app_name)
         self.igame = self.core.get_installed_game(self.game.app_name)
-        self.game_title.setText(f"<h2>{self.game.app_title}</h2>")
+        self.title.setTitle(self.game.app_title)
 
         pixmap = get_pixmap(self.game.app_name)
         if pixmap.isNull():
diff --git a/rare/components/tabs/games/game_info/game_settings.py b/rare/components/tabs/games/game_info/game_settings.py
index 9b84db4c..bf383b07 100644
--- a/rare/components/tabs/games/game_info/game_settings.py
+++ b/rare/components/tabs/games/game_info/game_settings.py
@@ -136,7 +136,7 @@ class GameSettings(QWidget, Ui_GameSettings):
             self.linux_settings_layout.setAlignment(Qt.AlignTop)
         else:
             self.linux_settings_widget.setVisible(False)
-        self.game_settings_contents_layout.setAlignment(Qt.AlignTop)
+        self.game_settings_layout.setAlignment(Qt.AlignTop)
 
         self.linux_settings.mangohud.set_wrapper_activated.connect(
             lambda active: self.wrapper_settings.add_wrapper("mangohud")
@@ -309,7 +309,7 @@ class GameSettings(QWidget, Ui_GameSettings):
         else:
             self.skip_update.setCurrentIndex(0)
 
-        self.game_title.setText(f"<h2>{self.game.app_title}</h2>")
+        self.title.setTitle(self.game.app_title)
         self.wrapper_settings.load_settings(app_name)
         if platform.system() != "Windows":
             self.linux_settings.update_game(app_name)
diff --git a/rare/components/tabs/games/game_info/uninstalled_info.py b/rare/components/tabs/games/game_info/uninstalled_info.py
index 40ed1390..a8f418d3 100644
--- a/rare/components/tabs/games/game_info/uninstalled_info.py
+++ b/rare/components/tabs/games/game_info/uninstalled_info.py
@@ -83,7 +83,7 @@ class UninstalledInfo(QWidget, Ui_GameInfo):
 
     def update_game(self, game: Game):
         self.game = game
-        self.game_title.setText(f"<h2>{self.game.app_title}</h2>")
+        self.title.setTitle(self.game.app_title)
         available_platforms = ["Windows"]
         if self.game.app_name in self.api_results.bit32_games:
             available_platforms.append("32 Bit")
diff --git a/rare/components/tabs/games/import_sync/__init__.py b/rare/components/tabs/games/import_sync/__init__.py
index f9555d0f..cba2a520 100644
--- a/rare/components/tabs/games/import_sync/__init__.py
+++ b/rare/components/tabs/games/import_sync/__init__.py
@@ -10,7 +10,6 @@ class ImportSyncTabs(SideTabWidget):
         super(ImportSyncTabs, self).__init__(show_back=True, parent=parent)
         self.import_widget = ImportSyncWidget(
             ImportGroup(self),
-            self.tr("Import Game"),
             self.tr("To import games from Epic Games Store, please enable EGL Sync."),
             self,
         )
@@ -18,13 +17,10 @@ class ImportSyncTabs(SideTabWidget):
 
         self.egl_sync_widget = ImportSyncWidget(
             EGLSyncGroup(self),
-            self.tr("Sync with EGL"),
             self.tr("To import EGL games from directories, please use Import Game."),
             self,
         )
         self.addTab(self.egl_sync_widget, self.tr("Sync with EGL"))
-        # FIXME: Until it is ready
-        # self.setTabEnabled(2, False)
 
         self.tabBar().setCurrentIndex(1)
 
@@ -36,17 +32,14 @@ class ImportSyncTabs(SideTabWidget):
 
 
 class ImportSyncWidget(QWidget):
-    def __init__(self, widget: QWidget, title: str, info: str, parent=None):
+    def __init__(self, widget: QWidget, info: str, parent=None):
         super(ImportSyncWidget, self).__init__(parent=parent)
-        self.layout = QVBoxLayout()
-        self.title = QLabel(f"<h2>{title}</h2")
-        self.layout.addWidget(self.title)
-        self.title.setVisible(False)
-        self.group = widget
-        self.layout.addWidget(self.group)
         self.info = QLabel(f"<h4>{info}</h4>")
-        self.layout.addWidget(self.info)
-        self.layout.addItem(
+
+        layout = QVBoxLayout()
+        layout.addWidget(widget)
+        layout.addWidget(self.info)
+        layout.addItem(
             QSpacerItem(20, 40, QSizePolicy.Minimum, QSizePolicy.Expanding)
         )
-        self.setLayout(self.layout)
+        self.setLayout(layout)
diff --git a/rare/components/tabs/settings/__init__.py b/rare/components/tabs/settings/__init__.py
index 7d444467..cab992c8 100644
--- a/rare/components/tabs/settings/__init__.py
+++ b/rare/components/tabs/settings/__init__.py
@@ -21,7 +21,7 @@ class SettingsTab(SideTabWidget):
             about_tab = 3
 
         self.about = About()
-        self.addTab(self.about, "About")
+        self.addTab(self.about, "About", "About")
         self.about.update_available_ready.connect(
             lambda: self.tabBar().setTabText(about_tab, "About (!)")
         )
diff --git a/rare/components/tabs/settings/widgets/eos.py b/rare/components/tabs/settings/widgets/eos.py
index 1655772b..28bbad87 100644
--- a/rare/components/tabs/settings/widgets/eos.py
+++ b/rare/components/tabs/settings/widgets/eos.py
@@ -8,7 +8,7 @@ from PyQt5.QtWidgets import QGroupBox, QMessageBox
 
 from legendary.utils import eos
 from rare.shared import LegendaryCoreSingleton, GlobalSignalsSingleton
-from rare.ui.components.tabs.settings.eos_widget import Ui_EosWidget
+from rare.ui.components.tabs.settings.widgets.eos_widget import Ui_EosWidget
 from rare.utils.models import InstallOptionsModel
 
 logger = getLogger("EOS")
diff --git a/rare/components/tabs/settings/widgets/overlay_settings.py b/rare/components/tabs/settings/widgets/overlay_settings.py
index 421b6c84..a6bfd6ac 100644
--- a/rare/components/tabs/settings/widgets/overlay_settings.py
+++ b/rare/components/tabs/settings/widgets/overlay_settings.py
@@ -5,9 +5,8 @@ from typing import List, Dict, Tuple, Any, Callable
 from PyQt5.QtGui import QIntValidator, QDoubleValidator
 from PyQt5.QtWidgets import QGroupBox, QCheckBox, QWidget, QLineEdit, QLabel, QComboBox
 
-from rare import shared
 from rare.shared import LegendaryCoreSingleton
-from rare.ui.components.tabs.settings.overlay import Ui_OverlaySettings
+from rare.ui.components.tabs.settings.widgets.overlay import Ui_OverlaySettings
 from rare.utils import config_helper
 
 logger = getLogger("Overlay")
diff --git a/rare/components/tabs/settings/widgets/rpc.py b/rare/components/tabs/settings/widgets/rpc.py
index 34996947..c6ef4339 100644
--- a/rare/components/tabs/settings/widgets/rpc.py
+++ b/rare/components/tabs/settings/widgets/rpc.py
@@ -2,7 +2,7 @@ from PyQt5.QtCore import QSettings
 from PyQt5.QtWidgets import QGroupBox
 
 from rare.shared import GlobalSignalsSingleton
-from rare.ui.components.tabs.settings.rpc import Ui_RPCSettings
+from rare.ui.components.tabs.settings.widgets.rpc import Ui_RPCSettings
 
 
 class RPCSettings(QGroupBox, Ui_RPCSettings):
diff --git a/rare/components/tabs/settings/widgets/wrapper.py b/rare/components/tabs/settings/widgets/wrapper.py
index d3aae112..a77ebd12 100644
--- a/rare/components/tabs/settings/widgets/wrapper.py
+++ b/rare/components/tabs/settings/widgets/wrapper.py
@@ -9,7 +9,7 @@ from PyQt5.QtWidgets import QHBoxLayout, QLabel, QPushButton, QInputDialog, QFra
     QWidget
 
 from rare import shared
-from rare.ui.components.tabs.settings.wrapper import Ui_WrapperSettings
+from rare.ui.components.tabs.settings.widgets.wrapper import Ui_WrapperSettings
 from rare.utils import config_helper
 from rare.utils.utils import icon
 
diff --git a/rare/ui/components/tabs/games/game_info/game_dlc.py b/rare/ui/components/tabs/games/game_info/game_dlc.py
index 0a6716e4..6a42d4ef 100644
--- a/rare/ui/components/tabs/games/game_info/game_dlc.py
+++ b/rare/ui/components/tabs/games/game_info/game_dlc.py
@@ -14,19 +14,9 @@ from PyQt5 import QtCore, QtGui, QtWidgets
 class Ui_GameDlc(object):
     def setupUi(self, GameDlc):
         GameDlc.setObjectName("GameDlc")
-        GameDlc.resize(287, 366)
+        GameDlc.resize(287, 354)
         self.game_dlc_layout = QtWidgets.QVBoxLayout(GameDlc)
         self.game_dlc_layout.setObjectName("game_dlc_layout")
-        self.game_title = QtWidgets.QLabel(GameDlc)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.game_title.sizePolicy().hasHeightForWidth())
-        self.game_title.setSizePolicy(sizePolicy)
-        self.game_title.setText("error")
-        self.game_title.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextSelectableByMouse)
-        self.game_title.setObjectName("game_title")
-        self.game_dlc_layout.addWidget(self.game_title, 0, QtCore.Qt.AlignTop)
         self.installed_dlc_group = QtWidgets.QGroupBox(GameDlc)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
diff --git a/rare/ui/components/tabs/games/game_info/game_dlc.ui b/rare/ui/components/tabs/games/game_info/game_dlc.ui
index 4728bf17..020fd1db 100644
--- a/rare/ui/components/tabs/games/game_info/game_dlc.ui
+++ b/rare/ui/components/tabs/games/game_info/game_dlc.ui
@@ -7,29 +7,13 @@
     <x>0</x>
     <y>0</y>
     <width>287</width>
-    <height>366</height>
+    <height>354</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>GameDlc</string>
   </property>
   <layout class="QVBoxLayout" name="game_dlc_layout">
-   <item alignment="Qt::AlignTop">
-    <widget class="QLabel" name="game_title">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">error</string>
-     </property>
-     <property name="textInteractionFlags">
-      <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
-     </property>
-    </widget>
-   </item>
    <item>
     <widget class="QGroupBox" name="installed_dlc_group">
      <property name="sizePolicy">
diff --git a/rare/ui/components/tabs/games/game_info/game_info.py b/rare/ui/components/tabs/games/game_info/game_info.py
index dc3633e8..e3c23b1d 100644
--- a/rare/ui/components/tabs/games/game_info/game_info.py
+++ b/rare/ui/components/tabs/games/game_info/game_info.py
@@ -14,23 +14,27 @@ from PyQt5 import QtCore, QtGui, QtWidgets
 class Ui_GameInfo(object):
     def setupUi(self, GameInfo):
         GameInfo.setObjectName("GameInfo")
-        GameInfo.resize(571, 326)
-        self.layout_game_info = QtWidgets.QGridLayout(GameInfo)
+        GameInfo.resize(414, 340)
+        self.layout_game_info = QtWidgets.QHBoxLayout(GameInfo)
+        self.layout_game_info.setSizeConstraint(QtWidgets.QLayout.SetFixedSize)
         self.layout_game_info.setObjectName("layout_game_info")
+        self.image = QtWidgets.QLabel(GameInfo)
+        self.image.setFrameShape(QtWidgets.QFrame.StyledPanel)
+        self.image.setFrameShadow(QtWidgets.QFrame.Sunken)
+        self.image.setText("")
+        self.image.setObjectName("image")
+        self.layout_game_info.addWidget(self.image, 0, QtCore.Qt.AlignTop)
         self.layout_game_info_form = QtWidgets.QGridLayout()
         self.layout_game_info_form.setContentsMargins(6, 6, 6, 6)
         self.layout_game_info_form.setSpacing(12)
         self.layout_game_info_form.setObjectName("layout_game_info_form")
-        spacerItem = QtWidgets.QSpacerItem(20, 0, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.layout_game_info_form.addItem(spacerItem, 9, 0, 1, 1)
-        self.lbl_platform = QtWidgets.QLabel(GameInfo)
-        font = QtGui.QFont()
-        font.setBold(True)
-        font.setWeight(75)
-        self.lbl_platform.setFont(font)
-        self.lbl_platform.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.lbl_platform.setObjectName("lbl_platform")
-        self.layout_game_info_form.addWidget(self.lbl_platform, 6, 0, 1, 1)
+        spacerItem = QtWidgets.QSpacerItem(0, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.layout_game_info_form.addItem(spacerItem, 8, 1, 1, 1)
+        self.dev = QtWidgets.QLabel(GameInfo)
+        self.dev.setText("error")
+        self.dev.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextSelectableByMouse)
+        self.dev.setObjectName("dev")
+        self.layout_game_info_form.addWidget(self.dev, 0, 1, 1, 1)
         self.lbl_dev = QtWidgets.QLabel(GameInfo)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
@@ -43,11 +47,42 @@ class Ui_GameInfo(object):
         self.lbl_dev.setFont(font)
         self.lbl_dev.setObjectName("lbl_dev")
         self.layout_game_info_form.addWidget(self.lbl_dev, 0, 0, 1, 1, QtCore.Qt.AlignRight)
+        self.app_name = QtWidgets.QLabel(GameInfo)
+        self.app_name.setText("error")
+        self.app_name.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextSelectableByMouse)
+        self.app_name.setObjectName("app_name")
+        self.layout_game_info_form.addWidget(self.app_name, 1, 1, 1, 1)
+        self.install_path = QtWidgets.QLabel(GameInfo)
+        self.install_path.setText("error")
+        self.install_path.setWordWrap(True)
+        self.install_path.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextSelectableByMouse)
+        self.install_path.setObjectName("install_path")
+        self.layout_game_info_form.addWidget(self.install_path, 5, 1, 1, 1)
+        self.lbl_platform = QtWidgets.QLabel(GameInfo)
+        font = QtGui.QFont()
+        font.setBold(True)
+        font.setWeight(75)
+        self.lbl_platform.setFont(font)
+        self.lbl_platform.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.lbl_platform.setObjectName("lbl_platform")
+        self.layout_game_info_form.addWidget(self.lbl_platform, 6, 0, 1, 1)
         self.version = QtWidgets.QLabel(GameInfo)
         self.version.setText("error")
         self.version.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextSelectableByMouse)
         self.version.setObjectName("version")
-        self.layout_game_info_form.addWidget(self.version, 2, 2, 1, 1)
+        self.layout_game_info_form.addWidget(self.version, 2, 1, 1, 1)
+        self.lbl_install_path = QtWidgets.QLabel(GameInfo)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.lbl_install_path.sizePolicy().hasHeightForWidth())
+        self.lbl_install_path.setSizePolicy(sizePolicy)
+        font = QtGui.QFont()
+        font.setBold(True)
+        font.setWeight(75)
+        self.lbl_install_path.setFont(font)
+        self.lbl_install_path.setObjectName("lbl_install_path")
+        self.layout_game_info_form.addWidget(self.lbl_install_path, 5, 0, 1, 1, QtCore.Qt.AlignRight)
         self.lbl_install_size = QtWidgets.QLabel(GameInfo)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
@@ -60,6 +95,12 @@ class Ui_GameInfo(object):
         self.lbl_install_size.setFont(font)
         self.lbl_install_size.setObjectName("lbl_install_size")
         self.layout_game_info_form.addWidget(self.lbl_install_size, 4, 0, 1, 1, QtCore.Qt.AlignRight)
+        spacerItem1 = QtWidgets.QSpacerItem(20, 0, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        self.layout_game_info_form.addItem(spacerItem1, 8, 0, 1, 1)
+        self.platform = QtWidgets.QLabel(GameInfo)
+        self.platform.setText("error")
+        self.platform.setObjectName("platform")
+        self.layout_game_info_form.addWidget(self.platform, 6, 1, 1, 1)
         self.game_actions_stack = QtWidgets.QStackedWidget(GameInfo)
         self.game_actions_stack.setMinimumSize(QtCore.QSize(250, 0))
         self.game_actions_stack.setObjectName("game_actions_stack")
@@ -109,60 +150,12 @@ class Ui_GameInfo(object):
         self.install_button.setObjectName("install_button")
         self.uninstalled_layout.addWidget(self.install_button)
         self.game_actions_stack.addWidget(self.uninstalled_page)
-        self.layout_game_info_form.addWidget(self.game_actions_stack, 8, 2, 1, 1, QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop)
-        self.app_name = QtWidgets.QLabel(GameInfo)
-        self.app_name.setText("error")
-        self.app_name.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextSelectableByMouse)
-        self.app_name.setObjectName("app_name")
-        self.layout_game_info_form.addWidget(self.app_name, 1, 2, 1, 1)
-        self.dev = QtWidgets.QLabel(GameInfo)
-        self.dev.setText("error")
-        self.dev.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextSelectableByMouse)
-        self.dev.setObjectName("dev")
-        self.layout_game_info_form.addWidget(self.dev, 0, 2, 1, 1)
-        self.lbl_game_actions = QtWidgets.QLabel(GameInfo)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.lbl_game_actions.sizePolicy().hasHeightForWidth())
-        self.lbl_game_actions.setSizePolicy(sizePolicy)
-        font = QtGui.QFont()
-        font.setBold(True)
-        font.setWeight(75)
-        self.lbl_game_actions.setFont(font)
-        self.lbl_game_actions.setObjectName("lbl_game_actions")
-        self.layout_game_info_form.addWidget(self.lbl_game_actions, 8, 0, 1, 1, QtCore.Qt.AlignRight)
-        spacerItem1 = QtWidgets.QSpacerItem(0, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.layout_game_info_form.addItem(spacerItem1, 9, 2, 1, 1)
+        self.layout_game_info_form.addWidget(self.game_actions_stack, 7, 1, 1, 1, QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop)
         self.install_size = QtWidgets.QLabel(GameInfo)
         self.install_size.setText("error")
         self.install_size.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextSelectableByMouse)
         self.install_size.setObjectName("install_size")
-        self.layout_game_info_form.addWidget(self.install_size, 4, 2, 1, 1)
-        self.grade = QtWidgets.QLabel(GameInfo)
-        self.grade.setText("error")
-        self.grade.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextSelectableByMouse)
-        self.grade.setObjectName("grade")
-        self.layout_game_info_form.addWidget(self.grade, 3, 2, 1, 1)
-        self.lbl_grade = QtWidgets.QLabel(GameInfo)
-        font = QtGui.QFont()
-        font.setBold(True)
-        font.setWeight(75)
-        self.lbl_grade.setFont(font)
-        self.lbl_grade.setObjectName("lbl_grade")
-        self.layout_game_info_form.addWidget(self.lbl_grade, 3, 0, 1, 1, QtCore.Qt.AlignRight)
-        self.lbl_install_path = QtWidgets.QLabel(GameInfo)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.lbl_install_path.sizePolicy().hasHeightForWidth())
-        self.lbl_install_path.setSizePolicy(sizePolicy)
-        font = QtGui.QFont()
-        font.setBold(True)
-        font.setWeight(75)
-        self.lbl_install_path.setFont(font)
-        self.lbl_install_path.setObjectName("lbl_install_path")
-        self.layout_game_info_form.addWidget(self.lbl_install_path, 5, 0, 1, 1, QtCore.Qt.AlignRight)
+        self.layout_game_info_form.addWidget(self.install_size, 4, 1, 1, 1)
         self.lbl_version = QtWidgets.QLabel(GameInfo)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
@@ -175,6 +168,25 @@ class Ui_GameInfo(object):
         self.lbl_version.setFont(font)
         self.lbl_version.setObjectName("lbl_version")
         self.layout_game_info_form.addWidget(self.lbl_version, 2, 0, 1, 1, QtCore.Qt.AlignRight)
+        self.lbl_game_actions = QtWidgets.QLabel(GameInfo)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.lbl_game_actions.sizePolicy().hasHeightForWidth())
+        self.lbl_game_actions.setSizePolicy(sizePolicy)
+        font = QtGui.QFont()
+        font.setBold(True)
+        font.setWeight(75)
+        self.lbl_game_actions.setFont(font)
+        self.lbl_game_actions.setObjectName("lbl_game_actions")
+        self.layout_game_info_form.addWidget(self.lbl_game_actions, 7, 0, 1, 1, QtCore.Qt.AlignRight)
+        self.lbl_grade = QtWidgets.QLabel(GameInfo)
+        font = QtGui.QFont()
+        font.setBold(True)
+        font.setWeight(75)
+        self.lbl_grade.setFont(font)
+        self.lbl_grade.setObjectName("lbl_grade")
+        self.layout_game_info_form.addWidget(self.lbl_grade, 3, 0, 1, 1, QtCore.Qt.AlignRight)
         self.lbl_app_name = QtWidgets.QLabel(GameInfo)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
@@ -187,49 +199,33 @@ class Ui_GameInfo(object):
         self.lbl_app_name.setFont(font)
         self.lbl_app_name.setObjectName("lbl_app_name")
         self.layout_game_info_form.addWidget(self.lbl_app_name, 1, 0, 1, 1, QtCore.Qt.AlignRight)
-        self.install_path = QtWidgets.QLabel(GameInfo)
-        self.install_path.setText("error")
-        self.install_path.setWordWrap(True)
-        self.install_path.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextSelectableByMouse)
-        self.install_path.setObjectName("install_path")
-        self.layout_game_info_form.addWidget(self.install_path, 5, 2, 1, 1)
-        self.platform = QtWidgets.QLabel(GameInfo)
-        self.platform.setObjectName("platform")
-        self.layout_game_info_form.addWidget(self.platform, 6, 2, 1, 1)
-        self.layout_game_info.addLayout(self.layout_game_info_form, 2, 1, 1, 1)
-        self.game_title = QtWidgets.QLabel(GameInfo)
-        self.game_title.setText("error")
-        self.game_title.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextSelectableByMouse)
-        self.game_title.setObjectName("game_title")
-        self.layout_game_info.addWidget(self.game_title, 0, 0, 1, 3)
-        self.image = QtWidgets.QLabel(GameInfo)
-        self.image.setFrameShape(QtWidgets.QFrame.StyledPanel)
-        self.image.setFrameShadow(QtWidgets.QFrame.Sunken)
-        self.image.setText("")
-        self.image.setObjectName("image")
-        self.layout_game_info.addWidget(self.image, 2, 0, 1, 1, QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop)
+        self.grade = QtWidgets.QLabel(GameInfo)
+        self.grade.setText("error")
+        self.grade.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextSelectableByMouse)
+        self.grade.setObjectName("grade")
+        self.layout_game_info_form.addWidget(self.grade, 3, 1, 1, 1)
+        self.layout_game_info.addLayout(self.layout_game_info_form)
 
         self.retranslateUi(GameInfo)
-        self.game_actions_stack.setCurrentIndex(1)
+        self.game_actions_stack.setCurrentIndex(0)
         self.verify_widget.setCurrentIndex(0)
         QtCore.QMetaObject.connectSlotsByName(GameInfo)
 
     def retranslateUi(self, GameInfo):
         _translate = QtCore.QCoreApplication.translate
         GameInfo.setWindowTitle(_translate("GameInfo", "Game Info"))
-        self.lbl_platform.setText(_translate("GameInfo", "Platform"))
         self.lbl_dev.setText(_translate("GameInfo", "Developer"))
+        self.lbl_platform.setText(_translate("GameInfo", "Platform"))
+        self.lbl_install_path.setText(_translate("GameInfo", "Installation Path"))
         self.lbl_install_size.setText(_translate("GameInfo", "Installation Size"))
         self.verify_button.setText(_translate("GameInfo", "Verify Installation"))
         self.repair_button.setText(_translate("GameInfo", "Repair Instalation"))
         self.uninstall_button.setText(_translate("GameInfo", "Uninstall Game"))
         self.install_button.setText(_translate("GameInfo", "Install Game"))
+        self.lbl_version.setText(_translate("GameInfo", "Version"))
         self.lbl_game_actions.setText(_translate("GameInfo", "Actions"))
         self.lbl_grade.setText(_translate("GameInfo", "ProtonDB Grade"))
-        self.lbl_install_path.setText(_translate("GameInfo", "Installation Path"))
-        self.lbl_version.setText(_translate("GameInfo", "Version"))
         self.lbl_app_name.setText(_translate("GameInfo", "Application Name"))
-        self.platform.setText(_translate("GameInfo", "error"))
 
 
 if __name__ == "__main__":
diff --git a/rare/ui/components/tabs/games/game_info/game_info.ui b/rare/ui/components/tabs/games/game_info/game_info.ui
index e5fc8901..4c35b941 100644
--- a/rare/ui/components/tabs/games/game_info/game_info.ui
+++ b/rare/ui/components/tabs/games/game_info/game_info.ui
@@ -6,15 +6,31 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>571</width>
-    <height>326</height>
+    <width>414</width>
+    <height>340</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Game Info</string>
   </property>
-  <layout class="QGridLayout" name="layout_game_info">
-   <item row="2" column="1">
+  <layout class="QHBoxLayout" name="layout_game_info">
+   <property name="sizeConstraint">
+    <enum>QLayout::SetFixedSize</enum>
+   </property>
+   <item alignment="Qt::AlignTop">
+    <widget class="QLabel" name="image">
+     <property name="frameShape">
+      <enum>QFrame::StyledPanel</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Sunken</enum>
+     </property>
+     <property name="text">
+      <string notr="true"/>
+     </property>
+    </widget>
+   </item>
+   <item>
     <layout class="QGridLayout" name="layout_game_info_form">
      <property name="leftMargin">
       <number>6</number>
@@ -31,32 +47,26 @@
      <property name="spacing">
       <number>12</number>
      </property>
-     <item row="9" column="0">
-      <spacer name="vs_game_info_form">
+     <item row="8" column="1">
+      <spacer name="hs_game_info_form">
        <property name="orientation">
-        <enum>Qt::Vertical</enum>
+        <enum>Qt::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
-         <width>20</width>
-         <height>0</height>
+         <width>0</width>
+         <height>20</height>
         </size>
        </property>
       </spacer>
      </item>
-     <item row="6" column="0">
-      <widget class="QLabel" name="lbl_platform">
-       <property name="font">
-        <font>
-         <weight>75</weight>
-         <bold>true</bold>
-        </font>
-       </property>
+     <item row="0" column="1">
+      <widget class="QLabel" name="dev">
        <property name="text">
-        <string>Platform</string>
+        <string notr="true">error</string>
        </property>
-       <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       <property name="textInteractionFlags">
+        <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
        </property>
       </widget>
      </item>
@@ -79,7 +89,46 @@
        </property>
       </widget>
      </item>
-     <item row="2" column="2">
+     <item row="1" column="1">
+      <widget class="QLabel" name="app_name">
+       <property name="text">
+        <string notr="true">error</string>
+       </property>
+       <property name="textInteractionFlags">
+        <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+       </property>
+      </widget>
+     </item>
+     <item row="5" column="1">
+      <widget class="QLabel" name="install_path">
+       <property name="text">
+        <string notr="true">error</string>
+       </property>
+       <property name="wordWrap">
+        <bool>true</bool>
+       </property>
+       <property name="textInteractionFlags">
+        <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+       </property>
+      </widget>
+     </item>
+     <item row="6" column="0">
+      <widget class="QLabel" name="lbl_platform">
+       <property name="font">
+        <font>
+         <weight>75</weight>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string>Platform</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
       <widget class="QLabel" name="version">
        <property name="text">
         <string notr="true">error</string>
@@ -89,6 +138,25 @@
        </property>
       </widget>
      </item>
+     <item row="5" column="0" alignment="Qt::AlignRight">
+      <widget class="QLabel" name="lbl_install_path">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="font">
+        <font>
+         <weight>75</weight>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string>Installation Path</string>
+       </property>
+      </widget>
+     </item>
      <item row="4" column="0" alignment="Qt::AlignRight">
       <widget class="QLabel" name="lbl_install_size">
        <property name="sizePolicy">
@@ -108,7 +176,27 @@
        </property>
       </widget>
      </item>
-     <item row="8" column="2" alignment="Qt::AlignLeft|Qt::AlignTop">
+     <item row="8" column="0">
+      <spacer name="vs_game_info_form">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>0</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="6" column="1">
+      <widget class="QLabel" name="platform">
+       <property name="text">
+        <string notr="true">error</string>
+       </property>
+      </widget>
+     </item>
+     <item row="7" column="1" alignment="Qt::AlignLeft|Qt::AlignTop">
       <widget class="QStackedWidget" name="game_actions_stack">
        <property name="minimumSize">
         <size>
@@ -117,7 +205,7 @@
         </size>
        </property>
        <property name="currentIndex">
-        <number>1</number>
+        <number>0</number>
        </property>
        <widget class="QWidget" name="installed_page">
         <layout class="QVBoxLayout" name="installed_layout">
@@ -227,59 +315,7 @@
        </widget>
       </widget>
      </item>
-     <item row="1" column="2">
-      <widget class="QLabel" name="app_name">
-       <property name="text">
-        <string notr="true">error</string>
-       </property>
-       <property name="textInteractionFlags">
-        <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="2">
-      <widget class="QLabel" name="dev">
-       <property name="text">
-        <string notr="true">error</string>
-       </property>
-       <property name="textInteractionFlags">
-        <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
-       </property>
-      </widget>
-     </item>
-     <item row="8" column="0" alignment="Qt::AlignRight">
-      <widget class="QLabel" name="lbl_game_actions">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="font">
-        <font>
-         <weight>75</weight>
-         <bold>true</bold>
-        </font>
-       </property>
-       <property name="text">
-        <string>Actions</string>
-       </property>
-      </widget>
-     </item>
-     <item row="9" column="2">
-      <spacer name="hs_game_info_form">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>0</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item row="4" column="2">
+     <item row="4" column="1">
       <widget class="QLabel" name="install_size">
        <property name="text">
         <string notr="true">error</string>
@@ -289,48 +325,6 @@
        </property>
       </widget>
      </item>
-     <item row="3" column="2">
-      <widget class="QLabel" name="grade">
-       <property name="text">
-        <string notr="true">error</string>
-       </property>
-       <property name="textInteractionFlags">
-        <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
-       </property>
-      </widget>
-     </item>
-     <item row="3" column="0" alignment="Qt::AlignRight">
-      <widget class="QLabel" name="lbl_grade">
-       <property name="font">
-        <font>
-         <weight>75</weight>
-         <bold>true</bold>
-        </font>
-       </property>
-       <property name="text">
-        <string>ProtonDB Grade</string>
-       </property>
-      </widget>
-     </item>
-     <item row="5" column="0" alignment="Qt::AlignRight">
-      <widget class="QLabel" name="lbl_install_path">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="font">
-        <font>
-         <weight>75</weight>
-         <bold>true</bold>
-        </font>
-       </property>
-       <property name="text">
-        <string>Installation Path</string>
-       </property>
-      </widget>
-     </item>
      <item row="2" column="0" alignment="Qt::AlignRight">
       <widget class="QLabel" name="lbl_version">
        <property name="sizePolicy">
@@ -350,6 +344,38 @@
        </property>
       </widget>
      </item>
+     <item row="7" column="0" alignment="Qt::AlignRight">
+      <widget class="QLabel" name="lbl_game_actions">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="font">
+        <font>
+         <weight>75</weight>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string>Actions</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="0" alignment="Qt::AlignRight">
+      <widget class="QLabel" name="lbl_grade">
+       <property name="font">
+        <font>
+         <weight>75</weight>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string>ProtonDB Grade</string>
+       </property>
+      </widget>
+     </item>
      <item row="1" column="0" alignment="Qt::AlignRight">
       <widget class="QLabel" name="lbl_app_name">
        <property name="sizePolicy">
@@ -369,51 +395,18 @@
        </property>
       </widget>
      </item>
-     <item row="5" column="2">
-      <widget class="QLabel" name="install_path">
+     <item row="3" column="1">
+      <widget class="QLabel" name="grade">
        <property name="text">
         <string notr="true">error</string>
        </property>
-       <property name="wordWrap">
-        <bool>true</bool>
-       </property>
        <property name="textInteractionFlags">
         <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
        </property>
       </widget>
      </item>
-     <item row="6" column="2">
-      <widget class="QLabel" name="platform">
-       <property name="text">
-        <string notr="true">error</string>
-       </property>
-      </widget>
-     </item>
     </layout>
    </item>
-   <item row="0" column="0" colspan="3">
-    <widget class="QLabel" name="game_title">
-     <property name="text">
-      <string notr="true">error</string>
-     </property>
-     <property name="textInteractionFlags">
-      <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0" alignment="Qt::AlignLeft|Qt::AlignTop">
-    <widget class="QLabel" name="image">
-     <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Sunken</enum>
-     </property>
-     <property name="text">
-      <string notr="true"/>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <resources/>
diff --git a/rare/ui/components/tabs/games/game_info/game_settings.py b/rare/ui/components/tabs/games/game_info/game_settings.py
index a3355858..b3a8bcb8 100644
--- a/rare/ui/components/tabs/games/game_info/game_settings.py
+++ b/rare/ui/components/tabs/games/game_info/game_settings.py
@@ -14,28 +14,10 @@ from PyQt5 import QtCore, QtGui, QtWidgets
 class Ui_GameSettings(object):
     def setupUi(self, GameSettings):
         GameSettings.setObjectName("GameSettings")
-        GameSettings.resize(759, 617)
+        GameSettings.resize(545, 348)
         self.game_settings_layout = QtWidgets.QVBoxLayout(GameSettings)
         self.game_settings_layout.setObjectName("game_settings_layout")
-        self.game_title = QtWidgets.QLabel(GameSettings)
-        self.game_title.setText("error")
-        self.game_title.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextSelectableByMouse)
-        self.game_title.setObjectName("game_title")
-        self.game_settings_layout.addWidget(self.game_title, 0, QtCore.Qt.AlignTop)
-        self.game_settings_scroll = QtWidgets.QScrollArea(GameSettings)
-        self.game_settings_scroll.setFrameShape(QtWidgets.QFrame.NoFrame)
-        self.game_settings_scroll.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
-        self.game_settings_scroll.setSizeAdjustPolicy(QtWidgets.QAbstractScrollArea.AdjustToContents)
-        self.game_settings_scroll.setWidgetResizable(True)
-        self.game_settings_scroll.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop)
-        self.game_settings_scroll.setObjectName("game_settings_scroll")
-        self.game_settings_contents = QtWidgets.QWidget()
-        self.game_settings_contents.setGeometry(QtCore.QRect(0, 0, 747, 585))
-        self.game_settings_contents.setObjectName("game_settings_contents")
-        self.game_settings_contents_layout = QtWidgets.QVBoxLayout(self.game_settings_contents)
-        self.game_settings_contents_layout.setContentsMargins(0, 0, 9, 0)
-        self.game_settings_contents_layout.setObjectName("game_settings_contents_layout")
-        self.launch_settings_group = QtWidgets.QGroupBox(self.game_settings_contents)
+        self.launch_settings_group = QtWidgets.QGroupBox(GameSettings)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Maximum)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
@@ -86,8 +68,8 @@ class Ui_GameSettings(object):
         self.override_exe_edit = QtWidgets.QLineEdit(self.launch_settings_group)
         self.override_exe_edit.setObjectName("override_exe_edit")
         self.launch_settings_layout.setWidget(3, QtWidgets.QFormLayout.FieldRole, self.override_exe_edit)
-        self.game_settings_contents_layout.addWidget(self.launch_settings_group)
-        self.cloud_group = QtWidgets.QGroupBox(self.game_settings_contents)
+        self.game_settings_layout.addWidget(self.launch_settings_group)
+        self.cloud_group = QtWidgets.QGroupBox(GameSettings)
         self.cloud_group.setObjectName("cloud_group")
         self.cloud_layout = QtWidgets.QFormLayout(self.cloud_group)
         self.cloud_layout.setLabelAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
@@ -99,13 +81,8 @@ class Ui_GameSettings(object):
         self.cloud_sync.setText("")
         self.cloud_sync.setObjectName("cloud_sync")
         self.cloud_layout.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.cloud_sync)
-        self.game_settings_contents_layout.addWidget(self.cloud_group)
-        self.linux_settings_widget = QtWidgets.QWidget(self.game_settings_contents)
-        self.linux_settings_widget.setObjectName("linux_settings_widget")
-        self.linux_settings_layout = QtWidgets.QVBoxLayout(self.linux_settings_widget)
-        self.linux_settings_layout.setContentsMargins(0, 0, 0, 0)
-        self.linux_settings_layout.setObjectName("linux_settings_layout")
-        self.proton_group = QtWidgets.QGroupBox(self.linux_settings_widget)
+        self.game_settings_layout.addWidget(self.cloud_group)
+        self.proton_group = QtWidgets.QGroupBox(GameSettings)
         self.proton_group.setObjectName("proton_group")
         self.proton_layout = QtWidgets.QFormLayout(self.proton_group)
         self.proton_layout.setLabelAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
@@ -128,10 +105,13 @@ class Ui_GameSettings(object):
         self.proton_prefix_layout = QtWidgets.QVBoxLayout()
         self.proton_prefix_layout.setObjectName("proton_prefix_layout")
         self.proton_layout.setLayout(2, QtWidgets.QFormLayout.FieldRole, self.proton_prefix_layout)
-        self.linux_settings_layout.addWidget(self.proton_group)
-        self.game_settings_contents_layout.addWidget(self.linux_settings_widget)
-        self.game_settings_scroll.setWidget(self.game_settings_contents)
-        self.game_settings_layout.addWidget(self.game_settings_scroll)
+        self.game_settings_layout.addWidget(self.proton_group)
+        self.linux_settings_widget = QtWidgets.QWidget(GameSettings)
+        self.linux_settings_widget.setObjectName("linux_settings_widget")
+        self.linux_settings_layout = QtWidgets.QVBoxLayout(self.linux_settings_widget)
+        self.linux_settings_layout.setContentsMargins(0, 0, 0, 0)
+        self.linux_settings_layout.setObjectName("linux_settings_layout")
+        self.game_settings_layout.addWidget(self.linux_settings_widget)
 
         self.retranslateUi(GameSettings)
         QtCore.QMetaObject.connectSlotsByName(GameSettings)
diff --git a/rare/ui/components/tabs/games/game_info/game_settings.ui b/rare/ui/components/tabs/games/game_info/game_settings.ui
index 2cd0b920..6e114e79 100644
--- a/rare/ui/components/tabs/games/game_info/game_settings.ui
+++ b/rare/ui/components/tabs/games/game_info/game_settings.ui
@@ -6,65 +6,16 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>759</width>
-    <height>617</height>
+    <width>545</width>
+    <height>348</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>GameSettings</string>
   </property>
   <layout class="QVBoxLayout" name="game_settings_layout">
-   <item alignment="Qt::AlignTop">
-    <widget class="QLabel" name="game_title">
-     <property name="text">
-      <string notr="true">error</string>
-     </property>
-     <property name="textInteractionFlags">
-      <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
-     </property>
-    </widget>
-   </item>
    <item>
-    <widget class="QScrollArea" name="game_settings_scroll">
-     <property name="frameShape">
-      <enum>QFrame::NoFrame</enum>
-     </property>
-     <property name="horizontalScrollBarPolicy">
-      <enum>Qt::ScrollBarAlwaysOff</enum>
-     </property>
-     <property name="sizeAdjustPolicy">
-      <enum>QAbstractScrollArea::AdjustToContents</enum>
-     </property>
-     <property name="widgetResizable">
-      <bool>true</bool>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-     </property>
-     <widget class="QWidget" name="game_settings_contents">
-      <property name="geometry">
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>747</width>
-        <height>585</height>
-       </rect>
-      </property>
-      <layout class="QVBoxLayout" name="game_settings_contents_layout" stretch="0,0,0">
-       <property name="leftMargin">
-        <number>0</number>
-       </property>
-       <property name="topMargin">
-        <number>0</number>
-       </property>
-       <property name="rightMargin">
-        <number>9</number>
-       </property>
-       <property name="bottomMargin">
-        <number>0</number>
-       </property>
-       <item>
-        <widget class="QGroupBox" name="launch_settings_group">
+    <widget class="QGroupBox" name="launch_settings_group">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
        <horstretch>0</horstretch>
@@ -180,95 +131,91 @@
     </widget>
    </item>
    <item>
-        <widget class="QGroupBox" name="cloud_group">
-         <property name="title">
-          <string>Cloud Saves</string>
+    <widget class="QGroupBox" name="cloud_group">
+     <property name="title">
+      <string>Cloud Saves</string>
+     </property>
+     <layout class="QFormLayout" name="cloud_layout">
+      <property name="labelAlignment">
+       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+      </property>
+      <item row="0" column="0">
+       <widget class="QLabel" name="cloud_sync_label">
+        <property name="text">
+         <string>Sync with cloud</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QCheckBox" name="cloud_sync">
+        <property name="text">
+         <string notr="true"/>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="proton_group">
+     <property name="title">
+      <string>Proton Settings</string>
+     </property>
+     <layout class="QFormLayout" name="proton_layout">
+      <property name="labelAlignment">
+       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+      </property>
+      <item row="1" column="0">
+       <widget class="QLabel" name="proton_wrapper_label">
+        <property name="text">
+         <string>Proton</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QComboBox" name="proton_wrapper">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <item>
+         <property name="text">
+          <string>Don't use Proton</string>
          </property>
-         <layout class="QFormLayout" name="cloud_layout">
-          <property name="labelAlignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-          </property>
-          <item row="0" column="0">
-           <widget class="QLabel" name="cloud_sync_label">
-            <property name="text">
-             <string>Sync with cloud</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1">
-           <widget class="QCheckBox" name="cloud_sync">
-            <property name="text">
-             <string notr="true"/>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QWidget" name="linux_settings_widget" native="true">
-         <layout class="QVBoxLayout" name="linux_settings_layout">
-          <property name="leftMargin">
-           <number>0</number>
-          </property>
-          <property name="topMargin">
-           <number>0</number>
-          </property>
-          <property name="rightMargin">
-           <number>0</number>
-          </property>
-          <property name="bottomMargin">
-           <number>0</number>
-          </property>
-          <item>
-           <widget class="QGroupBox" name="proton_group">
-            <property name="title">
-             <string>Proton Settings</string>
-            </property>
-            <layout class="QFormLayout" name="proton_layout">
-             <property name="labelAlignment">
-              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-             </property>
-             <item row="1" column="0">
-              <widget class="QLabel" name="proton_wrapper_label">
-               <property name="text">
-                <string>Proton</string>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="1">
-              <widget class="QComboBox" name="proton_wrapper">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <item>
-                <property name="text">
-                 <string>Don't use Proton</string>
-                </property>
-               </item>
-              </widget>
-             </item>
-             <item row="2" column="0">
-              <widget class="QLabel" name="proton_prefix_label">
-               <property name="text">
-                <string>Prefix</string>
-               </property>
-              </widget>
-             </item>
-             <item row="2" column="1">
-              <layout class="QVBoxLayout" name="proton_prefix_layout"/>
-             </item>
-            </layout>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-      </layout>
-     </widget>
+        </item>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="proton_prefix_label">
+        <property name="text">
+         <string>Prefix</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <layout class="QVBoxLayout" name="proton_prefix_layout"/>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QWidget" name="linux_settings_widget" native="true">
+     <layout class="QVBoxLayout" name="linux_settings_layout">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+     </layout>
     </widget>
    </item>
   </layout>
diff --git a/rare/ui/components/tabs/settings/about.py b/rare/ui/components/tabs/settings/about.py
index b5164660..18a7cc6b 100644
--- a/rare/ui/components/tabs/settings/about.py
+++ b/rare/ui/components/tabs/settings/about.py
@@ -14,35 +14,32 @@ from PyQt5 import QtCore, QtGui, QtWidgets
 class Ui_About(object):
     def setupUi(self, About):
         About.setObjectName("About")
-        About.resize(720, 317)
+        About.resize(340, 142)
         self.about_layout = QtWidgets.QFormLayout(About)
         self.about_layout.setLabelAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
         self.about_layout.setObjectName("about_layout")
-        self.title = QtWidgets.QLabel(About)
-        self.title.setObjectName("title")
-        self.about_layout.setWidget(0, QtWidgets.QFormLayout.SpanningRole, self.title)
         self.version_label = QtWidgets.QLabel(About)
         font = QtGui.QFont()
         font.setBold(True)
         font.setWeight(75)
         self.version_label.setFont(font)
         self.version_label.setObjectName("version_label")
-        self.about_layout.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.version_label)
+        self.about_layout.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.version_label)
         self.version = QtWidgets.QLabel(About)
         self.version.setText("error")
         self.version.setObjectName("version")
-        self.about_layout.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.version)
+        self.about_layout.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.version)
         self.update_label = QtWidgets.QLabel(About)
         font = QtGui.QFont()
         font.setBold(True)
         font.setWeight(75)
         self.update_label.setFont(font)
         self.update_label.setObjectName("update_label")
-        self.about_layout.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.update_label)
+        self.about_layout.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.update_label)
         self.update_lbl = QtWidgets.QLabel(About)
         self.update_lbl.setText("error")
         self.update_lbl.setObjectName("update_lbl")
-        self.about_layout.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.update_lbl)
+        self.about_layout.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.update_lbl)
         self.open_browser = QtWidgets.QPushButton(About)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
@@ -50,41 +47,41 @@ class Ui_About(object):
         sizePolicy.setHeightForWidth(self.open_browser.sizePolicy().hasHeightForWidth())
         self.open_browser.setSizePolicy(sizePolicy)
         self.open_browser.setObjectName("open_browser")
-        self.about_layout.setWidget(3, QtWidgets.QFormLayout.FieldRole, self.open_browser)
+        self.about_layout.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.open_browser)
         self.dev_label = QtWidgets.QLabel(About)
         font = QtGui.QFont()
         font.setBold(True)
         font.setWeight(75)
         self.dev_label.setFont(font)
         self.dev_label.setObjectName("dev_label")
-        self.about_layout.setWidget(4, QtWidgets.QFormLayout.LabelRole, self.dev_label)
+        self.about_layout.setWidget(3, QtWidgets.QFormLayout.LabelRole, self.dev_label)
         self.dev = QtWidgets.QLabel(About)
         self.dev.setText("<a href=\'https://github.com/Dummerle\'>Dummerle</a>")
         self.dev.setOpenExternalLinks(True)
         self.dev.setObjectName("dev")
-        self.about_layout.setWidget(4, QtWidgets.QFormLayout.FieldRole, self.dev)
+        self.about_layout.setWidget(3, QtWidgets.QFormLayout.FieldRole, self.dev)
         self.lgd_dev_label = QtWidgets.QLabel(About)
         font = QtGui.QFont()
         font.setBold(True)
         font.setWeight(75)
         self.lgd_dev_label.setFont(font)
         self.lgd_dev_label.setObjectName("lgd_dev_label")
-        self.about_layout.setWidget(5, QtWidgets.QFormLayout.LabelRole, self.lgd_dev_label)
+        self.about_layout.setWidget(4, QtWidgets.QFormLayout.LabelRole, self.lgd_dev_label)
         self.lgd_dev = QtWidgets.QLabel(About)
         self.lgd_dev.setText("<a href=\'https://github.com/derrod/\'>derrod</a>")
         self.lgd_dev.setOpenExternalLinks(True)
         self.lgd_dev.setObjectName("lgd_dev")
-        self.about_layout.setWidget(5, QtWidgets.QFormLayout.FieldRole, self.lgd_dev)
+        self.about_layout.setWidget(4, QtWidgets.QFormLayout.FieldRole, self.lgd_dev)
         self.license_label = QtWidgets.QLabel(About)
         font = QtGui.QFont()
         font.setBold(True)
         font.setWeight(75)
         self.license_label.setFont(font)
         self.license_label.setObjectName("license_label")
-        self.about_layout.setWidget(6, QtWidgets.QFormLayout.LabelRole, self.license_label)
+        self.about_layout.setWidget(5, QtWidgets.QFormLayout.LabelRole, self.license_label)
         self.license = QtWidgets.QLabel(About)
         self.license.setObjectName("license")
-        self.about_layout.setWidget(6, QtWidgets.QFormLayout.FieldRole, self.license)
+        self.about_layout.setWidget(5, QtWidgets.QFormLayout.FieldRole, self.license)
 
         self.retranslateUi(About)
         QtCore.QMetaObject.connectSlotsByName(About)
@@ -92,7 +89,6 @@ class Ui_About(object):
     def retranslateUi(self, About):
         _translate = QtCore.QCoreApplication.translate
         About.setWindowTitle(_translate("About", "About"))
-        self.title.setText(_translate("About", "<h2>About</h2>"))
         self.version_label.setText(_translate("About", "Version"))
         self.update_label.setText(_translate("About", "Update available"))
         self.open_browser.setText(_translate("About", "Download latest release"))
diff --git a/rare/ui/components/tabs/settings/about.ui b/rare/ui/components/tabs/settings/about.ui
index 331129f8..b2d7f751 100644
--- a/rare/ui/components/tabs/settings/about.ui
+++ b/rare/ui/components/tabs/settings/about.ui
@@ -4,10 +4,10 @@
  <widget class="QWidget" name="About">
   <property name="geometry">
    <rect>
-       <x>0</x>
-       <y>0</y>
-       <width>720</width>
-       <height>317</height>
+    <x>0</x>
+    <y>0</y>
+    <width>340</width>
+    <height>142</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -17,14 +17,7 @@
    <property name="labelAlignment">
     <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
    </property>
-   <item row="0" column="0" colspan="2">
-    <widget class="QLabel" name="title">
-     <property name="text">
-      <string>&lt;h2&gt;About&lt;/h2&gt;</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0">
+   <item row="0" column="0">
     <widget class="QLabel" name="version_label">
      <property name="font">
       <font>
@@ -37,14 +30,14 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="1">
+   <item row="0" column="1">
     <widget class="QLabel" name="version">
      <property name="text">
       <string notr="true">error</string>
      </property>
     </widget>
    </item>
-   <item row="2" column="0">
+   <item row="1" column="0">
     <widget class="QLabel" name="update_label">
      <property name="font">
       <font>
@@ -57,14 +50,14 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="1">
-       <widget class="QLabel" name="update_lbl">
-           <property name="text">
-               <string notr="true">error</string>
-           </property>
-       </widget>
+   <item row="1" column="1">
+    <widget class="QLabel" name="update_lbl">
+     <property name="text">
+      <string notr="true">error</string>
+     </property>
+    </widget>
    </item>
-   <item row="3" column="1">
+   <item row="2" column="1">
     <widget class="QPushButton" name="open_browser">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
@@ -77,7 +70,7 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="0">
+   <item row="3" column="0">
     <widget class="QLabel" name="dev_label">
      <property name="font">
       <font>
@@ -90,7 +83,7 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="1">
+   <item row="3" column="1">
     <widget class="QLabel" name="dev">
      <property name="toolTip">
       <string>Github</string>
@@ -103,7 +96,7 @@
      </property>
     </widget>
    </item>
-   <item row="5" column="0">
+   <item row="4" column="0">
     <widget class="QLabel" name="lgd_dev_label">
      <property name="font">
       <font>
@@ -116,7 +109,7 @@
      </property>
     </widget>
    </item>
-   <item row="5" column="1">
+   <item row="4" column="1">
     <widget class="QLabel" name="lgd_dev">
      <property name="toolTip">
       <string>Github</string>
@@ -129,7 +122,7 @@
      </property>
     </widget>
    </item>
-   <item row="6" column="0">
+   <item row="5" column="0">
     <widget class="QLabel" name="license_label">
      <property name="font">
       <font>
@@ -142,7 +135,7 @@
      </property>
     </widget>
    </item>
-   <item row="6" column="1">
+   <item row="5" column="1">
     <widget class="QLabel" name="license">
      <property name="text">
       <string>GNU General Public License v3.0</string>
diff --git a/rare/ui/components/tabs/settings/dxvk.py b/rare/ui/components/tabs/settings/dxvk.py
index 75c5f520..45fa48ea 100644
--- a/rare/ui/components/tabs/settings/dxvk.py
+++ b/rare/ui/components/tabs/settings/dxvk.py
@@ -1,98 +1,10 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file 'dxvk.ui'
+# Form implementation generated from reading ui file 'rare/ui/components/tabs/settings/dxvk.ui'
 #
-# Created by: PyQt5 UI code generator 5.15.4
+# Created by: PyQt5 UI code generator 5.15.6
 #
 # WARNING: Any manual changes made to this file will be lost when pyuic5 is
 # run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtWidgets
-
-
-class Ui_DxvkSettings(object):
-    def setupUi(self, DxvkSettings):
-        DxvkSettings.setObjectName("DxvkSettings")
-        self.dxvk_layout = QtWidgets.QGridLayout(DxvkSettings)
-        self.dxvk_layout.setObjectName("dxvk_layout")
-        self.gb_dxvk_options = QtWidgets.QGroupBox(DxvkSettings)
-        self.gb_dxvk_options.setObjectName("gb_dxvk_options")
-        self.layout_dxvk_options = QtWidgets.QGridLayout(self.gb_dxvk_options)
-        self.layout_dxvk_options.setObjectName("layout_dxvk_options")
-        self.version = QtWidgets.QCheckBox(self.gb_dxvk_options)
-        self.version.setObjectName("version")
-        self.layout_dxvk_options.addWidget(self.version, 0, 2, 1, 1)
-        self.fps = QtWidgets.QCheckBox(self.gb_dxvk_options)
-        self.fps.setObjectName("fps")
-        self.layout_dxvk_options.addWidget(self.fps, 1, 0, 1, 1)
-        self.memory = QtWidgets.QCheckBox(self.gb_dxvk_options)
-        self.memory.setObjectName("memory")
-        self.layout_dxvk_options.addWidget(self.memory, 0, 1, 1, 1)
-        self.devinfo = QtWidgets.QCheckBox(self.gb_dxvk_options)
-        self.devinfo.setObjectName("devinfo")
-        self.layout_dxvk_options.addWidget(self.devinfo, 0, 0, 1, 1)
-        self.gpuload = QtWidgets.QCheckBox(self.gb_dxvk_options)
-        self.gpuload.setObjectName("gpuload")
-        self.layout_dxvk_options.addWidget(self.gpuload, 1, 1, 1, 1)
-        self.frametime = QtWidgets.QCheckBox(self.gb_dxvk_options)
-        self.frametime.setObjectName("frametime")
-        self.layout_dxvk_options.addWidget(self.frametime, 2, 0, 1, 1)
-        spacerItem = QtWidgets.QSpacerItem(0, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.layout_dxvk_options.addItem(spacerItem, 0, 3, 3, 1)
-        self.api = QtWidgets.QCheckBox(self.gb_dxvk_options)
-        self.api.setObjectName("api")
-        self.layout_dxvk_options.addWidget(self.api, 1, 2, 1, 1)
-        self.dxvk_layout.addWidget(self.gb_dxvk_options, 2, 0, 1, 3)
-        self.lbl_show_dxvk = QtWidgets.QLabel(DxvkSettings)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.lbl_show_dxvk.sizePolicy().hasHeightForWidth())
-        self.lbl_show_dxvk.setSizePolicy(sizePolicy)
-        self.lbl_show_dxvk.setObjectName("lbl_show_dxvk")
-        self.dxvk_layout.addWidget(self.lbl_show_dxvk, 0, 0, 1, 1)
-        self.show_dxvk = QtWidgets.QComboBox(DxvkSettings)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.show_dxvk.sizePolicy().hasHeightForWidth())
-        self.show_dxvk.setSizePolicy(sizePolicy)
-        self.show_dxvk.setObjectName("show_dxvk")
-        self.show_dxvk.addItem("")
-        self.show_dxvk.addItem("")
-        self.show_dxvk.addItem("")
-        self.show_dxvk.addItem("")
-        self.dxvk_layout.addWidget(self.show_dxvk, 0, 1, 1, 2)
-
-        self.retranslateUi(DxvkSettings)
-        QtCore.QMetaObject.connectSlotsByName(DxvkSettings)
-
-    def retranslateUi(self, DxvkSettings):
-        _translate = QtCore.QCoreApplication.translate
-        DxvkSettings.setWindowTitle(_translate("DxvkSettings", "DxvkSettings"))
-        DxvkSettings.setTitle(_translate("DxvkSettings", "DXVK Settings"))
-        self.gb_dxvk_options.setTitle(_translate("DxvkSettings", "DXVK HUD Options"))
-        self.version.setText(_translate("DxvkSettings", "DXVK Version"))
-        self.fps.setText(_translate("DxvkSettings", "FPS"))
-        self.memory.setText(_translate("DxvkSettings", "Memory Usage"))
-        self.devinfo.setText(_translate("DxvkSettings", "Device Info"))
-        self.gpuload.setText(_translate("DxvkSettings", "GPU Usage"))
-        self.frametime.setText(_translate("DxvkSettings", "Frame Time graph"))
-        self.api.setText(_translate("DxvkSettings", "D3D Version"))
-        self.lbl_show_dxvk.setText(_translate("DxvkSettings", "Show HUD"))
-        self.show_dxvk.setItemText(0, _translate("DxvkSettings", "System Default"))
-        self.show_dxvk.setItemText(1, _translate("DxvkSettings", "Hidden"))
-        self.show_dxvk.setItemText(2, _translate("DxvkSettings", "Visible"))
-        self.show_dxvk.setItemText(3, _translate("DxvkSettings", "Custom Options"))
-
-
-if __name__ == "__main__":
-    import sys
-
-    app = QtWidgets.QApplication(sys.argv)
-    DxvkSettings = QtWidgets.QGroupBox()
-    ui = Ui_DxvkSettings()
-    ui.setupUi(DxvkSettings)
-    DxvkSettings.show()
-    sys.exit(app.exec_())
diff --git a/rare/ui/components/tabs/settings/eos_widget.py b/rare/ui/components/tabs/settings/eos_widget.py
index acc5f010..f59e5b24 100644
--- a/rare/ui/components/tabs/settings/eos_widget.py
+++ b/rare/ui/components/tabs/settings/eos_widget.py
@@ -8,162 +8,3 @@
 # run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
-
-
-class Ui_EosWidget(object):
-    def setupUi(self, EosWidget):
-        EosWidget.setObjectName("EosWidget")
-        EosWidget.resize(364, 218)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Maximum)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(EosWidget.sizePolicy().hasHeightForWidth())
-        EosWidget.setSizePolicy(sizePolicy)
-        EosWidget.setWindowTitle("GroupBox")
-        self.eos_layout = QtWidgets.QHBoxLayout(EosWidget)
-        self.eos_layout.setSizeConstraint(QtWidgets.QLayout.SetDefaultConstraint)
-        self.eos_layout.setObjectName("eos_layout")
-        self.info_stack = QtWidgets.QStackedWidget(EosWidget)
-        self.info_stack.setObjectName("info_stack")
-        self.installed_info_page = QtWidgets.QWidget()
-        self.installed_info_page.setObjectName("installed_info_page")
-        self.installed_info_page_layout = QtWidgets.QVBoxLayout(self.installed_info_page)
-        self.installed_info_page_layout.setContentsMargins(0, 0, 0, 0)
-        self.installed_info_page_layout.setObjectName("installed_info_page_layout")
-        self.installed_info_gb = QtWidgets.QGroupBox(self.installed_info_page)
-        self.installed_info_gb.setObjectName("installed_info_gb")
-        self.installed_info_layout = QtWidgets.QFormLayout(self.installed_info_gb)
-        self.installed_info_layout.setLabelAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.installed_info_layout.setObjectName("installed_info_layout")
-        self.installed_version_info_lbl = QtWidgets.QLabel(self.installed_info_gb)
-        self.installed_version_info_lbl.setObjectName("installed_version_info_lbl")
-        self.installed_info_layout.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.installed_version_info_lbl)
-        self.installed_version_lbl = QtWidgets.QLabel(self.installed_info_gb)
-        self.installed_version_lbl.setText("TextLabel")
-        self.installed_version_lbl.setObjectName("installed_version_lbl")
-        self.installed_info_layout.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.installed_version_lbl)
-        self.installed_path_info_lbl = QtWidgets.QLabel(self.installed_info_gb)
-        self.installed_path_info_lbl.setObjectName("installed_path_info_lbl")
-        self.installed_info_layout.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.installed_path_info_lbl)
-        self.installed_path_lbl = QtWidgets.QLabel(self.installed_info_gb)
-        self.installed_path_lbl.setText("TextLabel")
-        self.installed_path_lbl.setObjectName("installed_path_lbl")
-        self.installed_info_layout.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.installed_path_lbl)
-        self.update_available_info_label = QtWidgets.QLabel(self.installed_info_gb)
-        self.update_available_info_label.setObjectName("update_available_info_label")
-        self.installed_info_layout.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.update_available_info_label)
-        self.update_check_button = QtWidgets.QPushButton(self.installed_info_gb)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Minimum)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.update_check_button.sizePolicy().hasHeightForWidth())
-        self.update_check_button.setSizePolicy(sizePolicy)
-        self.update_check_button.setMaximumSize(QtCore.QSize(150, 16777215))
-        self.update_check_button.setObjectName("update_check_button")
-        self.installed_info_layout.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.update_check_button)
-        self.uninstall_info_label = QtWidgets.QLabel(self.installed_info_gb)
-        self.uninstall_info_label.setObjectName("uninstall_info_label")
-        self.installed_info_layout.setWidget(4, QtWidgets.QFormLayout.LabelRole, self.uninstall_info_label)
-        self.uninstall_button = QtWidgets.QPushButton(self.installed_info_gb)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Minimum)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.uninstall_button.sizePolicy().hasHeightForWidth())
-        self.uninstall_button.setSizePolicy(sizePolicy)
-        self.uninstall_button.setMaximumSize(QtCore.QSize(150, 16777215))
-        self.uninstall_button.setObjectName("uninstall_button")
-        self.installed_info_layout.setWidget(4, QtWidgets.QFormLayout.FieldRole, self.uninstall_button)
-        self.update_button = QtWidgets.QPushButton(self.installed_info_gb)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Minimum)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.update_button.sizePolicy().hasHeightForWidth())
-        self.update_button.setSizePolicy(sizePolicy)
-        self.update_button.setMaximumSize(QtCore.QSize(150, 16777215))
-        self.update_button.setObjectName("update_button")
-        self.installed_info_layout.setWidget(3, QtWidgets.QFormLayout.FieldRole, self.update_button)
-        self.update_info_lbl = QtWidgets.QLabel(self.installed_info_gb)
-        self.update_info_lbl.setObjectName("update_info_lbl")
-        self.installed_info_layout.setWidget(3, QtWidgets.QFormLayout.LabelRole, self.update_info_lbl)
-        self.installed_info_page_layout.addWidget(self.installed_info_gb, 0, QtCore.Qt.AlignTop)
-        self.info_stack.addWidget(self.installed_info_page)
-        self.install_overlay_page = QtWidgets.QWidget()
-        self.install_overlay_page.setObjectName("install_overlay_page")
-        self.install_overlay_page_layout = QtWidgets.QVBoxLayout(self.install_overlay_page)
-        self.install_overlay_page_layout.setContentsMargins(0, 0, 0, 0)
-        self.install_overlay_page_layout.setObjectName("install_overlay_page_layout")
-        self.install_overlay_gb = QtWidgets.QGroupBox(self.install_overlay_page)
-        self.install_overlay_gb.setObjectName("install_overlay_gb")
-        self.verticalLayout_4 = QtWidgets.QVBoxLayout(self.install_overlay_gb)
-        self.verticalLayout_4.setObjectName("verticalLayout_4")
-        self.label = QtWidgets.QLabel(self.install_overlay_gb)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Maximum)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.label.sizePolicy().hasHeightForWidth())
-        self.label.setSizePolicy(sizePolicy)
-        self.label.setObjectName("label")
-        self.verticalLayout_4.addWidget(self.label)
-        self.install_button = QtWidgets.QPushButton(self.install_overlay_gb)
-        self.install_button.setObjectName("install_button")
-        self.verticalLayout_4.addWidget(self.install_button)
-        self.install_overlay_page_layout.addWidget(self.install_overlay_gb, 0, QtCore.Qt.AlignTop)
-        self.info_stack.addWidget(self.install_overlay_page)
-        self.eos_layout.addWidget(self.info_stack)
-        self.enable_gb = QtWidgets.QGroupBox(EosWidget)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.enable_gb.sizePolicy().hasHeightForWidth())
-        self.enable_gb.setSizePolicy(sizePolicy)
-        self.enable_gb.setObjectName("enable_gb")
-        self.enable_layout = QtWidgets.QVBoxLayout(self.enable_gb)
-        self.enable_layout.setObjectName("enable_layout")
-        self.select_pfx_combo = QtWidgets.QComboBox(self.enable_gb)
-        self.select_pfx_combo.setObjectName("select_pfx_combo")
-        self.enable_layout.addWidget(self.select_pfx_combo)
-        self.enabled_cb = QtWidgets.QCheckBox(self.enable_gb)
-        self.enabled_cb.setObjectName("enabled_cb")
-        self.enable_layout.addWidget(self.enabled_cb)
-        self.enabled_info_label = QtWidgets.QLabel(self.enable_gb)
-        font = QtGui.QFont()
-        font.setItalic(True)
-        self.enabled_info_label.setFont(font)
-        self.enabled_info_label.setText("")
-        self.enabled_info_label.setObjectName("enabled_info_label")
-        self.enable_layout.addWidget(self.enabled_info_label, 0, QtCore.Qt.AlignTop)
-        self.enable_layout.setStretch(2, 1)
-        self.eos_layout.addWidget(self.enable_gb)
-
-        self.retranslateUi(EosWidget)
-        self.info_stack.setCurrentIndex(1)
-        QtCore.QMetaObject.connectSlotsByName(EosWidget)
-
-    def retranslateUi(self, EosWidget):
-        _translate = QtCore.QCoreApplication.translate
-        EosWidget.setTitle(_translate("EosWidget", "Epic Overlay settings"))
-        self.installed_info_gb.setTitle(_translate("EosWidget", "Installed Info"))
-        self.installed_version_info_lbl.setText(_translate("EosWidget", "Installed version"))
-        self.installed_path_info_lbl.setText(_translate("EosWidget", "Installed path"))
-        self.update_available_info_label.setText(_translate("EosWidget", "Updates"))
-        self.update_check_button.setText(_translate("EosWidget", "Check for Update"))
-        self.uninstall_info_label.setText(_translate("EosWidget", "Uninstall"))
-        self.uninstall_button.setText(_translate("EosWidget", "Uninstall"))
-        self.update_button.setText(_translate("EosWidget", "Update"))
-        self.update_info_lbl.setText(_translate("EosWidget", "Install Update"))
-        self.install_overlay_gb.setTitle(_translate("EosWidget", "Install Overlay"))
-        self.label.setText(_translate("EosWidget", "No overlays are installed"))
-        self.install_button.setText(_translate("EosWidget", "Install"))
-        self.enable_gb.setTitle(_translate("EosWidget", "Enable / Disable"))
-        self.enabled_cb.setText(_translate("EosWidget", "Activated"))
-
-
-if __name__ == "__main__":
-    import sys
-    app = QtWidgets.QApplication(sys.argv)
-    EosWidget = QtWidgets.QGroupBox()
-    ui = Ui_EosWidget()
-    ui.setupUi(EosWidget)
-    EosWidget.show()
-    sys.exit(app.exec_())
diff --git a/rare/ui/components/tabs/settings/legendary.py b/rare/ui/components/tabs/settings/legendary.py
index 35a5c3f9..9f82fb67 100644
--- a/rare/ui/components/tabs/settings/legendary.py
+++ b/rare/ui/components/tabs/settings/legendary.py
@@ -14,7 +14,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets
 class Ui_LegendarySettings(object):
     def setupUi(self, LegendarySettings):
         LegendarySettings.setObjectName("LegendarySettings")
-        LegendarySettings.resize(654, 498)
+        LegendarySettings.resize(552, 312)
         LegendarySettings.setWindowTitle("LegendarySettings")
         self.gridLayout = QtWidgets.QGridLayout(LegendarySettings)
         self.gridLayout.setObjectName("gridLayout")
diff --git a/rare/ui/components/tabs/settings/legendary.ui b/rare/ui/components/tabs/settings/legendary.ui
index eeb4395b..73d4f1c2 100644
--- a/rare/ui/components/tabs/settings/legendary.ui
+++ b/rare/ui/components/tabs/settings/legendary.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>654</width>
-    <height>498</height>
+    <width>552</width>
+    <height>312</height>
    </rect>
   </property>
   <property name="windowTitle">
diff --git a/rare/ui/components/tabs/settings/linux.py b/rare/ui/components/tabs/settings/linux.py
index c9245c47..9d3f1e8b 100644
--- a/rare/ui/components/tabs/settings/linux.py
+++ b/rare/ui/components/tabs/settings/linux.py
@@ -8,13 +8,13 @@
 # run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtWidgets
+from PyQt5 import QtCore, QtGui, QtWidgets
 
 
 class Ui_LinuxSettings(object):
     def setupUi(self, LinuxSettings):
         LinuxSettings.setObjectName("LinuxSettings")
-        LinuxSettings.resize(569, 454)
+        LinuxSettings.resize(109, 138)
         self.linux_layout = QtWidgets.QGridLayout(LinuxSettings)
         self.linux_layout.setObjectName("linux_layout")
         spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
@@ -32,7 +32,7 @@ class Ui_LinuxSettings(object):
         self.prefix_layout.setObjectName("prefix_layout")
         self.wine_layout.setLayout(0, QtWidgets.QFormLayout.FieldRole, self.prefix_layout)
         self.exec_label = QtWidgets.QLabel(self.wine_groupbox)
-        self.exec_label.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter)
+        self.exec_label.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
         self.exec_label.setObjectName("exec_label")
         self.wine_layout.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.exec_label)
         self.exec_layout = QtWidgets.QVBoxLayout()
diff --git a/rare/ui/components/tabs/settings/linux.ui b/rare/ui/components/tabs/settings/linux.ui
index f66c173c..8e5b936f 100644
--- a/rare/ui/components/tabs/settings/linux.ui
+++ b/rare/ui/components/tabs/settings/linux.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>569</width>
-    <height>454</height>
+    <width>109</width>
+    <height>138</height>
    </rect>
   </property>
   <property name="windowTitle">
diff --git a/rare/ui/components/tabs/settings/overlay.py b/rare/ui/components/tabs/settings/overlay.py
index 9dcd6b0f..80696c6d 100644
--- a/rare/ui/components/tabs/settings/overlay.py
+++ b/rare/ui/components/tabs/settings/overlay.py
@@ -8,67 +8,3 @@
 # run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
-
-
-class Ui_OverlaySettings(object):
-    def setupUi(self, OverlaySettings):
-        OverlaySettings.setObjectName("OverlaySettings")
-        OverlaySettings.resize(555, 188)
-        OverlaySettings.setWindowTitle("Overlay Settings")
-        OverlaySettings.setTitle("")
-        self.dxvk_layout = QtWidgets.QGridLayout(OverlaySettings)
-        self.dxvk_layout.setObjectName("dxvk_layout")
-        self.lbl_show_overlay = QtWidgets.QLabel(OverlaySettings)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.lbl_show_overlay.sizePolicy().hasHeightForWidth())
-        self.lbl_show_overlay.setSizePolicy(sizePolicy)
-        self.lbl_show_overlay.setObjectName("lbl_show_overlay")
-        self.dxvk_layout.addWidget(self.lbl_show_overlay, 0, 0, 1, 1)
-        self.show_overlay_combo = QtWidgets.QComboBox(OverlaySettings)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.show_overlay_combo.sizePolicy().hasHeightForWidth())
-        self.show_overlay_combo.setSizePolicy(sizePolicy)
-        self.show_overlay_combo.setObjectName("show_overlay_combo")
-        self.show_overlay_combo.addItem("")
-        self.show_overlay_combo.addItem("")
-        self.show_overlay_combo.addItem("")
-        self.dxvk_layout.addWidget(self.show_overlay_combo, 0, 1, 1, 2)
-        self.gb_options = QtWidgets.QGroupBox(OverlaySettings)
-        self.gb_options.setTitle("")
-        self.gb_options.setObjectName("gb_options")
-        self.gridLayout = QtWidgets.QGridLayout(self.gb_options)
-        self.gridLayout.setObjectName("gridLayout")
-        self.options_form = QtWidgets.QFormLayout()
-        self.options_form.setObjectName("options_form")
-        self.gridLayout.addLayout(self.options_form, 1, 0, 1, 1)
-        self.options_grid = QtWidgets.QGridLayout()
-        self.options_grid.setObjectName("options_grid")
-        self.gridLayout.addLayout(self.options_grid, 0, 0, 1, 1)
-        spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.gridLayout.addItem(spacerItem, 0, 1, 2, 1)
-        self.dxvk_layout.addWidget(self.gb_options, 2, 0, 1, 3)
-
-        self.retranslateUi(OverlaySettings)
-        QtCore.QMetaObject.connectSlotsByName(OverlaySettings)
-
-    def retranslateUi(self, OverlaySettings):
-        _translate = QtCore.QCoreApplication.translate
-        self.lbl_show_overlay.setText(_translate("OverlaySettings", "Show HUD"))
-        self.show_overlay_combo.setItemText(0, _translate("OverlaySettings", "System Default"))
-        self.show_overlay_combo.setItemText(1, _translate("OverlaySettings", "Hidden"))
-        self.show_overlay_combo.setItemText(2, _translate("OverlaySettings", "Visible"))
-
-
-if __name__ == "__main__":
-    import sys
-    app = QtWidgets.QApplication(sys.argv)
-    OverlaySettings = QtWidgets.QGroupBox()
-    ui = Ui_OverlaySettings()
-    ui.setupUi(OverlaySettings)
-    OverlaySettings.show()
-    sys.exit(app.exec_())
diff --git a/rare/ui/components/tabs/settings/rare.py b/rare/ui/components/tabs/settings/rare.py
index 89daf103..3901339a 100644
--- a/rare/ui/components/tabs/settings/rare.py
+++ b/rare/ui/components/tabs/settings/rare.py
@@ -14,7 +14,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets
 class Ui_RareSettings(object):
     def setupUi(self, RareSettings):
         RareSettings.setObjectName("RareSettings")
-        RareSettings.resize(674, 532)
+        RareSettings.resize(517, 434)
         RareSettings.setWindowTitle("RareSettings")
         self.rare_layout = QtWidgets.QHBoxLayout(RareSettings)
         self.rare_layout.setObjectName("rare_layout")
diff --git a/rare/ui/components/tabs/settings/rare.ui b/rare/ui/components/tabs/settings/rare.ui
index 704a5497..5f89464d 100644
--- a/rare/ui/components/tabs/settings/rare.ui
+++ b/rare/ui/components/tabs/settings/rare.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>674</width>
-    <height>532</height>
+    <width>517</width>
+    <height>434</height>
    </rect>
   </property>
   <property name="windowTitle">
diff --git a/rare/ui/components/tabs/settings/rpc.py b/rare/ui/components/tabs/settings/rpc.py
index 2c502656..3292fe36 100644
--- a/rare/ui/components/tabs/settings/rpc.py
+++ b/rare/ui/components/tabs/settings/rpc.py
@@ -2,66 +2,9 @@
 
 # Form implementation generated from reading ui file 'rare/ui/components/tabs/settings/rpc.ui'
 #
-# Created by: PyQt5 UI code generator 5.15.4
+# Created by: PyQt5 UI code generator 5.15.6
 #
 # WARNING: Any manual changes made to this file will be lost when pyuic5 is
 # run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtWidgets
-
-
-class Ui_RPCSettings(object):
-    def setupUi(self, RPCSettings):
-        RPCSettings.setObjectName("RPCSettings")
-        RPCSettings.resize(174, 146)
-        RPCSettings.setWindowTitle("DiscordRPC")
-        self.layout = QtWidgets.QGridLayout(RPCSettings)
-        self.layout.setObjectName("layout")
-        self.enable = QtWidgets.QComboBox(RPCSettings)
-        self.enable.setObjectName("enable")
-        self.enable.addItem("")
-        self.enable.addItem("")
-        self.enable.addItem("")
-        self.layout.addWidget(self.enable, 0, 1, 1, 1)
-        self.label = QtWidgets.QLabel(RPCSettings)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.label.sizePolicy().hasHeightForWidth())
-        self.label.setSizePolicy(sizePolicy)
-        self.label.setObjectName("label")
-        self.layout.addWidget(self.label, 0, 0, 1, 1)
-        self.show_game = QtWidgets.QCheckBox(RPCSettings)
-        self.show_game.setObjectName("show_game")
-        self.layout.addWidget(self.show_game, 1, 0, 1, 2)
-        self.show_os = QtWidgets.QCheckBox(RPCSettings)
-        self.show_os.setObjectName("show_os")
-        self.layout.addWidget(self.show_os, 2, 0, 1, 2)
-        self.show_time = QtWidgets.QCheckBox(RPCSettings)
-        self.show_time.setObjectName("show_time")
-        self.layout.addWidget(self.show_time, 3, 0, 1, 2)
-
-        self.retranslateUi(RPCSettings)
-        QtCore.QMetaObject.connectSlotsByName(RPCSettings)
-
-    def retranslateUi(self, RPCSettings):
-        _translate = QtCore.QCoreApplication.translate
-        RPCSettings.setTitle(_translate("RPCSettings", "Discord RPC"))
-        self.enable.setItemText(0, _translate("RPCSettings", "When Playing"))
-        self.enable.setItemText(1, _translate("RPCSettings", "Always"))
-        self.enable.setItemText(2, _translate("RPCSettings", "Never"))
-        self.label.setText(_translate("RPCSettings", "Show"))
-        self.show_game.setText(_translate("RPCSettings", "Show Game"))
-        self.show_os.setText(_translate("RPCSettings", "Show OS"))
-        self.show_time.setText(_translate("RPCSettings", "Show Time playing"))
-
-
-if __name__ == "__main__":
-    import sys
-    app = QtWidgets.QApplication(sys.argv)
-    RPCSettings = QtWidgets.QGroupBox()
-    ui = Ui_RPCSettings()
-    ui.setupUi(RPCSettings)
-    RPCSettings.show()
-    sys.exit(app.exec_())
diff --git a/rare/ui/components/tabs/settings/widgets/__init__.py b/rare/ui/components/tabs/settings/widgets/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/rare/ui/components/tabs/settings/widgets/dxvk.py b/rare/ui/components/tabs/settings/widgets/dxvk.py
new file mode 100644
index 00000000..7ac55c6e
--- /dev/null
+++ b/rare/ui/components/tabs/settings/widgets/dxvk.py
@@ -0,0 +1,98 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file 'rare/ui/components/tabs/settings/widgets/dxvk.ui'
+#
+# Created by: PyQt5 UI code generator 5.15.6
+#
+# WARNING: Any manual changes made to this file will be lost when pyuic5 is
+# run again.  Do not edit this file unless you know what you are doing.
+
+
+from PyQt5 import QtCore, QtGui, QtWidgets
+
+
+class Ui_DxvkSettings(object):
+    def setupUi(self, DxvkSettings):
+        DxvkSettings.setObjectName("DxvkSettings")
+        DxvkSettings.resize(419, 185)
+        self.dxvk_layout = QtWidgets.QGridLayout(DxvkSettings)
+        self.dxvk_layout.setObjectName("dxvk_layout")
+        self.gb_dxvk_options = QtWidgets.QGroupBox(DxvkSettings)
+        self.gb_dxvk_options.setObjectName("gb_dxvk_options")
+        self.layout_dxvk_options = QtWidgets.QGridLayout(self.gb_dxvk_options)
+        self.layout_dxvk_options.setObjectName("layout_dxvk_options")
+        self.version = QtWidgets.QCheckBox(self.gb_dxvk_options)
+        self.version.setObjectName("version")
+        self.layout_dxvk_options.addWidget(self.version, 0, 2, 1, 1)
+        self.fps = QtWidgets.QCheckBox(self.gb_dxvk_options)
+        self.fps.setObjectName("fps")
+        self.layout_dxvk_options.addWidget(self.fps, 1, 0, 1, 1)
+        self.memory = QtWidgets.QCheckBox(self.gb_dxvk_options)
+        self.memory.setObjectName("memory")
+        self.layout_dxvk_options.addWidget(self.memory, 0, 1, 1, 1)
+        self.devinfo = QtWidgets.QCheckBox(self.gb_dxvk_options)
+        self.devinfo.setObjectName("devinfo")
+        self.layout_dxvk_options.addWidget(self.devinfo, 0, 0, 1, 1)
+        self.gpuload = QtWidgets.QCheckBox(self.gb_dxvk_options)
+        self.gpuload.setObjectName("gpuload")
+        self.layout_dxvk_options.addWidget(self.gpuload, 1, 1, 1, 1)
+        self.frametime = QtWidgets.QCheckBox(self.gb_dxvk_options)
+        self.frametime.setObjectName("frametime")
+        self.layout_dxvk_options.addWidget(self.frametime, 2, 0, 1, 1)
+        spacerItem = QtWidgets.QSpacerItem(0, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.layout_dxvk_options.addItem(spacerItem, 0, 3, 3, 1)
+        self.api = QtWidgets.QCheckBox(self.gb_dxvk_options)
+        self.api.setObjectName("api")
+        self.layout_dxvk_options.addWidget(self.api, 1, 2, 1, 1)
+        self.dxvk_layout.addWidget(self.gb_dxvk_options, 2, 0, 1, 3)
+        self.lbl_show_dxvk = QtWidgets.QLabel(DxvkSettings)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.lbl_show_dxvk.sizePolicy().hasHeightForWidth())
+        self.lbl_show_dxvk.setSizePolicy(sizePolicy)
+        self.lbl_show_dxvk.setObjectName("lbl_show_dxvk")
+        self.dxvk_layout.addWidget(self.lbl_show_dxvk, 0, 0, 1, 1)
+        self.show_dxvk = QtWidgets.QComboBox(DxvkSettings)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.show_dxvk.sizePolicy().hasHeightForWidth())
+        self.show_dxvk.setSizePolicy(sizePolicy)
+        self.show_dxvk.setObjectName("show_dxvk")
+        self.show_dxvk.addItem("")
+        self.show_dxvk.addItem("")
+        self.show_dxvk.addItem("")
+        self.show_dxvk.addItem("")
+        self.dxvk_layout.addWidget(self.show_dxvk, 0, 1, 1, 2)
+
+        self.retranslateUi(DxvkSettings)
+        QtCore.QMetaObject.connectSlotsByName(DxvkSettings)
+
+    def retranslateUi(self, DxvkSettings):
+        _translate = QtCore.QCoreApplication.translate
+        DxvkSettings.setWindowTitle(_translate("DxvkSettings", "DxvkSettings"))
+        DxvkSettings.setTitle(_translate("DxvkSettings", "DXVK Settings"))
+        self.gb_dxvk_options.setTitle(_translate("DxvkSettings", "DXVK HUD Options"))
+        self.version.setText(_translate("DxvkSettings", "DXVK Version"))
+        self.fps.setText(_translate("DxvkSettings", "FPS"))
+        self.memory.setText(_translate("DxvkSettings", "Memory Usage"))
+        self.devinfo.setText(_translate("DxvkSettings", "Device Info"))
+        self.gpuload.setText(_translate("DxvkSettings", "GPU Usage"))
+        self.frametime.setText(_translate("DxvkSettings", "Frame Time graph"))
+        self.api.setText(_translate("DxvkSettings", "D3D Version"))
+        self.lbl_show_dxvk.setText(_translate("DxvkSettings", "Show HUD"))
+        self.show_dxvk.setItemText(0, _translate("DxvkSettings", "System Default"))
+        self.show_dxvk.setItemText(1, _translate("DxvkSettings", "Hidden"))
+        self.show_dxvk.setItemText(2, _translate("DxvkSettings", "Visible"))
+        self.show_dxvk.setItemText(3, _translate("DxvkSettings", "Custom Options"))
+
+
+if __name__ == "__main__":
+    import sys
+    app = QtWidgets.QApplication(sys.argv)
+    DxvkSettings = QtWidgets.QGroupBox()
+    ui = Ui_DxvkSettings()
+    ui.setupUi(DxvkSettings)
+    DxvkSettings.show()
+    sys.exit(app.exec_())
diff --git a/rare/ui/components/tabs/settings/dxvk.ui b/rare/ui/components/tabs/settings/widgets/dxvk.ui
similarity index 100%
rename from rare/ui/components/tabs/settings/dxvk.ui
rename to rare/ui/components/tabs/settings/widgets/dxvk.ui
diff --git a/rare/ui/components/tabs/settings/widgets/eos_widget.py b/rare/ui/components/tabs/settings/widgets/eos_widget.py
new file mode 100644
index 00000000..9e35c582
--- /dev/null
+++ b/rare/ui/components/tabs/settings/widgets/eos_widget.py
@@ -0,0 +1,169 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file 'rare/ui/components/tabs/settings/widgets/eos_widget.ui'
+#
+# Created by: PyQt5 UI code generator 5.15.6
+#
+# WARNING: Any manual changes made to this file will be lost when pyuic5 is
+# run again.  Do not edit this file unless you know what you are doing.
+
+
+from PyQt5 import QtCore, QtGui, QtWidgets
+
+
+class Ui_EosWidget(object):
+    def setupUi(self, EosWidget):
+        EosWidget.setObjectName("EosWidget")
+        EosWidget.resize(364, 218)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Maximum)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(EosWidget.sizePolicy().hasHeightForWidth())
+        EosWidget.setSizePolicy(sizePolicy)
+        EosWidget.setWindowTitle("GroupBox")
+        self.eos_layout = QtWidgets.QHBoxLayout(EosWidget)
+        self.eos_layout.setSizeConstraint(QtWidgets.QLayout.SetDefaultConstraint)
+        self.eos_layout.setObjectName("eos_layout")
+        self.info_stack = QtWidgets.QStackedWidget(EosWidget)
+        self.info_stack.setObjectName("info_stack")
+        self.installed_info_page = QtWidgets.QWidget()
+        self.installed_info_page.setObjectName("installed_info_page")
+        self.installed_info_page_layout = QtWidgets.QVBoxLayout(self.installed_info_page)
+        self.installed_info_page_layout.setContentsMargins(0, 0, 0, 0)
+        self.installed_info_page_layout.setObjectName("installed_info_page_layout")
+        self.installed_info_gb = QtWidgets.QGroupBox(self.installed_info_page)
+        self.installed_info_gb.setObjectName("installed_info_gb")
+        self.installed_info_layout = QtWidgets.QFormLayout(self.installed_info_gb)
+        self.installed_info_layout.setLabelAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.installed_info_layout.setObjectName("installed_info_layout")
+        self.installed_version_info_lbl = QtWidgets.QLabel(self.installed_info_gb)
+        self.installed_version_info_lbl.setObjectName("installed_version_info_lbl")
+        self.installed_info_layout.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.installed_version_info_lbl)
+        self.installed_version_lbl = QtWidgets.QLabel(self.installed_info_gb)
+        self.installed_version_lbl.setText("TextLabel")
+        self.installed_version_lbl.setObjectName("installed_version_lbl")
+        self.installed_info_layout.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.installed_version_lbl)
+        self.installed_path_info_lbl = QtWidgets.QLabel(self.installed_info_gb)
+        self.installed_path_info_lbl.setObjectName("installed_path_info_lbl")
+        self.installed_info_layout.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.installed_path_info_lbl)
+        self.installed_path_lbl = QtWidgets.QLabel(self.installed_info_gb)
+        self.installed_path_lbl.setText("TextLabel")
+        self.installed_path_lbl.setObjectName("installed_path_lbl")
+        self.installed_info_layout.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.installed_path_lbl)
+        self.update_available_info_label = QtWidgets.QLabel(self.installed_info_gb)
+        self.update_available_info_label.setObjectName("update_available_info_label")
+        self.installed_info_layout.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.update_available_info_label)
+        self.update_check_button = QtWidgets.QPushButton(self.installed_info_gb)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Minimum)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.update_check_button.sizePolicy().hasHeightForWidth())
+        self.update_check_button.setSizePolicy(sizePolicy)
+        self.update_check_button.setMaximumSize(QtCore.QSize(150, 16777215))
+        self.update_check_button.setObjectName("update_check_button")
+        self.installed_info_layout.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.update_check_button)
+        self.uninstall_info_label = QtWidgets.QLabel(self.installed_info_gb)
+        self.uninstall_info_label.setObjectName("uninstall_info_label")
+        self.installed_info_layout.setWidget(4, QtWidgets.QFormLayout.LabelRole, self.uninstall_info_label)
+        self.uninstall_button = QtWidgets.QPushButton(self.installed_info_gb)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Minimum)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.uninstall_button.sizePolicy().hasHeightForWidth())
+        self.uninstall_button.setSizePolicy(sizePolicy)
+        self.uninstall_button.setMaximumSize(QtCore.QSize(150, 16777215))
+        self.uninstall_button.setObjectName("uninstall_button")
+        self.installed_info_layout.setWidget(4, QtWidgets.QFormLayout.FieldRole, self.uninstall_button)
+        self.update_button = QtWidgets.QPushButton(self.installed_info_gb)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Minimum)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.update_button.sizePolicy().hasHeightForWidth())
+        self.update_button.setSizePolicy(sizePolicy)
+        self.update_button.setMaximumSize(QtCore.QSize(150, 16777215))
+        self.update_button.setObjectName("update_button")
+        self.installed_info_layout.setWidget(3, QtWidgets.QFormLayout.FieldRole, self.update_button)
+        self.update_info_lbl = QtWidgets.QLabel(self.installed_info_gb)
+        self.update_info_lbl.setObjectName("update_info_lbl")
+        self.installed_info_layout.setWidget(3, QtWidgets.QFormLayout.LabelRole, self.update_info_lbl)
+        self.installed_info_page_layout.addWidget(self.installed_info_gb, 0, QtCore.Qt.AlignTop)
+        self.info_stack.addWidget(self.installed_info_page)
+        self.install_overlay_page = QtWidgets.QWidget()
+        self.install_overlay_page.setObjectName("install_overlay_page")
+        self.install_overlay_page_layout = QtWidgets.QVBoxLayout(self.install_overlay_page)
+        self.install_overlay_page_layout.setContentsMargins(0, 0, 0, 0)
+        self.install_overlay_page_layout.setObjectName("install_overlay_page_layout")
+        self.install_overlay_gb = QtWidgets.QGroupBox(self.install_overlay_page)
+        self.install_overlay_gb.setObjectName("install_overlay_gb")
+        self.verticalLayout_4 = QtWidgets.QVBoxLayout(self.install_overlay_gb)
+        self.verticalLayout_4.setObjectName("verticalLayout_4")
+        self.label = QtWidgets.QLabel(self.install_overlay_gb)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Maximum)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.label.sizePolicy().hasHeightForWidth())
+        self.label.setSizePolicy(sizePolicy)
+        self.label.setObjectName("label")
+        self.verticalLayout_4.addWidget(self.label)
+        self.install_button = QtWidgets.QPushButton(self.install_overlay_gb)
+        self.install_button.setObjectName("install_button")
+        self.verticalLayout_4.addWidget(self.install_button)
+        self.install_overlay_page_layout.addWidget(self.install_overlay_gb, 0, QtCore.Qt.AlignTop)
+        self.info_stack.addWidget(self.install_overlay_page)
+        self.eos_layout.addWidget(self.info_stack)
+        self.enable_gb = QtWidgets.QGroupBox(EosWidget)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.enable_gb.sizePolicy().hasHeightForWidth())
+        self.enable_gb.setSizePolicy(sizePolicy)
+        self.enable_gb.setObjectName("enable_gb")
+        self.enable_layout = QtWidgets.QVBoxLayout(self.enable_gb)
+        self.enable_layout.setObjectName("enable_layout")
+        self.select_pfx_combo = QtWidgets.QComboBox(self.enable_gb)
+        self.select_pfx_combo.setObjectName("select_pfx_combo")
+        self.enable_layout.addWidget(self.select_pfx_combo)
+        self.enabled_cb = QtWidgets.QCheckBox(self.enable_gb)
+        self.enabled_cb.setObjectName("enabled_cb")
+        self.enable_layout.addWidget(self.enabled_cb)
+        self.enabled_info_label = QtWidgets.QLabel(self.enable_gb)
+        font = QtGui.QFont()
+        font.setItalic(True)
+        self.enabled_info_label.setFont(font)
+        self.enabled_info_label.setText("")
+        self.enabled_info_label.setObjectName("enabled_info_label")
+        self.enable_layout.addWidget(self.enabled_info_label, 0, QtCore.Qt.AlignTop)
+        self.enable_layout.setStretch(2, 1)
+        self.eos_layout.addWidget(self.enable_gb)
+
+        self.retranslateUi(EosWidget)
+        self.info_stack.setCurrentIndex(1)
+        QtCore.QMetaObject.connectSlotsByName(EosWidget)
+
+    def retranslateUi(self, EosWidget):
+        _translate = QtCore.QCoreApplication.translate
+        EosWidget.setTitle(_translate("EosWidget", "Epic Overlay settings"))
+        self.installed_info_gb.setTitle(_translate("EosWidget", "Installed Info"))
+        self.installed_version_info_lbl.setText(_translate("EosWidget", "Installed version"))
+        self.installed_path_info_lbl.setText(_translate("EosWidget", "Installed path"))
+        self.update_available_info_label.setText(_translate("EosWidget", "Updates"))
+        self.update_check_button.setText(_translate("EosWidget", "Check for Update"))
+        self.uninstall_info_label.setText(_translate("EosWidget", "Uninstall"))
+        self.uninstall_button.setText(_translate("EosWidget", "Uninstall"))
+        self.update_button.setText(_translate("EosWidget", "Update"))
+        self.update_info_lbl.setText(_translate("EosWidget", "Install Update"))
+        self.install_overlay_gb.setTitle(_translate("EosWidget", "Install Overlay"))
+        self.label.setText(_translate("EosWidget", "No overlays are installed"))
+        self.install_button.setText(_translate("EosWidget", "Install"))
+        self.enable_gb.setTitle(_translate("EosWidget", "Enable / Disable"))
+        self.enabled_cb.setText(_translate("EosWidget", "Activated"))
+
+
+if __name__ == "__main__":
+    import sys
+    app = QtWidgets.QApplication(sys.argv)
+    EosWidget = QtWidgets.QGroupBox()
+    ui = Ui_EosWidget()
+    ui.setupUi(EosWidget)
+    EosWidget.show()
+    sys.exit(app.exec_())
diff --git a/rare/ui/components/tabs/settings/eos_widget.ui b/rare/ui/components/tabs/settings/widgets/eos_widget.ui
similarity index 100%
rename from rare/ui/components/tabs/settings/eos_widget.ui
rename to rare/ui/components/tabs/settings/widgets/eos_widget.ui
diff --git a/rare/ui/components/tabs/settings/widgets/overlay.py b/rare/ui/components/tabs/settings/widgets/overlay.py
new file mode 100644
index 00000000..212ee581
--- /dev/null
+++ b/rare/ui/components/tabs/settings/widgets/overlay.py
@@ -0,0 +1,74 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file 'rare/ui/components/tabs/settings/widgets/overlay.ui'
+#
+# Created by: PyQt5 UI code generator 5.15.6
+#
+# WARNING: Any manual changes made to this file will be lost when pyuic5 is
+# run again.  Do not edit this file unless you know what you are doing.
+
+
+from PyQt5 import QtCore, QtGui, QtWidgets
+
+
+class Ui_OverlaySettings(object):
+    def setupUi(self, OverlaySettings):
+        OverlaySettings.setObjectName("OverlaySettings")
+        OverlaySettings.resize(555, 188)
+        OverlaySettings.setWindowTitle("Overlay Settings")
+        OverlaySettings.setTitle("")
+        self.dxvk_layout = QtWidgets.QGridLayout(OverlaySettings)
+        self.dxvk_layout.setObjectName("dxvk_layout")
+        self.lbl_show_overlay = QtWidgets.QLabel(OverlaySettings)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.lbl_show_overlay.sizePolicy().hasHeightForWidth())
+        self.lbl_show_overlay.setSizePolicy(sizePolicy)
+        self.lbl_show_overlay.setObjectName("lbl_show_overlay")
+        self.dxvk_layout.addWidget(self.lbl_show_overlay, 0, 0, 1, 1)
+        self.show_overlay_combo = QtWidgets.QComboBox(OverlaySettings)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.show_overlay_combo.sizePolicy().hasHeightForWidth())
+        self.show_overlay_combo.setSizePolicy(sizePolicy)
+        self.show_overlay_combo.setObjectName("show_overlay_combo")
+        self.show_overlay_combo.addItem("")
+        self.show_overlay_combo.addItem("")
+        self.show_overlay_combo.addItem("")
+        self.dxvk_layout.addWidget(self.show_overlay_combo, 0, 1, 1, 2)
+        self.gb_options = QtWidgets.QGroupBox(OverlaySettings)
+        self.gb_options.setTitle("")
+        self.gb_options.setObjectName("gb_options")
+        self.gridLayout = QtWidgets.QGridLayout(self.gb_options)
+        self.gridLayout.setObjectName("gridLayout")
+        self.options_form = QtWidgets.QFormLayout()
+        self.options_form.setObjectName("options_form")
+        self.gridLayout.addLayout(self.options_form, 1, 0, 1, 1)
+        self.options_grid = QtWidgets.QGridLayout()
+        self.options_grid.setObjectName("options_grid")
+        self.gridLayout.addLayout(self.options_grid, 0, 0, 1, 1)
+        spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.gridLayout.addItem(spacerItem, 0, 1, 2, 1)
+        self.dxvk_layout.addWidget(self.gb_options, 2, 0, 1, 3)
+
+        self.retranslateUi(OverlaySettings)
+        QtCore.QMetaObject.connectSlotsByName(OverlaySettings)
+
+    def retranslateUi(self, OverlaySettings):
+        _translate = QtCore.QCoreApplication.translate
+        self.lbl_show_overlay.setText(_translate("OverlaySettings", "Show HUD"))
+        self.show_overlay_combo.setItemText(0, _translate("OverlaySettings", "System Default"))
+        self.show_overlay_combo.setItemText(1, _translate("OverlaySettings", "Hidden"))
+        self.show_overlay_combo.setItemText(2, _translate("OverlaySettings", "Visible"))
+
+
+if __name__ == "__main__":
+    import sys
+    app = QtWidgets.QApplication(sys.argv)
+    OverlaySettings = QtWidgets.QGroupBox()
+    ui = Ui_OverlaySettings()
+    ui.setupUi(OverlaySettings)
+    OverlaySettings.show()
+    sys.exit(app.exec_())
diff --git a/rare/ui/components/tabs/settings/overlay.ui b/rare/ui/components/tabs/settings/widgets/overlay.ui
similarity index 100%
rename from rare/ui/components/tabs/settings/overlay.ui
rename to rare/ui/components/tabs/settings/widgets/overlay.ui
diff --git a/rare/ui/components/tabs/settings/widgets/rpc.py b/rare/ui/components/tabs/settings/widgets/rpc.py
new file mode 100644
index 00000000..c718cb85
--- /dev/null
+++ b/rare/ui/components/tabs/settings/widgets/rpc.py
@@ -0,0 +1,67 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file 'rare/ui/components/tabs/settings/widgets/rpc.ui'
+#
+# Created by: PyQt5 UI code generator 5.15.6
+#
+# WARNING: Any manual changes made to this file will be lost when pyuic5 is
+# run again.  Do not edit this file unless you know what you are doing.
+
+
+from PyQt5 import QtCore, QtGui, QtWidgets
+
+
+class Ui_RPCSettings(object):
+    def setupUi(self, RPCSettings):
+        RPCSettings.setObjectName("RPCSettings")
+        RPCSettings.resize(174, 146)
+        RPCSettings.setWindowTitle("DiscordRPC")
+        self.layout = QtWidgets.QGridLayout(RPCSettings)
+        self.layout.setObjectName("layout")
+        self.enable = QtWidgets.QComboBox(RPCSettings)
+        self.enable.setObjectName("enable")
+        self.enable.addItem("")
+        self.enable.addItem("")
+        self.enable.addItem("")
+        self.layout.addWidget(self.enable, 0, 1, 1, 1)
+        self.label = QtWidgets.QLabel(RPCSettings)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.label.sizePolicy().hasHeightForWidth())
+        self.label.setSizePolicy(sizePolicy)
+        self.label.setObjectName("label")
+        self.layout.addWidget(self.label, 0, 0, 1, 1)
+        self.show_game = QtWidgets.QCheckBox(RPCSettings)
+        self.show_game.setObjectName("show_game")
+        self.layout.addWidget(self.show_game, 1, 0, 1, 2)
+        self.show_os = QtWidgets.QCheckBox(RPCSettings)
+        self.show_os.setObjectName("show_os")
+        self.layout.addWidget(self.show_os, 2, 0, 1, 2)
+        self.show_time = QtWidgets.QCheckBox(RPCSettings)
+        self.show_time.setObjectName("show_time")
+        self.layout.addWidget(self.show_time, 3, 0, 1, 2)
+
+        self.retranslateUi(RPCSettings)
+        QtCore.QMetaObject.connectSlotsByName(RPCSettings)
+
+    def retranslateUi(self, RPCSettings):
+        _translate = QtCore.QCoreApplication.translate
+        RPCSettings.setTitle(_translate("RPCSettings", "Discord RPC"))
+        self.enable.setItemText(0, _translate("RPCSettings", "When Playing"))
+        self.enable.setItemText(1, _translate("RPCSettings", "Always"))
+        self.enable.setItemText(2, _translate("RPCSettings", "Never"))
+        self.label.setText(_translate("RPCSettings", "Show"))
+        self.show_game.setText(_translate("RPCSettings", "Show Game"))
+        self.show_os.setText(_translate("RPCSettings", "Show OS"))
+        self.show_time.setText(_translate("RPCSettings", "Show Time playing"))
+
+
+if __name__ == "__main__":
+    import sys
+    app = QtWidgets.QApplication(sys.argv)
+    RPCSettings = QtWidgets.QGroupBox()
+    ui = Ui_RPCSettings()
+    ui.setupUi(RPCSettings)
+    RPCSettings.show()
+    sys.exit(app.exec_())
diff --git a/rare/ui/components/tabs/settings/rpc.ui b/rare/ui/components/tabs/settings/widgets/rpc.ui
similarity index 100%
rename from rare/ui/components/tabs/settings/rpc.ui
rename to rare/ui/components/tabs/settings/widgets/rpc.ui
diff --git a/rare/ui/components/tabs/settings/widgets/wrapper.py b/rare/ui/components/tabs/settings/widgets/wrapper.py
new file mode 100644
index 00000000..ba7a6b9a
--- /dev/null
+++ b/rare/ui/components/tabs/settings/widgets/wrapper.py
@@ -0,0 +1,79 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file 'rare/ui/components/tabs/settings/widgets/wrapper.ui'
+#
+# Created by: PyQt5 UI code generator 5.15.6
+#
+# WARNING: Any manual changes made to this file will be lost when pyuic5 is
+# run again.  Do not edit this file unless you know what you are doing.
+
+
+from PyQt5 import QtCore, QtGui, QtWidgets
+
+
+class Ui_WrapperSettings(object):
+    def setupUi(self, WrapperSettings):
+        WrapperSettings.setObjectName("WrapperSettings")
+        WrapperSettings.resize(413, 106)
+        self.horizontalLayout = QtWidgets.QHBoxLayout(WrapperSettings)
+        self.horizontalLayout.setObjectName("horizontalLayout")
+        self.widget_stack = QtWidgets.QStackedWidget(WrapperSettings)
+        self.widget_stack.setObjectName("widget_stack")
+        self.placeholder = QtWidgets.QWidget()
+        self.placeholder.setObjectName("placeholder")
+        self.horizontalLayout_2 = QtWidgets.QHBoxLayout(self.placeholder)
+        self.horizontalLayout_2.setObjectName("horizontalLayout_2")
+        self.wrapper_scroll_area = QtWidgets.QScrollArea(self.placeholder)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.wrapper_scroll_area.sizePolicy().hasHeightForWidth())
+        self.wrapper_scroll_area.setSizePolicy(sizePolicy)
+        self.wrapper_scroll_area.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
+        self.wrapper_scroll_area.setWidgetResizable(True)
+        self.wrapper_scroll_area.setObjectName("wrapper_scroll_area")
+        self.scroll_content = QtWidgets.QWidget()
+        self.scroll_content.setGeometry(QtCore.QRect(0, 0, 286, 68))
+        self.scroll_content.setObjectName("scroll_content")
+        self.horizontalLayout_3 = QtWidgets.QHBoxLayout(self.scroll_content)
+        self.horizontalLayout_3.setObjectName("horizontalLayout_3")
+        self.wrapper_scroll_area.setWidget(self.scroll_content)
+        self.horizontalLayout_2.addWidget(self.wrapper_scroll_area)
+        self.widget_stack.addWidget(self.placeholder)
+        self.label_page = QtWidgets.QWidget()
+        self.label_page.setObjectName("label_page")
+        self.verticalLayout = QtWidgets.QVBoxLayout(self.label_page)
+        self.verticalLayout.setObjectName("verticalLayout")
+        self.no_wrapper_label = QtWidgets.QLabel(self.label_page)
+        self.no_wrapper_label.setObjectName("no_wrapper_label")
+        self.verticalLayout.addWidget(self.no_wrapper_label)
+        self.widget_stack.addWidget(self.label_page)
+        self.horizontalLayout.addWidget(self.widget_stack)
+        self.add_button = QtWidgets.QPushButton(WrapperSettings)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Maximum)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.add_button.sizePolicy().hasHeightForWidth())
+        self.add_button.setSizePolicy(sizePolicy)
+        self.add_button.setObjectName("add_button")
+        self.horizontalLayout.addWidget(self.add_button)
+
+        self.retranslateUi(WrapperSettings)
+        self.widget_stack.setCurrentIndex(0)
+        QtCore.QMetaObject.connectSlotsByName(WrapperSettings)
+
+    def retranslateUi(self, WrapperSettings):
+        _translate = QtCore.QCoreApplication.translate
+        WrapperSettings.setWindowTitle(_translate("WrapperSettings", "Frame"))
+        self.no_wrapper_label.setText(_translate("WrapperSettings", "No wrapper added"))
+        self.add_button.setText(_translate("WrapperSettings", "Add Wrapper"))
+
+
+if __name__ == "__main__":
+    import sys
+    app = QtWidgets.QApplication(sys.argv)
+    WrapperSettings = QtWidgets.QFrame()
+    ui = Ui_WrapperSettings()
+    ui.setupUi(WrapperSettings)
+    WrapperSettings.show()
+    sys.exit(app.exec_())
diff --git a/rare/ui/components/tabs/settings/wrapper.ui b/rare/ui/components/tabs/settings/widgets/wrapper.ui
similarity index 100%
rename from rare/ui/components/tabs/settings/wrapper.ui
rename to rare/ui/components/tabs/settings/widgets/wrapper.ui
diff --git a/rare/ui/components/tabs/settings/wrapper.py b/rare/ui/components/tabs/settings/wrapper.py
index d5682f6e..04e80baf 100644
--- a/rare/ui/components/tabs/settings/wrapper.py
+++ b/rare/ui/components/tabs/settings/wrapper.py
@@ -8,72 +8,3 @@
 # run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
-
-
-class Ui_WrapperSettings(object):
-    def setupUi(self, WrapperSettings):
-        WrapperSettings.setObjectName("WrapperSettings")
-        WrapperSettings.resize(413, 106)
-        self.horizontalLayout = QtWidgets.QHBoxLayout(WrapperSettings)
-        self.horizontalLayout.setObjectName("horizontalLayout")
-        self.widget_stack = QtWidgets.QStackedWidget(WrapperSettings)
-        self.widget_stack.setObjectName("widget_stack")
-        self.placeholder = QtWidgets.QWidget()
-        self.placeholder.setObjectName("placeholder")
-        self.horizontalLayout_2 = QtWidgets.QHBoxLayout(self.placeholder)
-        self.horizontalLayout_2.setObjectName("horizontalLayout_2")
-        self.wrapper_scroll_area = QtWidgets.QScrollArea(self.placeholder)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.wrapper_scroll_area.sizePolicy().hasHeightForWidth())
-        self.wrapper_scroll_area.setSizePolicy(sizePolicy)
-        self.wrapper_scroll_area.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
-        self.wrapper_scroll_area.setWidgetResizable(True)
-        self.wrapper_scroll_area.setObjectName("wrapper_scroll_area")
-        self.scroll_content = QtWidgets.QWidget()
-        self.scroll_content.setGeometry(QtCore.QRect(0, 0, 286, 68))
-        self.scroll_content.setObjectName("scroll_content")
-        self.horizontalLayout_3 = QtWidgets.QHBoxLayout(self.scroll_content)
-        self.horizontalLayout_3.setObjectName("horizontalLayout_3")
-        self.wrapper_scroll_area.setWidget(self.scroll_content)
-        self.horizontalLayout_2.addWidget(self.wrapper_scroll_area)
-        self.widget_stack.addWidget(self.placeholder)
-        self.label_page = QtWidgets.QWidget()
-        self.label_page.setObjectName("label_page")
-        self.verticalLayout = QtWidgets.QVBoxLayout(self.label_page)
-        self.verticalLayout.setObjectName("verticalLayout")
-        self.no_wrapper_label = QtWidgets.QLabel(self.label_page)
-        self.no_wrapper_label.setObjectName("no_wrapper_label")
-        self.verticalLayout.addWidget(self.no_wrapper_label)
-        self.widget_stack.addWidget(self.label_page)
-        self.horizontalLayout.addWidget(self.widget_stack)
-        self.add_button = QtWidgets.QPushButton(WrapperSettings)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Maximum)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.add_button.sizePolicy().hasHeightForWidth())
-        self.add_button.setSizePolicy(sizePolicy)
-        self.add_button.setObjectName("add_button")
-        self.horizontalLayout.addWidget(self.add_button)
-
-        self.retranslateUi(WrapperSettings)
-        self.widget_stack.setCurrentIndex(0)
-        QtCore.QMetaObject.connectSlotsByName(WrapperSettings)
-
-    def retranslateUi(self, WrapperSettings):
-        _translate = QtCore.QCoreApplication.translate
-        WrapperSettings.setWindowTitle(_translate("WrapperSettings", "Frame"))
-        self.no_wrapper_label.setText(_translate("WrapperSettings", "No wrapper added"))
-        self.add_button.setText(_translate("WrapperSettings", "Add Wrapper"))
-
-
-if __name__ == "__main__":
-    import sys
-    app = QtWidgets.QApplication(sys.argv)
-    WrapperSettings = QtWidgets.QFrame()
-    ui = Ui_WrapperSettings()
-    ui.setupUi(WrapperSettings)
-    WrapperSettings.show()
-    sys.exit(app.exec_())
diff --git a/rare/utils/extra_widgets.py b/rare/utils/extra_widgets.py
index 66b4fcc0..13d2b55b 100644
--- a/rare/utils/extra_widgets.py
+++ b/rare/utils/extra_widgets.py
@@ -31,6 +31,8 @@ from PyQt5.QtWidgets import (
     QFileSystemModel,
     QStyledItemDelegate,
     QFileIconProvider,
+    QVBoxLayout,
+    QScrollArea,
 )
 
 from rare.utils.paths import tmp_dir
@@ -389,6 +391,34 @@ class SideTabBar(QTabBar):
             painter.restore()
 
 
+class SideTabContainer(QWidget):
+    def __init__(self, widget: QWidget, title: str = str(), parent: QWidget = None):
+        super(SideTabContainer, self).__init__(parent=parent)
+        self.title = QLabel(self)
+        self.setTitle(title)
+
+        self.scroll = QScrollArea(self)
+        self.scroll.setWidgetResizable(True)
+        self.scroll.setSizeAdjustPolicy(QScrollArea.AdjustToContents)
+        self.scroll.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
+        self.scroll.setFrameStyle(QScrollArea.NoFrame)
+        if widget.layout():
+            widget.layout().setAlignment(Qt.AlignTop)
+            widget.layout().setContentsMargins(0, 0, 9, 0)
+        widget.title = self.title
+        widget.title.setTitle = self.setTitle
+        self.scroll.setWidget(widget)
+
+        layout = QVBoxLayout()
+        layout.addWidget(self.title)
+        layout.addWidget(self.scroll)
+        self.setLayout(layout)
+
+    def setTitle(self, text: str) -> None:
+        self.title.setText(f"<h2>{text}</h2>")
+        self.title.setVisible(bool(text))
+
+
 class SideTabWidget(QTabWidget):
     back_clicked = pyqtSignal()
 
@@ -398,7 +428,9 @@ class SideTabWidget(QTabWidget):
         self.setDocumentMode(True)
         self.setTabPosition(QTabWidget.West)
         if show_back:
-            self.addTab(QWidget(), qta_icon("mdi.keyboard-backspace", "ei.backward"), self.tr("Back"))
+            super(SideTabWidget, self).addTab(
+                QWidget(), qta_icon("mdi.keyboard-backspace", "ei.backward"), self.tr("Back")
+            )
             self.tabBarClicked.connect(self.back_func)
 
     def back_func(self, tab):
@@ -406,6 +438,10 @@ class SideTabWidget(QTabWidget):
         if not tab:
             self.back_clicked.emit()
 
+    def addTab(self, widget: QWidget, a1: str, title: str = str()) -> int:
+        container = SideTabContainer(widget, title, parent=self)
+        return super(SideTabWidget, self).addTab(container, a1)
+
 
 class WaitingSpinner(QLabel):
     def __init__(self):