diff --git a/assets/style.css b/assets/style.css
index 9fb23b7..a897989 100644
--- a/assets/style.css
+++ b/assets/style.css
@@ -18,11 +18,17 @@
 }
 
 body {
+    display: grid;
+    width: 100%;
+    grid-template-areas: "nav nav nav nav"
+                         "main main main main"
+                         "foot foot foot foot";
+    grid-template-rows: 2fr 1fr 2fr 1fr;
+    grid-template-columns: 1fr 1fr 1fr 1fr;
     align-items: center;
     background: linear-gradient(127deg, var(--secondary-bg), var(--primary-bg)) no-repeat fixed;
     background-size: cover;
     color: var(--primary-text);
-    display: flex;
     flex-direction: column;
     font-family: \'Poppins\', sans-serif;
     height: 100%;
@@ -30,7 +36,20 @@ body {
     min-height: 100vh;
     min-width: 100vw;
     padding: 0;
-    width: 100%;
+}
+
+body > nav {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    height: 55px;
+    position: relative;
+    z-index: 500;
+    grid-area: nav;
+}
+
+body > footer {
+    grid-area: foot;
 }
 
 header h1 {
@@ -86,13 +105,6 @@ li.navpage_item {
     padding-right: 20px;
 }
 
-nav {
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-    height: 55px;
-}
-
 nav,
 footer {
     -moz-box-shadow: 0 20px 28px 0 rgba(0, 0, 0, 0.6);
@@ -208,6 +220,12 @@ ul.navpage_list {
 }
 
 @media (max-width: 1050px) {
+
+    div#articleslist {
+        width: 100vw !important;
+        left: 0 !important;
+    }
+
     #toggle_button {
         display: flex;
     }
@@ -306,11 +324,6 @@ ul.navpage_list {
     text-align: center;
 }
 
-#navbar_container {
-    position: relative;
-    z-index: 500;
-}
-
 #navbar_container,
 #page_container,
 #footer_container {
diff --git a/pages/home/account.php b/pages/account/index.php
similarity index 100%
rename from pages/home/account.php
rename to pages/account/index.php
diff --git a/pages/home/settings.php b/pages/account/settings.php
similarity index 100%
rename from pages/home/settings.php
rename to pages/account/settings.php
diff --git a/pages/rozvrh/prvac.html b/pages/rozvrh/prvac.html
new file mode 100644
index 0000000..b040265
--- /dev/null
+++ b/pages/rozvrh/prvac.html
@@ -0,0 +1,23 @@
+<page minimal_permission_level="2" secret="no" page_title="1. C"></page>
+
+<table>
+    <tbody>
+    <tr>
+        <th>0 (7:10 - 7:55)</th>
+        <th>1 (8:00 - 8:45)</th>
+        <th>2 (8:50 - 9:35)</th>
+        <th>3 (9:45 - 10:30)</th>
+        <th>4 (10:50 - 11:35)</th>
+        <th>5 (11:45 - 12:30)</th>
+        <th>6 (12:40 - 13:25)</th>
+        <th>7 (13:30 - 14:15)</th>
+    </tr>
+        <tr></tr>
+        <tr>MAT</tr>
+        <tr>ELK</tr>
+        <tr>SJL</tr>
+        <tr colspan="2">ZER</tr>
+        <tr>MAT</tr>
+        <tr>ANJ</tr>
+    </tbody>
+</table>
\ No newline at end of file
diff --git a/templates/footer.html b/templates/footer.html
index ab09b37..b98413c 100644
--- a/templates/footer.html
+++ b/templates/footer.html
@@ -1,3 +1 @@
-<footer>
-<p>Toto nie je oficiálna stránka <span class="ye-span">Adlerky</span>, jedná sa o neoficiálnu študentskú stránku</p>
-</footer>
\ No newline at end of file
+<p>Toto nie je oficiálna stránka <span class="ye-span">Adlerky</span>, jedná sa o neoficiálnu študentskú stránku</p>
\ No newline at end of file
diff --git a/templates/nav.html b/templates/nav.html
index 5ae78c2..593e9ef 100644
--- a/templates/nav.html
+++ b/templates/nav.html
@@ -1,13 +1,11 @@
-<nav>
-    <div class="logo">
-        <picture id="standard-logo">
-            <source media="(min-width:4200px)" srcset="/assets/images/adlerka_256.png">
-            <source media="(min-width:2100px)" srcset="/assets/images/adlerka_128.png">
-            <img src="/assets/images/adlerka_64.png" alt="Adlerka logo" style="width:auto;">
-        </picture>
-    </div>
-    <i class="ri-menu-line" id="toggle_button"></i>
-    <ul id="navsite_list">
-        __NAV_PAGES__
-    </ul>
-</nav>
\ No newline at end of file
+<div class="logo">
+    <picture id="standard-logo">
+        <source media="(min-width:4200px)" srcset="/assets/images/adlerka_256.png">
+        <source media="(min-width:2100px)" srcset="/assets/images/adlerka_128.png">
+        <img src="/assets/images/adlerka_64.png" alt="Adlerka logo" style="width:auto;">
+    </picture>
+</div>
+<i class="ri-menu-line" id="toggle_button"></i>
+<ul id="navsite_list">
+    __NAV_PAGES__
+</ul>
\ No newline at end of file
diff --git a/templates/skeleton.html b/templates/skeleton.html
index daa5b57..1d8037b 100644
--- a/templates/skeleton.html
+++ b/templates/skeleton.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link rel="stylesheet" href="/assets/3rdparty/fonts/remixicon/remixicon.css">
     <link rel="stylesheet" href="/assets/style.css">
-    <link rel="icon" href="/assets/images/favicon.png">
+    <link rel="icon" href="/assets/images/favicon.png" type="image/png">
     __TEMPLATE__DYNAMIC__SCRIPT__
     __TEMPLATE__DYNAMIC__STYLE__
     <script async src="https://umami.brn.systems/script.js" data-website-id="95e93885-5c19-4cab-ba9b-2f746a316a2a"></script>
@@ -14,15 +14,15 @@
     __TEMPLATE_SEO_STUFF__
 </head>
 <body>
-    <div id="navbar_container">
+    <nav id="navbar_container">
         __TEMPLATE__NAV__
-    </div>
+    </nav>
     <div id="statusMessageContainer"></div>
-    <div id="page_container">
+    <page id="page_container">
         __TEMPLATE__PAGE__
-    </div>
-    <div id="footer_container">
+    </page>
+    <footer id="footer_container">
         __TEMPLATE__FOOTER__
-    </div>
+    </footer>
 </body>
 </html>
\ No newline at end of file