diff --git a/inc/config.php b/inc/config.php
index d40f7654..521d3eb3 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -202,7 +202,7 @@
 	// Correspond to above permission directives
 	define('MOD_LINK_DELETE', '[D]', true);
 	define('MOD_LINK_BAN', '[B]', true);
-	define('MOD_LINK_BANDELETE', '[B&D]', true);
+	define('MOD_LINK_BANDELETE', '[B&amp;D]', true);
 	define('MOD_LINK_DELETEFILE', '[F]', true);
 	define('MOD_LINK_DELETEBYIP', '[D+]', true);
 	define('MOD_LINK_STICKY', '[Sticky]', true);
diff --git a/inc/display.php b/inc/display.php
index 58f26960..edcbf21b 100644
--- a/inc/display.php
+++ b/inc/display.php
@@ -138,7 +138,7 @@
 				($index?'':' onclick="highlightReply(' . $this->id . ');"') .
 				' href="' . $this->root . $board['dir'] . DIR_RES . $this->thread . '.html' . '#' . $this->id . '">No.</a>' . 
 			// JavaScript cite
-				'<a class="post_no"' . ($index?'':'onclick="citeReply(' . $this->id . ');"') . 'href="' . ($index?$this->root . $board['dir'] . DIR_RES . $this->thread . '.html' . '#q' . $this->id:'javascript:void(0);') . '">'.$this->id.'</a>' . 
+				'<a class="post_no"' . ($index?'':' onclick="citeReply(' . $this->id . ');"') . ' href="' . ($index?$this->root . $board['dir'] . DIR_RES . $this->thread . '.html' . '#q' . $this->id:'javascript:void(0);') . '">'.$this->id.'</a>' . 
 			'</p>';
 		
 			// File info
@@ -290,7 +290,7 @@
 			($index?'':' onclick="highlightReply(' . $this->id . ');"') .
 			' href="' . $this->root . $board['dir'] . DIR_RES . $this->id . '.html' . '#' . $this->id . '">No.</a>' . 
 			// JavaScript cite
-			'<a class="post_no"' . ($index?'':'onclick="citeReply(' . $this->id . ');"') . 'href="' . ($index?$this->root . $board['dir'] . DIR_RES . $this->id . '.html' . '#q' . $this->id:'javascript:void(0);') . '">'.$this->id.'</a>' .
+			'<a class="post_no"' . ($index?'':' onclick="citeReply(' . $this->id . ');"') . ' href="' . ($index?$this->root . $board['dir'] . DIR_RES . $this->id . '.html' . '#q' . $this->id:'javascript:void(0);') . '">'.$this->id.'</a>' .
 			// Sticky
 			($this->sticky ? '<img class="icon" title="Sticky" src="' . IMAGE_STICKY . '" />' : '') .
 			// Locked
diff --git a/templates/index.html b/templates/index.html
index 99c60d4f..d0702ba9 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -3,8 +3,7 @@
 <head>
 	<link rel="stylesheet" media="screen" href="{index}style.css"/>
 	<title>{board[url]} - {board[name]}</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf8" />
-	<meta http-equiv="Cache-Control" content="no-cache, must-revalidate" />
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
 	<script type="text/javascript" src="{index}main.js"></script>
 </head>
diff --git a/templates/page.html b/templates/page.html
index d8b78898..f8525e01 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -3,7 +3,7 @@
 <head>
 	<link rel="stylesheet" media="screen" href="{index}style.css"/>
 	<title>{title}</title>
-	<meta http-equiv="Cache-Control" content="no-cache, must-revalidate" />
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
 </head>
 <body>
diff --git a/templates/thread.html b/templates/thread.html
index 58b5028c..2fd03418 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -3,8 +3,7 @@
 <head>
 	<link rel="stylesheet" media="screen" href="{index}style.css"/>
 	<title>{board[url]} - {board[name]}</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf8" />
-	<meta http-equiv="Cache-Control" content="no-cache, must-revalidate" />
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
 	<script type="text/javascript" src="{index}main.js"></script>
 </head>
