diff --git a/astro/components/SettingsSidebar.astro b/astro/components/SettingsSidebar.astro
new file mode 100644
index 0000000..eb12845
--- /dev/null
+++ b/astro/components/SettingsSidebar.astro
@@ -0,0 +1,46 @@
+---
+import Tab from './sidebar/Tab.astro'
+import TabControls from './sidebar/TabWithControls.astro'
+---
+
+<div class="settings-sidebar">
+    <div class="settings-sidebar-top">
+        <Tab
+        Page="1"
+        Name="Welcome"
+        Icon="fa-solid fa-wand-magic-sparkles"
+        Default="active" // This selects the tab by default
+        ></Tab>
+
+        <Tab
+        Page="2"
+        Name="Files"
+        Icon="fa-solid fa-folder-tree"
+        ></Tab>
+
+        <Tab
+        Page="3"
+        Name="Webview Demo"
+        Icon="fa-solid fa-globe"
+        ></Tab>
+
+        <TabControls
+        Page="3A"
+        Name="Webview Demo"
+        Icon="fa-solid fa-globe"
+        ></TabControls>
+
+        <Tab
+        Page="4"
+        Name="iFrame Demo"
+        Icon="fa-solid fa-eye"
+        ></Tab>
+    </div>
+    <div class="settings-sidebar-bottom">
+        <Tab
+        Page="5"
+        Name="Settings"
+        Icon="fa-solid fa-sliders"
+        ></Tab>
+    </div>
+</div>
\ No newline at end of file
diff --git a/astro/components/Sidebar.astro b/astro/components/Sidebar.astro
index 33f3ca3..818e363 100644
--- a/astro/components/Sidebar.astro
+++ b/astro/components/Sidebar.astro
@@ -1,46 +1,36 @@
 ---
-import Tab from './sidebar/Tab.astro';
-import TabControls from './sidebar/TabWithControls.astro';
+import { APP, SIDEBARTOP, SIDEBARBOTTOM } from '../config'
 ---
 
 <div class="sidebar">
+    <div class="sidebar-header">
+        <img src="./logo.png">
+        {APP.map(item => (<p>{item.name}</p>))}
+    </div>
     <div class="sidebar-top">
-        <Tab
-        Page="1"
-        Name="Welcome"
-        Icon="fa-solid fa-wand-magic-sparkles"
-        Default="active" // This selects the tab by default
-        ></Tab>
-
-        <Tab
-        Page="2"
-        Name="Files"
-        Icon="fa-solid fa-folder-tree"
-        ></Tab>
-
-        <Tab
-        Page="3"
-        Name="Webview Demo"
-        Icon="fa-solid fa-globe"
-        ></Tab>
-
-        <TabControls
-        Page="3A"
-        Name="Webview Demo"
-        Icon="fa-solid fa-globe"
-        ></TabControls>
-
-        <Tab
-        Page="4"
-        Name="iFrame Demo"
-        Icon="fa-solid fa-eye"
-        ></Tab>
+        {SIDEBARTOP.map(item => (
+            <li data-tab={item.text} class={item.option}>
+                <i class={item.icon}></i>
+                <p>{item.text}</p>
+                <div id="Tab" class="webview-navigation">
+                    <button onclick='document.querySelector(".active webview").goBack()'><i class="fa-solid fa-arrow-left-long"></i></button>
+                    <button onclick='document.querySelector(".active webview").goForward()'><i class="fa-solid fa-arrow-right-long"></i></button>
+                    <button onclick='document.querySelector(".active webview").reload()'><i class="fa-solid fa-arrow-rotate-right"></i></button>
+                </div>
+            </li>
+        ))}
     </div>
     <div class="sidebar-bottom">
-        <Tab
-        Page="5"
-        Name="Settings"
-        Icon="fa-solid fa-sliders"
-        ></Tab>
+        {SIDEBARBOTTOM.map(item => (
+            <li data-tab={item.page} class={item.class}>
+                <i class={item.text}></i>
+                <p>{item.text}</p>
+                <div id="Tab" class="webview-navigation">
+                    <button onclick='document.querySelector(".active webview").goBack()'><i class="fa-solid fa-arrow-left-long"></i></button>
+                    <button onclick='document.querySelector(".active webview").goForward()'><i class="fa-solid fa-arrow-right-long"></i></button>
+                    <button onclick='document.querySelector(".active webview").reload()'><i class="fa-solid fa-arrow-rotate-right"></i></button>
+                </div>
+            </li>
+        ))}
     </div>
 </div>
\ No newline at end of file
diff --git a/astro/components/pages/1.md b/astro/components/pages/Dashboard.md
similarity index 100%
rename from astro/components/pages/1.md
rename to astro/components/pages/Dashboard.md
diff --git a/astro/components/pages/Settings.astro b/astro/components/pages/Settings.astro
new file mode 100644
index 0000000..2ef0983
--- /dev/null
+++ b/astro/components/pages/Settings.astro
@@ -0,0 +1,5 @@
+---
+import SettingsSidebar from '../SettingsSidebar.astro'
+---
+
+<SettingsSidebar />
\ No newline at end of file
diff --git a/astro/components/pages/Settings.md b/astro/components/pages/Settings.md
deleted file mode 100644
index 78a95da..0000000
--- a/astro/components/pages/Settings.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Settings
-This template will feature many more components later this year to make it more configurable for developers. Future components will contain a variety of settings together with scripts. However, work on these has not yet commenced.
-
-The following components are planned:
- - Personilzation:
-   - Theme
-   - Color Scheme
-   - Blur Toggle
- - Notifications
-   - Theme
-   - Sound
- - System:
-   - Power Saving (Windows and macOS only)
-   - Hardware Acceleration*
\ No newline at end of file
diff --git a/astro/components/pages/2.astro b/astro/components/pages/Tab2.astro
similarity index 100%
rename from astro/components/pages/2.astro
rename to astro/components/pages/Tab2.astro
diff --git a/astro/components/pages/3.astro b/astro/components/pages/Tab3.astro
similarity index 99%
rename from astro/components/pages/3.astro
rename to astro/components/pages/Tab3.astro
index 8166783..71799ba 100644
--- a/astro/components/pages/3.astro
+++ b/astro/components/pages/Tab3.astro
@@ -1,5 +1,5 @@
 ---
-import WebViewControls from '../webview-navigation/TopBar.astro';
+import WebViewControls from '../webview-navigation/TopBar.astro'
 ---
 
 <WebViewControls></WebViewControls>
diff --git a/astro/components/pages/3A.astro b/astro/components/pages/Tab3A.astro
similarity index 100%
rename from astro/components/pages/3A.astro
rename to astro/components/pages/Tab3A.astro
diff --git a/astro/components/pages/4.astro b/astro/components/pages/Tab4.astro
similarity index 100%
rename from astro/components/pages/4.astro
rename to astro/components/pages/Tab4.astro
diff --git a/astro/components/sidebar/Tab.astro b/astro/components/sidebar/Tab.astro
deleted file mode 100644
index 628a1de..0000000
--- a/astro/components/sidebar/Tab.astro
+++ /dev/null
@@ -1,9 +0,0 @@
----
-const { Default, Name, Icon, Page } = Astro.props;
----
-
-
-<li data-tab={Page} class=`sidebar-tab ${Default}`>
-    <i class={Icon}></i>
-    <p>{Name}</p>
-</li>
\ No newline at end of file
diff --git a/astro/components/sidebar/TabWithControls.astro b/astro/components/sidebar/TabWithControls.astro
deleted file mode 100644
index baf8972..0000000
--- a/astro/components/sidebar/TabWithControls.astro
+++ /dev/null
@@ -1,14 +0,0 @@
----
-const { Default, Name, Icon, Page } = Astro.props;
----
-
-
-<li data-tab={Page} class=`sidebar-tab has-navigation ${Default}`>
-    <i class={Icon}></i>
-    <p>{Name}</p>
-    <div id="Tab" class="webview-navigation">
-        <button onclick='document.querySelector(".active webview").goBack()'><i class="fa-solid fa-arrow-left-long"></i></button>
-        <button onclick='document.querySelector(".active webview").goForward()'><i class="fa-solid fa-arrow-right-long"></i></button>
-        <button onclick='document.querySelector(".active webview").reload()'><i class="fa-solid fa-arrow-rotate-right"></i></button>
-    </div>
-</li>
\ No newline at end of file
diff --git a/astro/config.ts b/astro/config.ts
new file mode 100644
index 0000000..b0b0725
--- /dev/null
+++ b/astro/config.ts
@@ -0,0 +1,41 @@
+export const APP = [{
+    name: "App Name",
+    website: "https://mycompany.net/",
+    support: "https://mycompany.net/help/",
+    sourcecode: "https://github.com/company/app-name"
+}]
+
+// Top tabs of your sidbear
+export const SIDEBARTOP = [
+    {
+        text: "Dashboard",
+        icon: "fa-solid fa-wand-magic-sparkles",
+        option: "active"
+    },
+    {
+        text: "Files",
+        icon: "fa-solid fa-folder-tree",
+    },
+    {
+        text: "Webview Demo",
+        icon: "fa-solid fa-globe",
+    },
+    {
+        text: "Webview Demo",
+        icon: "fa-solid fa-globe",
+        option: "has-navigation"
+    },
+    {
+        text: "iFrame Demo",
+        icon: "fa-solid fa-eye",
+    },
+]
+
+// Bottoms tabs of your sidebar
+export const SIDEBARBOTTOM = [
+    {
+        text: "Settings",
+        page: "Settings",
+        icon: "fa-solid fa-sliders",
+    }
+]
\ No newline at end of file
diff --git a/astro/layouts/App.astro b/astro/layouts/App.astro
index a9d99d0..8a65f3b 100644
--- a/astro/layouts/App.astro
+++ b/astro/layouts/App.astro
@@ -1,12 +1,12 @@
 ---
-import Sidebar from '../components/Sidebar.astro';
-import Page1 from '../components/pages/1.md';
-import Page2 from '../components/pages/2.astro';
-import Page3 from '../components/pages/3.astro';
-import Page3A from '../components/pages/3A.astro';
-import Page4 from '../components/pages/4.astro';
-import Settings from '../components/pages/Settings.md';
-import '../styles/index.scss';
+import Sidebar from '../components/Sidebar.astro'
+import Dashboard from '../components/pages/Dashboard.md'
+import Tab2 from '../components/pages/Tab2.astro'
+import Tab3 from '../components/pages/Tab3.astro'
+import Tab3A from '../components/pages/Tab3A.astro'
+import Tab4 from '../components/pages/Tab4.astro'
+import Settings from '../components/pages/Settings.astro'
+import '../styles/index.scss'
 ---
 
 <script src="./navigation.js" crossoarigin="anonymous"></script>
@@ -15,24 +15,13 @@ import '../styles/index.scss';
 <div class="content">
     <Sidebar />
     <div class="pages">
-        <div id="1" class="page active">
-            <Page1 />
-        </div>
-        <div id="2" class="page">
-            <Page2 />
-        </div>
-        <div id="3" class="page">
-            <Page3 />
-        </div>
-        <div id="3A" class="page">
-            <Page3A />
-        </div>
-        <div id="4" class="page">
-            <Page4 />
-        </div>
-        <div id="5" class="page">
-            <Settings />
-        </div>
+        <div id="Dashboard" class="page active"><Dashboard /></div>
+        <div id="Files" class="page"><Tab2 /></div>
+        <div id="Webview Demo" class="page"><Tab3 /></div>
+        <div id="Webview Demo" class="page"><Tab3A /></div>
+        <div id="iFrame Demo" class="page"><Tab4 /></div>
+        
+        <div id="Settings" class="page"><Settings /></div>
     </div>
 </div>