diff --git a/css/mediarack.css b/css/mediarack.css
index d9831c4acd5de3543d985855d7c5647e036e7469..c8be1d75cfa2214da154b69d8f0055ba1c846aa8 100644
--- a/css/mediarack.css
+++ b/css/mediarack.css
@@ -1,3 +1,9 @@
+html { 
+	overflow: -moz-scrollbars-vertical; 
+	overflow: scroll; 
+	/* overflow-y: scroll; *doesn�t work with firefox*/ 
+}
+
 body {
 	padding-top: 70px;
 }
@@ -30,8 +36,12 @@ body {
 	height: 220px;
 }
 
-.episodes {
-	margin-top: 5px;
+table.episodes {
+	margin-top: 10px;
+}
+
+table.episodes  tr td{
+	font-weight: bold;
 }
 
 .panel-title {
@@ -41,4 +51,8 @@ body {
 div.panel-body.lazy {
 	background: repeat-y top center;
 	background-size: 100% auto;
+}
+
+div#shows {
+	display: none;
 }
\ No newline at end of file
diff --git a/index.php b/index.php
index e06371f86714ab84463982a8fb29c8d893cb813b..12209d17fa6c7bf2feb902248cd866baabe25fd4 100644
--- a/index.php
+++ b/index.php
@@ -40,30 +40,16 @@
         </div>
         <div class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
-            <li class="active"><a href="#">Home</a></li>
-            <li><a href="#about">About</a></li>
-            <li class="dropdown">
-              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
-              <ul class="dropdown-menu">
-                <li><a href="#">Action</a></li>
-                <li><a href="#">Another action</a></li>
-                <li><a href="#">Something else here</a></li>
-                <li class="divider"></li>
-                <li class="dropdown-header">Nav header</li>
-                <li><a href="#">Separated link</a></li>
-                <li><a href="#">One more separated link</a></li>
-              </ul>
-            </li>
-          </ul>
-          <ul class="nav navbar-nav navbar-right">
-            <li class="active"><a href="./">foobar</a></li>
+			<li class="active"><a href="#home">Home</a></li>
+            <li><a href="#shows">TV Shows</a></li>
+            <li><a href="#movies">Movies</a></li>
           </ul>
         </div><!--/.nav-collapse -->
       </div>
     </div>
 
     <div class="container">
-		<div id="shows"></div>
+		<div class="content" id="shows"></div>
     </div> <!-- /container -->
 
 
diff --git a/js/mediarack.js b/js/mediarack.js
index 733fac26b9cebc13cc672bc6e4e9732d7ca765b9..ea3519552b2725e173f50746bd5ad589ece68919 100644
--- a/js/mediarack.js
+++ b/js/mediarack.js
@@ -1,6 +1,14 @@
 $(document).ready(function() {
 
 	getShows();
+	
+	$(".nav a").on('click',function(e) {
+		e.preventDefault();
+		$('.content').hide();
+		$(".nav li").removeClass('active');
+		$(this).parent().addClass('active');
+		$($(this).attr('href')).show();
+	});
 
 });
 
@@ -10,6 +18,7 @@ function getShows() {
 		}, function(data) {
 			var divShows = $("#shows");
 			divShows.empty();
+			var i = 0;
 			$.each(data, function (key, show) {
 				var divShowContainer = $('<div class="show panel panel-default" data-showid="'+show.id+'" id="show_'+show.id+'"></div>');
 				var divShowHeader = $('<div class="showName panel-heading"><h2 class="panel-title text-center"><img class="showLogo lazy" style="min-height: 50px; height: 50px;" alt="'+show.name+'" data-original="api.php?get=logo&show='+escape(show.folder)+'" src="" /></h2></div>');
@@ -32,8 +41,6 @@ function getShows() {
 				divShowContainer.append(divShowHeader);
 				divShowBody.append(divShowPoster);
 				divShowBody.append(ulSeasons);
-				//divShowBody.css('background', 'url(api.php?get=fanart&show='+escape(show.folder)+') repeat-y top center');
-				//divShowHeader.append('<img class="showLogo" alt="'+show.name+'" src="api.php?get=logo&show='+escape(show.folder)+'" />');
 				$("img.showLogo.lazy").lazyload({
 					event: "scrollstop",
 					effect: "fadeIn",
@@ -52,6 +59,12 @@ function getShows() {
 				divShowContainer.append(divShowBody);
 				divShowContainer.append(divShowFooter);
 				divShows.append(divShowContainer);
+				if(i < 3) {
+					divShowHeader.find("img.showLogo").attr('src', 'api.php?get=logo&show='+escape(show.folder));
+					divShowBody.css('background-image', 'url(api.php?get=fanart&show='+escape(show.folder)+')');
+					divShowPoster.find("img.showPoster").attr('src', 'api.php?get=poster&show='+escape(show.folder));
+				}
+				i++;
 			});
 		}
 	);
@@ -89,7 +102,7 @@ function getEpisodes(show, season) {
 						status = "text-default";
 					
 				}
-				var liEpisode = $('<tr class="episode '+status+'"><td>'+episode.episode+'</td><td>'+episode.name+'</td><td class="text-right">'+episode.airdate+'</td></tr>');
+				var liEpisode = $('<tr class="episode text-'+status+'"><td>'+episode.episode+'</td><td>'+episode.name+'</td><td class="text-right">'+episode.airdate+'</td></tr>');
 				olEpisodes.append(liEpisode);
 			});
 			liSeason.append(olEpisodes);