diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index 93e90fc..a15834b 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -26,12 +26,12 @@ export default function App() {
         <NavigationRail />
 
         <Routes>
-          <Route path="/" element={<SettingsPage />} />
+          <Route path="/settings" element={<SettingsPage />} />
           <Route
             path="/marketplace"
             element={PlacehoderPage({ name: "Marketplace" })}
           />
-          <Route path="/data" element={<DataPage />} />
+          <Route path="/" element={<DataPage />} />
           <Route path="/node" element={PlacehoderPage({ name: "Node" })} />
           <Route path="/debug" element={DebugPage()} />
         </Routes>
diff --git a/frontend/src/components/layout/partials/NavigationRail.tsx b/frontend/src/components/layout/partials/NavigationRail.tsx
index 7316bcb..ad45c10 100644
--- a/frontend/src/components/layout/partials/NavigationRail.tsx
+++ b/frontend/src/components/layout/partials/NavigationRail.tsx
@@ -14,9 +14,9 @@ function NavigationRail() {
     <NavigationRailWrapper>
       <h1>Dexy</h1>
       <ul>
-        <NavigationItem name="Settings" icon={MdOutlineSettings} link="/" />
+        <NavigationItem name="Settings" icon={MdOutlineSettings} link="/settings" />
         <NavigationItem name="Marketplace" icon={MdStore} link="/marketplace" />
-        <NavigationItem name="Data" icon={MdDataUsage} link="/data" />
+        <NavigationItem name="Data" icon={MdDataUsage} link="/" />
         <NavigationItem name="Node" icon={MdDeviceHub} link="/node" />
         <NavigationItem name="Debug" icon={MdBugReport} link="/debug" />
       </ul>