diff --git a/Changelog b/Changelog
index 94ded2094..e45ffeda3 100755
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
-2016-04-13 DariusIII
+2016-04-14 DariusIII
+	* Upd: Add link to forum and fix forum pages
 	* Upd: Update composer and themes with new autosize and colorbox libs.
 	* Fix: Fix PHP Fatal error on getid3
 2016-04-13 DariusIII
diff --git a/www/themes/Gentele/templates/basepage.tpl b/www/themes/Gentele/templates/basepage.tpl
index 507470032..8563fbece 100755
--- a/www/themes/Gentele/templates/basepage.tpl
+++ b/www/themes/Gentele/templates/basepage.tpl
@@ -108,12 +108,10 @@
 													class="fa fa-envelope-o"></i><span> Contact</span> <span
 													class="fa arrow"></span></a></li>
 									{if $loggedin == "true"}
-									<li><a href="{$smarty.const.WWW_TOP}/search"><i class="fa fa-search"></i> Search</a>
-									</li>
-									<li><a href="{$smarty.const.WWW_TOP}/rss"><i class="fa fa-rss"></i> RSS Feeds</a>
-									</li>
-									<li><a href="{$smarty.const.WWW_TOP}/apihelp"><i class="fa fa-cloud"></i> API</a>
-									</li>
+									<li><a href="{$smarty.const.WWW_TOP}/forum"><i class="fa fa-forumbee"></i> Search</a></li>
+									<li><a href="{$smarty.const.WWW_TOP}/search"><i class="fa fa-search"></i> Search</a></li>
+									<li><a href="{$smarty.const.WWW_TOP}/rss"><i class="fa fa-rss"></i> RSS Feeds</a></li>
+									<li><a href="{$smarty.const.WWW_TOP}/apihelp"><i class="fa fa-cloud"></i> API</a></li>
 									{/if}
 								</ul>
 							{if $loggedin == "true"}
diff --git a/www/themes/Gentele/templates/forum.tpl b/www/themes/Gentele/templates/forum.tpl
index 3b9a49280..f8aaf065c 100755
--- a/www/themes/Gentele/templates/forum.tpl
+++ b/www/themes/Gentele/templates/forum.tpl
@@ -4,7 +4,7 @@
 	{$pager}
 	<div style="float:right;margin-bottom:5px;"><a href="#new">New Post</a></div>
 	<a id="top"></a>
-	<table style="width:100%;" class="data highlight" id="forumtable">
+	<table style="width:100%;" class="data table table-striped responsive-utilities jambo-table" id="forumtable">
 		<tr>
 			<th width="60%">Topic</th>
 			<th>Posted By</th>
diff --git a/www/themes/Gentele/templates/forumpost.tpl b/www/themes/Gentele/templates/forumpost.tpl
index c5d2c5b82..3409e7ba3 100755
--- a/www/themes/Gentele/templates/forumpost.tpl
+++ b/www/themes/Gentele/templates/forumpost.tpl
@@ -4,7 +4,7 @@
 	<h2>{$results[0].subject|escape:"htmlall"}</h2>
 	<div style="float:right;margin-bottom:5px;"><a href="#reply">Reply</a></div>
 	<a id="top"></a>
-	<table style="width:100%;" class="data highlight" id="forumtable">
+	<table style="width:100%;" class="data table table-striped responsive-utilities jambo-table" id="forumtable">
 		<tr>
 			<th>By</th>
 			<th>Message</th>