diff --git a/assets/script.js b/assets/script.js
index f4a20c6..36ec5f9 100644
--- a/assets/script.js
+++ b/assets/script.js
@@ -273,7 +273,7 @@ async function onPageLoad() {
     if ("news" === currentSite && "index" === currentPage) {
         await articleInit();
     }
-    if ("files" === currentSite && "index" === currentPage) {
+    if ("account" === currentSite && "files" === currentPage) {
         await listFiles();
     }
     if ("memes" === currentSite && "create" === currentPage) {
diff --git a/lib/meme.php b/lib/meme.php
index 239ad9b..e790072 100644
--- a/lib/meme.php
+++ b/lib/meme.php
@@ -54,12 +54,15 @@ function renderMemeGallery(): string
 
     // Fetch the results
     $memes_out = '';
+    $meme_template = file_get_contents($routerConfig['template_dir'] . "meme.html");
     while ($stmtlist->fetch()) {
         if (str_starts_with($fileType, 'image')) {
-            $memes_out .= renderMeme($memeID, $authorID, $title, $textContent, $createdAt, $filePath, $userNickname, file_get_contents($routerConfig['template_dir'] . "meme.html"));
+            $memes_out .= renderMeme($memeID, $authorID, $title, $textContent, $createdAt, $filePath, $userNickname, $meme_template);
         }
     }
+    $meme_add = isLoggedIn() ? file_get_contents($routerConfig['template_dir'] . 'meme_add.html') : '';
     $meme_gallery_out = str_replace('__TEMPLATE_MEMES_HERE__', $memes_out, $meme_gallery_template);
+    $meme_gallery_out = str_replace('__TEMPLATE_MEME_ADD__', $meme_add, $meme_gallery_out);
 
 // Close the statement
     $stmtlist->close();
diff --git a/pages/files/upload.html b/pages/account/files.html
similarity index 75%
rename from pages/files/upload.html
rename to pages/account/files.html
index 45d4d31..dcc89c4 100644
--- a/pages/files/upload.html
+++ b/pages/account/files.html
@@ -1,5 +1,6 @@
 <!--suppress HtmlUnknownTag, HtmlUnknownTag -->
-<page minimal_permission_level="2" secret="yes" page_title="Nahrať"></page>
+<page minimal_permission_level="2" secret="yes" page_title="Súbory"></page>
+<div id="filelist"></div>
 <form id="uploadForm" enctype="multipart/form-data" method="POST">
     <label for="fileInput">Send this file: </label>
     <input name="userfile" type="file" id="fileInput" multiple />
diff --git a/pages/files/index.html b/pages/files/index.html
deleted file mode 100644
index f759890..0000000
--- a/pages/files/index.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<!--suppress HtmlUnknownTag, HtmlUnknownTag -->
-<page minimal_permission_level="2" secret="yes" page_title="Zoznam"></page>
-<div id="filelist"></div>
\ No newline at end of file
diff --git a/pages/memes/create.html b/templates/meme_add.html
similarity index 76%
rename from pages/memes/create.html
rename to templates/meme_add.html
index 655c383..69cd3f9 100644
--- a/pages/memes/create.html
+++ b/templates/meme_add.html
@@ -1,5 +1,3 @@
-<!--suppress HtmlUnknownTag, HtmlUnknownTag -->
-<page minimal_permission_level="2" secret="yes" page_title="Vytvoriť"></page>
 <form id="memeAddForm">
     <label for="meme_title_input">Názov meme-u: </label>
     <input type="text" id="meme_title_input"/>
diff --git a/templates/meme_gallery.html b/templates/meme_gallery.html
index 283e425..9477a63 100644
--- a/templates/meme_gallery.html
+++ b/templates/meme_gallery.html
@@ -7,4 +7,5 @@
     <div id="meme_gallery">
         __TEMPLATE_MEMES_HERE__
     </div>
+    __TEMPLATE_MEME_ADD__
 </main>
\ No newline at end of file