diff --git a/application/controllers/LibraryController.php b/application/controllers/LibraryController.php
index f333e4b49..c15704c43 100644
--- a/application/controllers/LibraryController.php
+++ b/application/controllers/LibraryController.php
@@ -32,16 +32,16 @@ class LibraryController extends Zend_Controller_Action
         $this->view->headScript()->appendFile('/js/airtime/onready/library.js','text/javascript');
 		$this->view->headScript()->appendFile('/js/contextmenu/jjmenu.js','text/javascript');
 		$this->view->headLink()->appendStylesheet('/css/contextmenu.css');
-		$this->view->headLink()->appendStylesheet('/css/media_library.css');
+		//$this->view->headLink()->appendStylesheet('/css/media_library.css');
 	
 		$this->_helper->layout->setLayout('library');
 
 		unset($this->search_sess->page);
 		unset($this->search_sess->md);
 		
+		$this->_helper->actionStack('index', 'playlist');
 		$this->_helper->actionStack('contents', 'library');
 		$this->_helper->actionStack('quick-search', 'library');
-		$this->_helper->actionStack('index', 'playlist');
     }
 
     public function contextMenuAction()
@@ -72,14 +72,14 @@ class LibraryController extends Zend_Controller_Action
 			if(!isset($pl_sess->id) || $pl_sess->id !== $id) {
 				$menu[] = array('action' => 
 									array('type' => 'ajax', 
-									'url' => '/Playlist/edit/view/spl'.$params, 
+									'url' => '/Playlist/edit'.$params, 
 									'callback' => 'window["openDiffSPL"]'), 
 								'title' => 'Edit');
 			}
 			else if(isset($pl_sess->id) && $pl_sess->id === $id) {
 				$menu[] = array('action' => 
 									array('type' => 'ajax', 
-									'url' => '/Playlist/close/view/spl'.$params, 
+									'url' => '/Playlist/close'.$params, 
 									'callback' => 'window["noOpenPL"]'), 
 								'title' => 'Close');
 			}
diff --git a/application/controllers/PlaylistController.php b/application/controllers/PlaylistController.php
index 0230bb5f0..f7def7e35 100644
--- a/application/controllers/PlaylistController.php
+++ b/application/controllers/PlaylistController.php
@@ -36,13 +36,10 @@ class PlaylistController extends Zend_Controller_Action
 			$pl = Playlist::Recall($pl_sess->id);
 			if($pl === FALSE) {
 				unset($pl_sess->id);
-				$this->_helper->redirector('index');
+				return;
 			}
-
 			return $pl;
 		}
-		
-		$this->_helper->redirector('index');
 	}
 
 	private function changePlaylist($pl_id){
@@ -84,15 +81,10 @@ class PlaylistController extends Zend_Controller_Action
 		$this->view->headLink()->appendStylesheet('/css/playlist_builder.css');
 
 		$this->_helper->viewRenderer->setResponseSegment('spl'); 
-
-        $pl_sess = $this->pl_sess;
-                        
-		if(isset($pl_sess->id)) {
-
-			$pl = $this->getPlaylist();
-			
-			$this->view->pl = $pl;
-		}
+             
+		$pl_sess = $this->pl_sess;
+         
+		$this->view->pl = $this->getPlaylist();
     }
 
     public function newAction()
diff --git a/application/views/scripts/playlist/index.phtml b/application/views/scripts/playlist/index.phtml
index d37aff9dc..d066e99f7 100644
--- a/application/views/scripts/playlist/index.phtml
+++ b/application/views/scripts/playlist/index.phtml
@@ -5,13 +5,12 @@
 <?php endif; ?>
 
 <?php if (isset($this->pl)) : ?>
-
 <div id="spl_name"><?php echo $this->pl->getName(); ?></div>
 <div id="spl_length"><?php echo $this->pl->getLength(); ?></div>
 
 <ul id="spl_sortable">
 	<?php if (count($this->pl->getContents())) : ?>
-	<?php echo $this->partialLoop('sideplaylist/sidebarcontent.phtml', $this->pl->getContents()); ?>
+	<?php echo $this->partialLoop('playlist/sidebarcontent.phtml', $this->pl->getContents()); ?>
 	<?php else : ?>
 	<li class="spl_empty">Empty playlist</li> 
 	<?php endif; ?>
diff --git a/application/views/scripts/playlist/update.phtml b/application/views/scripts/playlist/update.phtml
index 46231963f..64bd3c8a8 100644
--- a/application/views/scripts/playlist/update.phtml
+++ b/application/views/scripts/playlist/update.phtml
@@ -1,7 +1,5 @@
-<?php
-if (count($this->pl->getContents())) {
-	echo $this->partialLoop('sideplaylist/sidebarcontent.phtml', $this->pl->getContents());
-}
-else {
-	echo '<li class="pl_empty">Empty playlist</li>'; 
-}
+<?php if (count($this->pl->getContents())) : ?>
+<?php echo $this->partialLoop('playlist/sidebarcontent.phtml', $this->pl->getContents()); ?>
+<?php else : ?>
+<li class="pl_empty">Empty playlist</li>
+<?php endif; ?>