diff --git a/layouts/404.html b/layouts/404.html
index e69de29..fdf9bc1 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -0,0 +1,12 @@
+{{ 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/_default/single.html b/layouts/_default/single.html
index 9d19754..67e7581 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,9 +1,9 @@
 {{ partial "header.html" . }}
 {{ partial "navbar.html" . }}
 
-<div class="container">
+<div class="container content">
 	<div class="row">
-		<div class="col-lg-12 col-md-12 col-sm-12">
+		<div class="col-xs-12">
 			{{ .Content }}
 		</div>
 	</div>
diff --git a/layouts/docs/single.html b/layouts/docs/single.html
index 1a40d3a..cb1fee5 100644
--- a/layouts/docs/single.html
+++ b/layouts/docs/single.html
@@ -1,12 +1,12 @@
 {{ partial "header.html" . }}
 {{ partial "navbar.html" . }}
 
-<div class="container">
+<div class="container content">
 	<div class="row">
-		<div class="col-lg-3 col-md-3 col-sm-4 sidebar-offcanvas" id="sidebar">
+		<div class="col-sm-3">
 			{{ partial "menu" . }}
 		</div>
-		<div class="col-lg-9 col-md-9 col-sm-8">
+		<div class="col-sm-8">
 			{{ .Content }}
 		</div>
 	</div>
diff --git a/layouts/index.html b/layouts/index.html
index aba2572..015a11d 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -1,12 +1,12 @@
 {{ partial "header" . }}
 {{ partial "navbar" . }}
 
-<div class="container">
+<div class="container content">
 	<div class="row">
-		<div class="col-lg-3 col-md-3 col-sm-4 sidebar-offcanvas" id="sidebar">
+		<div class="col-sm-4 col-md-3">
 			{{ partial "menu" . }}
 		</div>
-		<div class="col-lg-9 col-md-9 col-sm-8">
+		<div class="col-sm-8 col-md-9">
 			{{ range where .Site.Pages "Type" "index" }}
 				{{ .Content }}
 			{{ end }}
diff --git a/layouts/page/single.html b/layouts/page/single.html
index 1a40d3a..c7096e7 100644
--- a/layouts/page/single.html
+++ b/layouts/page/single.html
@@ -1,12 +1,12 @@
 {{ partial "header.html" . }}
 {{ partial "navbar.html" . }}
 
-<div class="container">
+<div class="container content">
 	<div class="row">
-		<div class="col-lg-3 col-md-3 col-sm-4 sidebar-offcanvas" id="sidebar">
+		<div class="col-sm-4">
 			{{ partial "menu" . }}
 		</div>
-		<div class="col-lg-9 col-md-9 col-sm-8">
+		<div class="col-sm-8">
 			{{ .Content }}
 		</div>
 	</div>
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index ead7594..17ec260 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -1,22 +1,31 @@
-		<footer>
-			<div class="container">
-				<div class="row">
-					<div class="col-lg-6 copy">
-						<p>
-							Copyright &copy; 2016 <a href="{{ .Site.Params.Website }}">{{ .Site.Params.Author }}</a>. All rights reserved.
-						</p>
-					</div>
-					<div class="col-lg-6 love">
-						<p>
-							Made with <i class="fa fa-heart" aria-hidden="true"></i> and Hugo
-						</p>
-					</div>
-				</div>
+<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>
 			</div>
-		</footer>
+			<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>
 
-		<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.2.4/jquery.min.js"></script>
-		<script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/js/bootstrap.min.js"></script>
-		<script src="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 82447b0..d6d7146 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -2,34 +2,23 @@
 
 <html lang="en">
 	<head>
-		<title>{{ if not .IsHome }}{{ .Title }} - {{ end }}{{ .Site.Title }}</title>
+		<meta charset="utf-8">
+		<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>
 
-		{{ with .Params.goimport }}
-		<meta name="go-import" content="{{ . }}">
-		{{ end }}
-
-		{{ with .Params.gosource }}
-		<meta name="go-source" content="{{ . }}">
-		{{ end }}
-
-		<base href="{{ .Site.BaseURL }}">
 		<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 .RSSLink }}
 		<link href="{{ . }}" rel="alternate" type="application/rss+xml" title="{{ $.Site.Title }}" />
 		<link href="{{ . }}" rel="feed" type="application/rss+xml" title="{{ $.Site.Title }}" />
 		{{ end }}
-
-		<meta name="viewport" content="width=device-width, initial-scale=1">
-		<meta http-equiv="X-UA-Compatible" content="IE=edge" />
-
-		<link rel="shortcut icon" type="image/x-icon" href="images/favicon.png">
-		<link rel="icon" type="image/x-icon" href="images/favicon.png">
-
-		<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.6.3/css/font-awesome.min.css" />
-		<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.css" />
-		<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap-theme.min.css" />
-		<link rel="stylesheet" href="styles/main.css">
 	</head>
 	<body>
diff --git a/layouts/partials/navbar.html b/layouts/partials/navbar.html
index 5ff2578..53f32a3 100644
--- a/layouts/partials/navbar.html
+++ b/layouts/partials/navbar.html
@@ -1,20 +1,12 @@
-<nav class="navbar navbar-default navbar-fixed-top">
-	<div class="container">
-		<div class="navbar-header">
-			<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
-				<span class="sr-only">{{ i18n "navbar_menu" }}</span>
-				<span class="icon-bar"></span>
-				<span class="icon-bar"></span>
-				<span class="icon-bar"></span>
-			</button>
-
-			<a class="navbar-brand" href="{{ .Site.BaseURL }}">
-				{{ partial "title.html" . }}
-			</a>
-		</div>
-
-		<div id="navbar" class="collapse navbar-collapse">
+<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>
+	<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">
+		<ul class="nav navbar-nav float-xs-left float-md-right">
 			{{ partial "toplinks.html" . }}
-		</div>
+		</ul>
 	</div>
 </nav>
diff --git a/layouts/partials/toplinks.html b/layouts/partials/toplinks.html
index 29d723d..8b98eec 100644
--- a/layouts/partials/toplinks.html
+++ b/layouts/partials/toplinks.html
@@ -1,38 +1,36 @@
-<ul class="nav navbar-nav navbar-right">
-	<li class="{{ if eq .Site.Params.Toplink "website" }}active{{ end }}">
-		<a href="https://gitea.io">
-			<i class="fa fa-home"></i>
-			{{ i18n "toplink_website" }}
-		</a>
-	</li>
-	<li class="{{ if eq .Site.Params.Toplink "blog" }}active{{ end }}">
-		<a href="https://blog.gitea.io">
-			<i class="fa fa-rss"></i>
-			{{ i18n "toplink_blog" }}
-		</a>
-	</li>
-	<li class="{{ if eq .Site.Params.Toplink "docs" }}active{{ end }}">
-		<a href="https://docs.gitea.io">
-			<i class="fa fa-question"></i>
-			{{ i18n "toplink_docs" }}
-		</a>
-	</li>
-	<li class="{{ if eq .Site.Params.Toplink "redirects" }}active{{ end }}">
-		<a href="https://code.gitea.io">
-			<i class="fa fa-code"></i>
-			{{ i18n "toplink_code" }}
-		</a>
-	</li>
-	<li>
-		<a href="https://dl.gitea.io">
-			<i class="fa fa-download"></i>
-			{{ i18n "toplink_downloads" }}
-		</a>
-	</li>
-	<li>
-		<a href="https://github.com/go-gitea" target="_blank">
-			<i class="fa fa-github"></i>
-			{{ i18n "toplink_github" }}
-		</a>
-	</li>
-</ul>
+<li class="nav-item {{ if eq .Site.Params.Toplink " website" }}active{{ end }}">
+<a class="nav-link" href="https://gitea.io">
+	<i class="fa fa-home"></i>
+	{{ 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 " redirects" }}active{{ end }}">
+<a class="nav-link" href="https://code.gitea.io">
+	<i class="fa fa-code"></i>
+	{{ i18n "toplink_code" }}
+</a>
+</li>
+<li class="nav-item">
+	<a class="nav-link" href="https://dl.gitea.io">
+		<i class="fa fa-download"></i>
+		{{ i18n "toplink_downloads" }}
+	</a>
+</li>
+<li class="nav-item">
+	<a class="nav-link" href="https://github.com/go-gitea" target="_blank">
+		<i class="fa fa-github"></i>
+		{{ i18n "toplink_github" }}
+	</a>
+</li>
diff --git a/layouts/post/list.html b/layouts/post/list.html
index 7ddb981..396f623 100644
--- a/layouts/post/list.html
+++ b/layouts/post/list.html
@@ -1,9 +1,9 @@
 {{ partial "header.html" . }}
 {{ partial "navbar.html" . }}
 
-<div class="container">
+<div class="container content">
 	<div class="row">
-		<div class="col-lg-12 col-md-12 col-sm-12">
+		<div class="col-xs-12">
 			{{ $paginator := .Paginate (where .Data.Pages "Type" "post") }}{{ range $paginator.Pages }}
 				<article>
 					<header>
@@ -48,3 +48,4 @@
 </div>
 
 {{ partial "footer.html" . }}
+
diff --git a/layouts/post/single.html b/layouts/post/single.html
index fe70b76..9456ffb 100644
--- a/layouts/post/single.html
+++ b/layouts/post/single.html
@@ -1,9 +1,9 @@
 {{ partial "header.html" . }}
 {{ partial "navbar.html" . }}
 
-<div class="container">
+<div class="container content">
 	<div class="row">
-		<div class="col-lg-12 col-md-12 col-sm-12">
+		<div class="col-md-10 offset-md-1 col-lg-8 offset-lg-2">
 			<article>
 				<header>
 					<h2>