diff --git a/CHANGELOG.md b/CHANGELOG.md
index d876b8756..abf5c40b6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,7 +17,7 @@
 - Fixed Undefined variable $wordCensor [\#1400](https://github.com/torrentpier/torrentpier/pull/1400) ([belomaxorka](https://github.com/belomaxorka))
 - Improved word censor 🤐 [\#1393](https://github.com/torrentpier/torrentpier/pull/1393) ([belomaxorka](https://github.com/belomaxorka))
 - Used hashing for filenames generation [\#1385](https://github.com/torrentpier/torrentpier/pull/1385) ([belomaxorka](https://github.com/belomaxorka))
-- Minor improvements [\#1382](https://github.com/torrentpier/torrentpier/pull/1382), [\#1383](https://github.com/torrentpier/torrentpier/pull/1383), [\#1391](https://github.com/torrentpier/torrentpier/pull/1391), [\#1398](https://github.com/torrentpier/torrentpier/pull/1398), [\#1405](https://github.com/torrentpier/torrentpier/pull/1405) ([belomaxorka](https://github.com/belomaxorka))
+- Minor improvements [\#1382](https://github.com/torrentpier/torrentpier/pull/1382), [\#1383](https://github.com/torrentpier/torrentpier/pull/1383), [\#1391](https://github.com/torrentpier/torrentpier/pull/1391), [\#1398](https://github.com/torrentpier/torrentpier/pull/1398), [\#1405](https://github.com/torrentpier/torrentpier/pull/1405), [\#1406](https://github.com/torrentpier/torrentpier/pull/1406) ([belomaxorka](https://github.com/belomaxorka))
 - Some bugfixes [\#1380](https://github.com/torrentpier/torrentpier/pull/1380) ([belomaxorka](https://github.com/belomaxorka))
 - New Crowdin updates [\#1384](https://github.com/torrentpier/torrentpier/pull/1384), [\#1389](https://github.com/torrentpier/torrentpier/pull/1389), [\#1392](https://github.com/torrentpier/torrentpier/pull/1392), [\#1402](https://github.com/torrentpier/torrentpier/pull/1402), [\#1403](https://github.com/torrentpier/torrentpier/pull/1403) ([Exileum](https://github.com/Exileum))
 
diff --git a/admin/admin_forums.php b/admin/admin_forums.php
index 73479cb0b..f367903ac 100644
--- a/admin/admin_forums.php
+++ b/admin/admin_forums.php
@@ -54,16 +54,7 @@ if (isset($_REQUEST['addforum']) || isset($_REQUEST['addcategory'])) {
 }
 
 // Check for demo mode
-if (IN_DEMO_MODE && in_array($mode, [
-        // Category
-        'editcat',
-        'modcat',
-        'deletecat',
-        // Forum
-        'editforum',
-        'modforum',
-        'deleteforum'
-    ])) {
+if (IN_DEMO_MODE && in_array($mode, ['deletecat', 'deleteforum'])) {
     bb_die($lang['CANT_EDIT_IN_DEMO_MODE']);
 }
 
diff --git a/library/includes/page_footer.php b/library/includes/page_footer.php
index bdabc2539..da3dd1469 100644
--- a/library/includes/page_footer.php
+++ b/library/includes/page_footer.php
@@ -25,7 +25,7 @@ if (!empty($template)) {
     $template->pparse('page_footer');
 }
 
-$show_dbg_info = (APP_DEBUG && !(isset($_GET['pane']) && $_GET['pane'] == 'left'));
+$show_dbg_info = (!IS_GUEST && APP_DEBUG && !(isset($_GET['pane']) && $_GET['pane'] == 'left'));
 
 if (!$bb_cfg['gzip_compress']) {
     flush();
diff --git a/styles/templates/default/index.tpl b/styles/templates/default/index.tpl
index d90a72348..c627a6643 100644
--- a/styles/templates/default/index.tpl
+++ b/styles/templates/default/index.tpl
@@ -162,7 +162,7 @@
 <!-- IF LOGGED_IN and SHOW_FORUMS -->
 <div id="mark_all_forums_read">
 	<a href="{U_SEARCH_NEW}" class="med">{L_SEARCH_NEW}</a> &#0183;
-	<a href="{U_INDEX}" class="med" onclick="setCookie('{#COOKIE_MARK#}', 'all_forums'); window.location.reload();">{L_MARK_ALL_FORUMS_READ}</a>
+	<a href="#" class="med" onclick="setCookie('{#COOKIE_MARK#}', 'all_forums'); window.location.reload();">{L_MARK_ALL_FORUMS_READ}</a>
 </div>
 <!-- ENDIF -->
 
diff --git a/styles/templates/default/viewtopic.tpl b/styles/templates/default/viewtopic.tpl
index 7e1e34562..6d69996f9 100644
--- a/styles/templates/default/viewtopic.tpl
+++ b/styles/templates/default/viewtopic.tpl
@@ -11,6 +11,7 @@
 	$(document).ready(function(){ $('div.sp-head').click(); });
 </script>
 <!-- ENDIF -->
+<!-- ENDIF / LOGGED_IN -->
 
 <!-- IF $bb_cfg['show_post_bbcode_button'] -->
 <script type="text/javascript">
@@ -37,7 +38,6 @@
     })();
 </script>
 <!-- ENDIF -->
-<!-- ENDIF / LOGGED_IN -->
 
 <!-- IF $bb_cfg['use_ajax_posts'] && (AUTH_DELETE || AUTH_REPLY || AUTH_EDIT) -->
 <script type="text/javascript">