diff --git a/lib/backup-versions.php b/lib/backup-versions.php
index 64214e4..af00d46 100644
--- a/lib/backup-versions.php
+++ b/lib/backup-versions.php
@@ -148,6 +148,10 @@ let restoreVersion = function() {
 }
 </script>
 
+<?php
+echo $systemClass->getDemoModeIndicator(true);
+?>
+
 </body>
 
 </html>
diff --git a/lib/multiple-results.php b/lib/multiple-results.php
index 43fdeb3..7e082bc 100644
--- a/lib/multiple-results.php
+++ b/lib/multiple-results.php
@@ -283,6 +283,10 @@ if (true === isset($_GET['target']) && false !== strpos($_GET['target'], "filena
     };
 </script>
 
+<?php
+echo $systemClass->getDemoModeIndicator(true);
+?>
+
 </body>
 
 </html>
diff --git a/lib/plugins-manager.php b/lib/plugins-manager.php
index ff26292..31270a3 100644
--- a/lib/plugins-manager.php
+++ b/lib/plugins-manager.php
@@ -165,7 +165,7 @@ function deletePlugin($dir) {
 
 <h1><?php echo $t['plugins'];?></h1>
 
-<a href="javascript:parent.ICEcoder.showManual('<?php echo $ICEcoder["versionNo"];?>','plugins')" style="position: absolute; top: 26px; right: 20px"><div style="padding: 10px; background: #333; color: #fff; font-size: 18px"><?php echo $t['Guide to writing...'];?></div></a>
+<a href="javascript:parent.ICEcoder.showManual('<?php echo $ICEcoder["versionNo"];?>','plugins')" style="position: absolute; top: 26px; right: 20px"><div style="position: relative; display: inline-block; padding: 10px; background: #333; color: #fff; font-size: 18px; z-index: 2"><?php echo $t['Guide to writing...'];?></div></a>
 <div class="pluginsPane">
     <?php
     $plugins = $ICEcoder['plugins'];
@@ -257,6 +257,10 @@ function deletePlugin($dir) {
     </div>
 </div>
 
+<?php
+echo $systemClass->getDemoModeIndicator(true);
+?>
+
 </body>
 
 </html>
diff --git a/lib/properties.php b/lib/properties.php
index ced0430..a4e9b20 100644
--- a/lib/properties.php
+++ b/lib/properties.php
@@ -173,6 +173,10 @@ const validatePerms = function() {
 }
 </script>
 
+<?php
+echo $systemClass->getDemoModeIndicator(true);
+?>
+
 </body>
 
 </html>
diff --git a/lib/settings-screen.php b/lib/settings-screen.php
index 54ff47f..e43ee5c 100644
--- a/lib/settings-screen.php
+++ b/lib/settings-screen.php
@@ -516,6 +516,10 @@ function submitSettings() {
 <input type="hidden" name="csrf" value="<?php echo $_SESSION["csrf"]; ?>">
 </form>
 
+<?php
+echo $systemClass->getDemoModeIndicator(false);
+?>
+
 </body>
 
 </html>
diff --git a/lib/terminal-xhr.php b/lib/terminal-xhr.php
index ee0b369..274f550 100644
--- a/lib/terminal-xhr.php
+++ b/lib/terminal-xhr.php
@@ -54,7 +54,7 @@ if (true === $demoMode) {
     exit;
 }
 
-// If in demo mode, display message and go no further
+// If no command, display message and go no further
 if (false === isset($_REQUEST['command'])) {
     echo json_encode([
         "output" => returnHTMLPromptCommand($_REQUEST['command'] . "<br><br>Sorry, no command received"),