diff --git a/www/templates/charisma/views/frontend/basepage.tpl b/www/templates/charisma/views/frontend/basepage.tpl
index c2205ffe5..870c281dc 100644
--- a/www/templates/charisma/views/frontend/basepage.tpl
+++ b/www/templates/charisma/views/frontend/basepage.tpl
@@ -129,6 +129,8 @@
 													class="fa fa-music"></i><span> Music</span></a></li>
 									<li><a href="{$serverroot}games"><i
 													class="fa fa-gamepad"></i><span> Games</span></a></li>
+									<li><a href="{$serverroot}series"><i
+													class="fa fa-desktop"></i><span> TV</span></a></li>
 									<li><a href="{$serverroot}xxx"><i class="fa fa-ban"></i><span> XXX</span></a></li>
 									<li><a href="{$serverroot}books"><i class="fa fa-book"></i><span> Books</span></a>
 									</li>
diff --git a/www/templates/charisma/views/frontend/headermenu.tpl b/www/templates/charisma/views/frontend/headermenu.tpl
index a4529deff..815bc3b24 100644
--- a/www/templates/charisma/views/frontend/headermenu.tpl
+++ b/www/templates/charisma/views/frontend/headermenu.tpl
@@ -13,6 +13,7 @@
 							<hr>
 							<li><a href="{$smarty.const.WWW_TOP}/series">TV Series</a></li>
 							<li><a href="{$smarty.const.WWW_TOP}/calendar">TV Calendar</a></li>
+							<li><a href="{$smarty.const.WWW_TOP}/anime">Anime Series</a></li>
 							<li><a href="{$smarty.const.WWW_TOP}/myshows">My Shows</a></li>
 							<hr>
 							{foreach from=$parentcat.subcatlist item=subcat}
diff --git a/www/templates/charisma/views/frontend/viewanime.tpl b/www/templates/charisma/views/frontend/viewanime.tpl
index fc134195f..ba69f6563 100644
--- a/www/templates/charisma/views/frontend/viewanime.tpl
+++ b/www/templates/charisma/views/frontend/viewanime.tpl
@@ -1,3 +1,11 @@
+{if $nodata != ""}
+<div class="header">
+	{assign var="catsplit" value=">"|explode:$catname}
+	<h2>View > <strong>Anime</strong></h2>
+	<p>{$nodata}</p>
+</div>
+{else}
+
 <div class="header">
 	{assign var="catsplit" value=">"|explode:$catname}
 	<h2>View > <strong>Anime</strong></h2>
@@ -9,16 +17,20 @@
 	</div>
 </div>
 <h1>
-	{$animeTitle}{if isset($isadmin)}<a class="btn btn-xs btn-warning" title="Edit AniDB data"
-										href="{$smarty.const.WWW_TOP}/admin/anidb-edit.php?id={$animeanidbid}&amp;from={$smarty.server.REQUEST_URI|escape:"url"}">
-			Edit</a>{/if}
+	{$animeTitle}
+	{if isset($isadmin)}
+		<a class="btn btn-xs btn-warning"
+		   title="Edit AniDB data"
+		   href="{$smarty.const.WWW_TOP}/admin/anidb-edit.php?id={$animeanidbid}&amp;
+					from={$smarty.server.REQUEST_URI|escape:"url"}">Edit</a>
+	{/if}
 </h1>
 {if $catname != ''}<span class="text-info h5">Current category shown: {$catname|escape:"htmlall"}</span>{/if}
 <div>
 	{if animePicture != ""}
 		<center>
 			<img class="shadow img img-polaroid" alt="{$animeTitle} Picture"
-				 src="{$smarty.const.WWW_TOP}/covers/anime/{$animeanidbid}.jpg"/>
+				 src="{$smarty.const.WWW_TOP}/covers/anime/{$animeAnidbID}.jpg"/>
 		</center>
 		<br/>
 	{/if}
@@ -163,4 +175,5 @@
 							{/foreach}
 						{/foreach}
 					</table>
-</form>
\ No newline at end of file
+</form>
+{/if}
\ No newline at end of file
diff --git a/www/templates/omicron/views/frontend/basepage.tpl b/www/templates/omicron/views/frontend/basepage.tpl
index ae5ba5ac5..c8e3e2534 100644
--- a/www/templates/omicron/views/frontend/basepage.tpl
+++ b/www/templates/omicron/views/frontend/basepage.tpl
@@ -194,6 +194,8 @@
 											class="fa fa-music"></i><span> Music</span></a></li>
 							<li><a href="{$serverroot}games"><i
 											class="fa fa-gamepad"></i><span> Games</span></a></li>
+							<li><a href="{$serverroot}series"><i
+											class="fa fa-desktop"></i><span> TV</span></a></li>
 							<li><a href="{$serverroot}xxx"><i class="fa fa-ban"></i><span> XXX</span></a></li>
 							<li><a href="{$serverroot}books"><i class="fa fa-book"></i><span> Books</span></a></li>
 							<li><a href="{$serverroot}browse"><i
diff --git a/www/templates/omicron/views/frontend/headermenu.tpl b/www/templates/omicron/views/frontend/headermenu.tpl
index a4529deff..815bc3b24 100644
--- a/www/templates/omicron/views/frontend/headermenu.tpl
+++ b/www/templates/omicron/views/frontend/headermenu.tpl
@@ -13,6 +13,7 @@
 							<hr>
 							<li><a href="{$smarty.const.WWW_TOP}/series">TV Series</a></li>
 							<li><a href="{$smarty.const.WWW_TOP}/calendar">TV Calendar</a></li>
+							<li><a href="{$smarty.const.WWW_TOP}/anime">Anime Series</a></li>
 							<li><a href="{$smarty.const.WWW_TOP}/myshows">My Shows</a></li>
 							<hr>
 							{foreach from=$parentcat.subcatlist item=subcat}
diff --git a/www/templates/omicron/views/frontend/viewanime.tpl b/www/templates/omicron/views/frontend/viewanime.tpl
index fc134195f..ba69f6563 100644
--- a/www/templates/omicron/views/frontend/viewanime.tpl
+++ b/www/templates/omicron/views/frontend/viewanime.tpl
@@ -1,3 +1,11 @@
+{if $nodata != ""}
+<div class="header">
+	{assign var="catsplit" value=">"|explode:$catname}
+	<h2>View > <strong>Anime</strong></h2>
+	<p>{$nodata}</p>
+</div>
+{else}
+
 <div class="header">
 	{assign var="catsplit" value=">"|explode:$catname}
 	<h2>View > <strong>Anime</strong></h2>
@@ -9,16 +17,20 @@
 	</div>
 </div>
 <h1>
-	{$animeTitle}{if isset($isadmin)}<a class="btn btn-xs btn-warning" title="Edit AniDB data"
-										href="{$smarty.const.WWW_TOP}/admin/anidb-edit.php?id={$animeanidbid}&amp;from={$smarty.server.REQUEST_URI|escape:"url"}">
-			Edit</a>{/if}
+	{$animeTitle}
+	{if isset($isadmin)}
+		<a class="btn btn-xs btn-warning"
+		   title="Edit AniDB data"
+		   href="{$smarty.const.WWW_TOP}/admin/anidb-edit.php?id={$animeanidbid}&amp;
+					from={$smarty.server.REQUEST_URI|escape:"url"}">Edit</a>
+	{/if}
 </h1>
 {if $catname != ''}<span class="text-info h5">Current category shown: {$catname|escape:"htmlall"}</span>{/if}
 <div>
 	{if animePicture != ""}
 		<center>
 			<img class="shadow img img-polaroid" alt="{$animeTitle} Picture"
-				 src="{$smarty.const.WWW_TOP}/covers/anime/{$animeanidbid}.jpg"/>
+				 src="{$smarty.const.WWW_TOP}/covers/anime/{$animeAnidbID}.jpg"/>
 		</center>
 		<br/>
 	{/if}
@@ -163,4 +175,5 @@
 							{/foreach}
 						{/foreach}
 					</table>
-</form>
\ No newline at end of file
+</form>
+{/if}
\ No newline at end of file