diff --git a/themes/danbooru/layout.class.php b/themes/danbooru/layout.class.php
index 6eb5957d..2be9b572 100644
--- a/themes/danbooru/layout.class.php
+++ b/themes/danbooru/layout.class.php
@@ -98,6 +98,7 @@ class Layout {
 		$custom_links .= "<li><a href='".make_link('post/list')."'>Posts</a></li>";
 		$custom_links .= "<li><a href='".make_link('comment/list')."'>Comments</a></li>";
 		$custom_links .= "<li><a href='".make_link('tags')."'>Tags</a></li>";
+		$custom_links .= "<li><a href='".make_link('upload')."'>Upload</a></li>";
 		$custom_links .= "<li><a href='".make_link('wiki')."'>Wiki</a></li>";
 		$custom_links .= "<li><a href='".make_link('wiki/more')."'>More &raquo;</a></li>";
 
@@ -114,6 +115,7 @@ class Layout {
 <html>
 	<head>
 		<title>{$page->title}</title>
+		<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
 		<link rel="stylesheet" href="$data_href/themes/$theme_name/style.css" type="text/css">
 $header_html
 		<script src='$data_href/themes/$theme_name/sidebar.js' type='text/javascript'></script>
