diff --git a/api.php b/api.php
index eba74610c6e7551a920a7824e38f0b91d6f79a21..8b110dd6a219dc7299b534b77eff3ebd32ffd78c 100644
--- a/api.php
+++ b/api.php
@@ -129,7 +129,7 @@ if ($_GET['get'] == 'episodes' && !empty($_GET['show']) && isset($_GET['season']
 	die;
 }
 
-if ($_GET['get'] == 'latest') {
+if ($_GET['get'] == 'latest' && $_GET['type'] == 'shows') {
 	$sbdb = new SQLite3($sbPath.'/sickbeard.db');
 	$eps = $sbdb->query("SELECT s.show_name, ep.name, ep.episode, ep.season, ep.airdate FROM tv_episodes AS ep JOIN tv_shows AS s ON ep.showid=s.tvdb_id WHERE ep.status LIKE '%4' ORDER BY ep.airdate DESC LIMIT 10;");
 	$output = array();
diff --git a/config.php-dist b/config.php-dist
index 4a0640dc41aa91761ede78fcf2f91e57b842a84d..de1b5f0d34700801174e4bc769ddb87887136901 100644
--- a/config.php-dist
+++ b/config.php-dist
@@ -1,6 +1,9 @@
 <?php
 
 $sbPath = '/opt/sickbeard';
+$cpPath = '/opt/sickbeard';
+
 $showsPath = '/mnt/storage/media/tv';
+$moviesPath = '/mnt/storage/media/movies';
 
 ?>
\ No newline at end of file
diff --git a/js/mediarack.js b/js/mediarack.js
index be0a03e7657d322e50d5d5fa3e195ae08f6637ad..3cb855f96b789772b30ebe05bc879df941a59bfd 100644
--- a/js/mediarack.js
+++ b/js/mediarack.js
@@ -16,7 +16,7 @@ $(document).ready(function() {
 	});
 	
 	$(window).scroll(function(){
-		if  ($(window).scrollTop()+1000 >= ($(document).height() - ($(window).height()))){
+		if  ($(window).scrollTop()+200 >= ($(document).height() - ($(window).height()))){
 			if (killScroll == false) {
 				killScroll = true;
 				getShows();
@@ -28,6 +28,7 @@ $(document).ready(function() {
 
 function getLatest() {
 	$.getJSON('api.php', {
+		'type': 'shows',
 		'get': 'latest'
 		}, function(data) {
 			$.each(data, function (key, ep) {
@@ -92,26 +93,26 @@ function getShows() {
 					});
 					ulSeasons.append(liSeason);
 				});
+				divShowContainer.append(divShowHeader);
+				divShowContainer.append(divShowBody);
+				divShowBody.append(divShowPoster);
+				divShowBody.append(ulSeasons);
+				divShowContainer.append(divShowFooter);
 				$("div.panel-body.lazy").lazyload({
 					//event: "scrollstop",
 					effect: "fadeIn",
-					threshold: 900
+					threshold: 100
 				});		
 				$("img.showPoster.lazy").lazyload({
 					//event: "scrollstop",
 					effect: "fadeIn",
-					threshold: 850
+					threshold: 100
 				});
 				$("img.showLogo.lazy").lazyload({
 					//event: "scrollstop",
 					effect: "fadeIn",
-					threshold: 700
+					threshold: 100
 				});
-				divShowContainer.append(divShowHeader);
-				divShowContainer.append(divShowBody);
-				divShowBody.append(divShowPoster);
-				divShowBody.append(ulSeasons);
-				divShowContainer.append(divShowFooter);
 				divShows.append(divShowContainer);
 				if(i < 5) {
 					divShowHeader.find("img.showLogo").attr('src', 'api.php?get=logo&show='+escape(show.folder)).removeClass('lazy');
@@ -121,8 +122,9 @@ function getShows() {
 				i++;
 			});
 			showOffset = showOffset+showLimit;
-			killScroll = false;
-			console.log(showOffset);
+			if(i > 0) {
+				killScroll = false;
+			}
 		}
 	);
 }