diff --git a/i18n/de.yaml b/i18n/de.yaml
deleted file mode 100644
index 6472e51..0000000
--- a/i18n/de.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-- id: navbar_menu
-  translation: "Menü"
-
-- id: toplink_website
-  translation: "Website"
-
-- id: toplink_blog
-  translation: "Blog"
-
-- id: toplink_docs
-  translation: "Doku"
-
-- id: toplink_code
-  translation: "Quelltext"
-
-- id: toplink_downloads
-  translation: "Downloads"
-
-- id: toplink_github
-  translation: "GitHub"
-
-- id: read_more
-  translation: "Mehr..."
-
-- id: page_prev
-  translation: "Vorherige"
-
-- id: page_next
-  translation: "Nächste"
diff --git a/i18n/en.yaml b/i18n/en-US.yaml
similarity index 100%
rename from i18n/en.yaml
rename to i18n/en-US.yaml
diff --git a/i18n/zh.yaml b/i18n/zh-CN.yaml
similarity index 100%
rename from i18n/zh.yaml
rename to i18n/zh-CN.yaml
diff --git a/layouts/404.html b/layouts/404.html
deleted file mode 100644
index fdf9bc1..0000000
--- a/layouts/404.html
+++ /dev/null
@@ -1,12 +0,0 @@
-{{ partial "header" . }}
-{{ partial "navbar" . }}
-
-<div class="container content">
-	<div class="row">
-		<div class="col-xs-12">
-			<h1>Oops. We're sorry, but this page does not exist.</h1>
-		</div>
-	</div>
-</div>
-
-{{ partial "footer" . }}
diff --git a/layouts/index.html b/layouts/index.html
index 015a11d..fa60ef7 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -3,11 +3,8 @@
 
 <div class="container content">
 	<div class="row">
-		<div class="col-sm-4 col-md-3">
-			{{ partial "menu" . }}
-		</div>
-		<div class="col-sm-8 col-md-9">
-			{{ range where .Site.Pages "Type" "index" }}
+		<div class="col-xs-12">
+			{{ range .Site.Pages }}
 				{{ .Content }}
 			{{ end }}
 		</div>
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 17ec260..3f0600a 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -1,31 +1,18 @@
-<footer class="footer">
-	<div class="container">
-		<!--<div class="row">-->
-			<!--<div class="col-xs-12">-->
-				<!--<ul class="nav navbar-nav">-->
-					<!--{{ partial "toplinks.html" . }}-->
-				<!--</ul>-->
-			<!--</div>-->
-		<!--</div>-->
-		<div class="row">
-			<div class="col-xs-12 col-md-8 text-xs-center text-md-left">
-				<p>
-					Copyright &copy; 2016 <a href="{{ .Site.Params.Website }}">{{ .Site.Params.Author }}</a>. All rights
-					reserved.
-				</p>
+		<footer class="footer">
+			<div class="container">
+				<div class="row">
+					<div class="col-xs-12 text-xs-center">
+						<p>
+							Copyright &copy; 2016 <a href="{{ .Site.Params.Website }}">{{ .Site.Params.Author }}</a>. All rights reserved. Made with <i class="fa fa-heart" aria-hidden="true"></i> and <a href="https://gohugo.io">Hugo</a>
+						</p>
+					</div>
+				</div>
 			</div>
-			<div class="col-xs-12 col-md-4 text-xs-center text-md-right">
-				<p>
-					Made with <i class="fa fa-heart" aria-hidden="true"></i> and <a href="https://gohugo.io">Hugo</a>
-				</p>
-			</div>
-		</div>
-	</div>
-</footer>
+		</footer>
 
-<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.5/js/bootstrap.min.js"></script>
-<script src="{{.Site.BaseURL}}scripts/main.js"></script>
-</body>
+		<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
+		<script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js"></script>
+		<script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.5/js/bootstrap.min.js"></script>
+		<script src="{{.Site.BaseURL}}scripts/main.js"></script>
+	</body>
 </html>
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index d6d7146..07c8483 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -6,19 +6,23 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 		<meta http-equiv="x-ua-compatible" content="ie=edge">
 		{{ .Hugo.Generator }}
-		{{ with .Params.goimport }}<meta name="go-import" content="{{ . }}">{{ end }}
-		{{ with .Params.gosource }}<meta name="go-source" content="{{ . }}">{{ end }}
+
 		<title>{{ if not .IsHome }}{{ .Title }} - {{ end }}{{ .Site.Title }}</title>
 
-		<link rel="canonical" href="{{ .Permalink }}">
-		<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.6.3/css/font-awesome.min.css" />
-		<link rel="stylesheet" href="{{ .Site.BaseURL }}styles/main.css">
-		<link rel="shortcut icon" type="image/x-icon" href="{{ .Site.BaseURL }}images/favicon.png">
-		<link rel="icon" type="image/x-icon" href="{{ .Site.BaseURL }}images/favicon.png">
+		{{ with .Params.goimport }}<meta name="go-import" content="{{ . }}">{{ end }}
+		{{ with .Params.gosource }}<meta name="go-source" content="{{ . }}">{{ end }}
 
 		{{ with .RSSLink }}
-		<link href="{{ . }}" rel="alternate" type="application/rss+xml" title="{{ $.Site.Title }}" />
-		<link href="{{ . }}" rel="feed" type="application/rss+xml" title="{{ $.Site.Title }}" />
+			<link href="{{ . }}" rel="alternate" type="application/rss+xml" title="{{ $.Site.Title }}" />
+			<link href="{{ . }}" rel="feed" type="application/rss+xml" title="{{ $.Site.Title }}" />
 		{{ end }}
+
+		<link rel="canonical" href="{{ .Permalink }}">
+
+		<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.6.3/css/font-awesome.min.css" />
+		<link rel="stylesheet" href="{{ .Site.BaseURL }}styles/main.css">
+
+		<link rel="shortcut icon" type="image/x-icon" href="{{ .Site.BaseURL }}images/favicon.png">
+		<link rel="icon" type="image/x-icon" href="{{ .Site.BaseURL }}images/favicon.png">
 	</head>
 	<body>
diff --git a/layouts/partials/navbar.html b/layouts/partials/navbar.html
index 53f32a3..fc5f8fe 100644
--- a/layouts/partials/navbar.html
+++ b/layouts/partials/navbar.html
@@ -1,10 +1,12 @@
 <nav class="navbar navbar-light bg-faded">
-	<button class="navbar-toggler hidden-md-up float-xs-right" type="button" data-toggle="collapse" data-target="#navbarResponsive"
-			aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation"></button>
+	<button class="navbar-toggler hidden-md-up float-xs-right" type="button" data-toggle="collapse" data-target="#navbar-responsive"
+		aria-controls="navbar-responsive" aria-expanded="false" aria-label="Toggle navigation"></button>
+
 	<a class="navbar-brand" href="{{ .Site.BaseURL }}">
 		<img src="{{ .Site.BaseURL }}images/gitea.png" alt="{{ .Site.Title }}">
 	</a>
-	<div class="collapse navbar-toggleable-sm" id="navbarResponsive" style="clear: right">
+
+	<div class="collapse navbar-toggleable-sm" id="navbar-responsive">
 		<ul class="nav navbar-nav float-xs-left float-md-right">
 			{{ partial "toplinks.html" . }}
 		</ul>
diff --git a/layouts/partials/pages.html b/layouts/partials/pages.html
index 6a3dd12..d8c713d 100644
--- a/layouts/partials/pages.html
+++ b/layouts/partials/pages.html
@@ -1,12 +1,30 @@
-<section>
-	<ul>
-		{{ $currentNode := . }}{{ range .Site.Menus.sidebar.ByWeight }}
-			<li class="{{ if $currentNode.IsMenuCurrent "sidebar" . }}active{{ end }}">
-				<a href="{{ .URL }}">
-					{{ .Pre }}
-					{{ .Name }}
-				</a>
-			</li>
+<aside>
+	<ul class="nav">
+		{{ $currentNode := . }}{{ range .Site.Menus.sidebar }}
+			{{ if .HasChildren }}
+				<li class="nav-item">
+					<a class="nav-link" href="#">
+						{{ .Pre }}
+						{{ .Name }}
+					</a>
+					<ul>
+						{{ range .Children }}
+							<li class="nav-item">
+								<a class="nav-link{{ if $currentNode.IsMenuCurrent "sidebar" . }} active{{ end }}" href="{{ .URL | relLangURL }}">
+									{{ .Name }}
+								</a>
+							</li>
+						{{ end }}
+					</ul>
+				</li>
+			{{ else }}
+				<li class="nav-item">
+					<a class="nav-link{{ if $currentNode.HasMenuCurrent "sidebar" . }} active{{ end }}" href="{{ .URL | relLangURL }}">
+						{{ .Pre }}
+						{{ .Name }}
+					</a>
+				</li>
+			{{ end }}
 		{{ end }}
 	</ul>
-</section>
+</aside>
diff --git a/layouts/partials/toc.html b/layouts/partials/toc.html
index 9ac136f..8fba373 100644
--- a/layouts/partials/toc.html
+++ b/layouts/partials/toc.html
@@ -1,5 +1,5 @@
 {{ if .Params.toc }}
-	<section>
+	<!-- <aside>
 		{{ .TableOfContents }}
-	</section>
+	</aside> -->
 {{ end }}
diff --git a/layouts/partials/toplinks.html b/layouts/partials/toplinks.html
index 00d9981..7398ec4 100644
--- a/layouts/partials/toplinks.html
+++ b/layouts/partials/toplinks.html
@@ -4,18 +4,18 @@
 		{{ i18n "toplink_website" }}
 	</a>
 </li>
-<li class="nav-item{{ if eq .Site.Params.Toplink "blog" }} active{{ end }}">
-	<a class="nav-link" href="https://blog.gitea.io">
-		<i class="fa fa-rss"></i>
-		{{ i18n "toplink_blog" }}
-	</a>
-</li>
 <li class="nav-item{{ if eq .Site.Params.Toplink "docs" }} active{{ end }}">
 	<a class="nav-link" href="https://docs.gitea.io">
 		<i class="fa fa-question"></i>
 		{{ i18n "toplink_docs" }}
 	</a>
 </li>
+<li class="nav-item{{ if eq .Site.Params.Toplink "blog" }} active{{ end }}">
+	<a class="nav-link" href="https://blog.gitea.io">
+		<i class="fa fa-rss"></i>
+		{{ i18n "toplink_blog" }}
+	</a>
+</li>
 <li class="nav-item{{ if eq .Site.Params.Toplink "redirects" }} active{{ end }}">
 	<a class="nav-link" href="https://code.gitea.io">
 		<i class="fa fa-code"></i>
diff --git a/layouts/post/list.html b/layouts/post/list.html
index 579e13f..9908422 100644
--- a/layouts/post/list.html
+++ b/layouts/post/list.html
@@ -15,7 +15,11 @@
 						<p>
 							<i>{{ .Date.Format "Mon Jan 2, 2006" }}</i>
 							{{ i18n "authored_by" }}
-							<b>{{ .Params.author | default .Site.Params.author }}</b>
+							<b>
+								<a href="https://github.com/{{ .Params.author | default .Site.Params.author }}">
+									{{ .Params.author | default .Site.Params.author }}
+								</a>
+							</b>
 						</p>
 					</header>
 
diff --git a/layouts/post/single.html b/layouts/post/single.html
index d3f262c..0905c7d 100644
--- a/layouts/post/single.html
+++ b/layouts/post/single.html
@@ -3,7 +3,7 @@
 
 <div class="container content">
 	<div class="row">
-		<div class="col-md-10 offset-md-1 col-lg-8 offset-lg-2">
+		<div class="col-xs-12">
 			<article>
 				<header>
 					<h2>
@@ -14,7 +14,11 @@
 					<p>
 						<i>{{ .Date.Format "Mon Jan 2, 2006" }}</i>
 						{{ i18n "authored_by" }}
-						<b>{{ .Params.author | default .Site.Params.author }}</b>
+						<b>
+							<a href="https://github.com/{{ .Params.author | default .Site.Params.author }}">
+								{{ .Params.author | default .Site.Params.author }}
+							</a>
+						</b>
 					</p>
 				</header>
 
diff --git a/src/main.scss b/src/main.scss
index 9510217..3f3340c 100644
--- a/src/main.scss
+++ b/src/main.scss
@@ -14,13 +14,15 @@
   }
 }
 
+#navbar-responsive {
+  clear: right;
+}
+
 .footer {
   width: 100%;
   padding: 32px 0;
   background-color: #f7f7f9;
 
-
-
   p {
     margin: 0;
     padding: 16px 0;