diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php
index 78fd1abe5..eeb2b9d35 100644
--- a/airtime_mvc/application/controllers/LibraryController.php
+++ b/airtime_mvc/application/controllers/LibraryController.php
@@ -79,7 +79,7 @@ class LibraryController extends Zend_Controller_Action
                 if (!$obj->isStatic()){
                     unset($menu["play"]);
                 }
-                if ($isAdminOrPM || $obj->getCreatorId() == $user->getId()) {
+                if (($isAdminOrPM || $obj->getCreatorId() == $user->getId()) && $screen == "playlist") {
                     if ($this->obj_sess->type === "playlist") {
                         $menu["pl_add"] = array("name"=> "Add to Playlist", "icon" => "add-playlist", "icon" => "copy");
                     }
diff --git a/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml b/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml
index 056c48ec8..faedcf169 100644
--- a/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml
+++ b/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml
@@ -1,5 +1,5 @@
 <form id="smart-playlist-form" method="post" action="">
-<fieldset class='toggle <?php echo $this->openOption ? "" : "closed"?>' id='smart_playlist_options'>
+<fieldset class='sp-scrollable toggle <?php echo $this->openOption ? "" : "closed"?>' id='smart_playlist_options'>
 <legend style='cursor: pointer;'><span class='ui-icon ui-icon-triangle-2-n-s'></span>Smart Playlist Options</legend>
     <dl class='zend_form'>
         <div id='sp-success' class='success' style='display:none'></div>
@@ -17,7 +17,7 @@
                   </label>
             <?php $i = $i + 1; ?>
             <?php endforeach; ?>
-                        
+            
             <?php echo $this->element->getElement('save_button') ?>
             <?php echo $this->element->getElement('generate_button') ?>
             <?php echo $this->element->getElement('shuffle_button') ?>
diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css
index 55c8ad23c..f852f0915 100644
--- a/airtime_mvc/public/css/styles.css
+++ b/airtime_mvc/public/css/styles.css
@@ -484,6 +484,11 @@ table.library-get-file-md.table-small{
 
 
 /***** SMART PLAYLIST SPECIFIC STYLES BEGIN *****/
+.sp-scrollable{
+    overflow-x: auto;
+    width: 781px;
+}
+
 .sp-invisible{
     visibility: hidden;
 }
diff --git a/airtime_mvc/public/js/airtime/playlist/smart_playlistbuilder.js b/airtime_mvc/public/js/airtime/playlist/smart_playlistbuilder.js
index 2e45ff323..71ce2640e 100644
--- a/airtime_mvc/public/js/airtime/playlist/smart_playlistbuilder.js
+++ b/airtime_mvc/public/js/airtime/playlist/smart_playlistbuilder.js
@@ -155,7 +155,8 @@ function setSmartPlaylistEvents() {
         item_to_hide.children().attr('disabled', 'disabled');
         item_to_hide.find('[name^="sp_criteria_field"]').val(0).end()
                     .find('[name^="sp_criteria_modifier"]').val(0).end()
-                    .find('[name^="sp_criteria_value"]').val('');
+                    .find('[name^="sp_criteria_value"]').val('').end()
+                    .find('[name^="sp_criteria_extra"]').val('');
         
         sizeTextBoxes(item_to_hide.find('[name^="sp_criteria_value"]'), 'sp_extra_input_text', 'sp_input_text');
         item_to_hide.hide();