diff --git a/templates/_badgemenu.html b/templates/_badgemenu.html
index ee36c328..bb6ed667 100644
--- a/templates/_badgemenu.html
+++ b/templates/_badgemenu.html
@@ -7,7 +7,7 @@
 		    <img src="https://www.gravatar.com/avatar/{{ .MD5 }}?s=50" class="img-circle special-img"> {{ .Username }} <b class="caret"></b></a>
 		    <ul class="dropdown-menu">
 		        <li><a href="{{ genRoute "user_profile" "id" (print .ID) "username" .Username }}"><i class="fa fa-cog"></i> Profile</a></li>
-		        {{if HasAdmin . }}<li><a href="{{ genRoute "user_profile" "id" (print .ID) "username" .Username }}"><i class="fa fa-cog"></i> Moderation</a></li>{{end}}
+		        {{if HasAdmin . }}<li><a href="{{ genRoute "mod_index" }}"><i class="fa fa-cog"></i> {{T "moderation"}}</a></li>{{end}}
 		        <li class="divider"></li>
 		        <li><a href="{{ genRoute "user_logout" }}"><i class="fa fa-sign-out"></i> {{ T "sign_out"}}</a></li>
 		    </ul>
diff --git a/templates/admin/commentlist.html b/templates/admin/commentlist.html
index 39cbca0a..e457da87 100644
--- a/templates/admin/commentlist.html
+++ b/templates/admin/commentlist.html
@@ -1,6 +1,6 @@
 {{define "title"}}Comments List{{end}}
 {{define "content"}}
-<table>
+<table class="table">
 {{ range .Comments}}
 
 <tr><td><a href="{{ genRoute "mod_cedit" }}?id={{.ID}}">{{ .Content }}</a></td><td><a href="{{ genRoute "mod_cedit" }}?id={{.ID}}">{{ .User.Username }}</a></td>
diff --git a/templates/admin/panelindex.html b/templates/admin/panelindex.html
index 5ada9c6c..aac03ffd 100644
--- a/templates/admin/panelindex.html
+++ b/templates/admin/panelindex.html
@@ -1,7 +1,7 @@
 {{define "title"}}Moderation Overview{{end}}
 {{define "content"}}
 <h3 id="torrents">Last Torrents</h3>
-<table>
+<table class="table">
 {{ range .Torrents}}
 
 <tr><td><a href="{{ genRoute "mod_tedit" }}?id={{.ID}}">{{ .Name }}</a></td><td><a href="{{ genRoute "mod_tlist" }}?userid={{.UploaderID}}">{{ .UploaderID }}</a></td>
@@ -14,7 +14,7 @@
           </ul>
       </nav>
 <h3 id="torrents">Last Torrents Report</h3>
-<table>
+<table class="table">
 {{ range .TorrentReports}}
 
 <tr><td><a href="{{ genRoute "mod_tedit" }}?id={{.Torrent.ID}}">{{ .Torrent.Name }}</a></td><td>{{.User.Username}}</td><td>{{.Description}}</td>
@@ -27,7 +27,7 @@
           </ul>
       </nav>
 <h3 id="users">Last Users</h3>
-<table>
+<table class="table">
 {{ range .Users}}
 
 <tr>
@@ -42,7 +42,7 @@
           </ul>
       </nav>
 <h3 id="comments">Last Comments</h3>
-<table>
+<table class="table">
 {{ range .Comments}}
 
 <tr><td><a href="{{ genRoute "mod_cedit" }}?id={{.ID}}">{{ .Content }}</a></td><td><a href="{{ genRoute "mod_cedit" }}?id={{.ID}}">{{ .User.Username }}</a></td>
diff --git a/templates/admin/torrent_report.html b/templates/admin/torrent_report.html
index 0874086b..fdc8c1fa 100644
--- a/templates/admin/torrent_report.html
+++ b/templates/admin/torrent_report.html
@@ -1,7 +1,7 @@
 {{define "title"}}Torrents Report{{end}}
 {{define "content"}}
-<table>
-<table>
+<table class="table">
+<table class="table">
     {{ range .Torrents}}
 <tr><td><a href="{{ genRoute "mod_tedit" }}?id={{.Torrent.ID}}">{{ .Torrent.Name }}</a></td><td>{{.User.Username}}</td><td>{{.Description}}</td><td><a href="{{ genRoute "mod_tdelete" }}?id={{ .Torrent.ID }}">Delete</a></td></tr>
     {{end}}
diff --git a/templates/admin/torrentlist.html b/templates/admin/torrentlist.html
index 269bc943..62fd365d 100644
--- a/templates/admin/torrentlist.html
+++ b/templates/admin/torrentlist.html
@@ -1,6 +1,6 @@
 {{define "title"}}Torrents List{{end}}
 {{define "content"}}
-<table>
+<table class="table">
 {{ range .Torrents}}
 
 <tr><td><a href="{{ genRoute "mod_tedit" }}?id={{.ID}}">{{ .Name }}</a></td><td><a href="{{ genRoute "mod_tlist" }}?userid={{.UploaderID}}">{{ .UploaderID }}</a></td>
diff --git a/templates/admin/userlist.html b/templates/admin/userlist.html
index 11b452a5..db67a2d8 100644
--- a/templates/admin/userlist.html
+++ b/templates/admin/userlist.html
@@ -1,6 +1,6 @@
 {{define "title"}}Users List{{end}}
 {{define "content"}}
-<table>
+<table class="table">
 {{ range .Users}}
 
 <tr>