diff --git a/airtime_mvc/application/views/scripts/library/library.phtml b/airtime_mvc/application/views/scripts/library/library.phtml
index 0b60020c5..ec96a3a44 100644
--- a/airtime_mvc/application/views/scripts/library/library.phtml
+++ b/airtime_mvc/application/views/scripts/library/library.phtml
@@ -1,5 +1,5 @@
 <div id="import_status" class="library_import" style="display:none">File import in progress... <img src="/css/images/file_import_loader.gif"></img></div>
-<fieldset class="toggle" id="filter_options">
+<fieldset class="toggle closed" id="filter_options">
     <legend style="cursor: pointer;"><span class="ui-icon ui-icon-triangle-2-n-s"></span>Advanced Search Options</legend>
     <div id="advanced_search" class="advanced_search form-horizontal"></div>
 </fieldset>
diff --git a/airtime_mvc/application/views/scripts/showbuilder/builderDialog.phtml b/airtime_mvc/application/views/scripts/showbuilder/builderDialog.phtml
index 92331d6cc..46ce9488e 100644
--- a/airtime_mvc/application/views/scripts/showbuilder/builderDialog.phtml
+++ b/airtime_mvc/application/views/scripts/showbuilder/builderDialog.phtml
@@ -1,7 +1,7 @@
 <div class="wrapper">
     <div id="library_content" class="lib-content tabs ui-widget ui-widget-content block-shadow alpha-block padded">
         <div id="import_status" style="display:none">File import in progress...</div>
-        <fieldset class="toggle" id="filter_options">
+        <fieldset class="toggle closed" id="filter_options">
             <legend style="cursor: pointer;"><span class="ui-icon ui-icon-triangle-2-n-s"></span>Advanced Search Options</legend>
             <div id="advanced_search" class="advanced_search form-horizontal"></div>
         </fieldset>
diff --git a/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js b/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js
index 4b139f66e..5392cbd49 100644
--- a/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js
+++ b/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js
@@ -64,8 +64,9 @@ var AIRTIME = (function(AIRTIME) {
                     helper : function() {
 
                         var $el = $(this), selected = mod
-                                .getChosenAudioFilesLength(), container, message, li = $("#side_playlist ul[id='spl_sortable'] li:first"), width = li
-                                .width(), height = 55;
+                                .getChosenAudioFilesLength(), container, message, li = $("#side_playlist ul[id='spl_sortable'] li:first"),
+                                width = li.width(), height = 55;
+                        if (width > 798) width = 798;
 
                         // dragging an element that has an unselected
                         // checkbox.
diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js
index 21d0b5c43..c64825393 100644
--- a/airtime_mvc/public/js/airtime/showbuilder/builder.js
+++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js
@@ -649,6 +649,8 @@ var AIRTIME = (function(AIRTIME){
             },
             "fnDrawCallback": function fnBuilderDrawCallback(oSettings, json) {
                 if (!isInitialized) {
+                    //when coming to 'Now Playing' page we want the page
+                    //to jump to the current track
                     if ($(this).find("."+NOW_PLAYING_CLASS).length > 0) {
                         mod.jumpToCurrentTrack();
                     }
@@ -985,13 +987,18 @@ var AIRTIME = (function(AIRTIME){
                     "<i class='icon-white icon-cut'></i></button></div>")
             .append("<div class='btn-group'>" +
                     "<button title='Remove selected scheduled items' class='ui-state-disabled btn btn-small' disabled='disabled'>" +
-                    "<i class='icon-white icon-trash'></i></button></div>")
-            .append("<div class='btn-group'>" +
+                    "<i class='icon-white icon-trash'></i></button></div>");
+
+        //if 'Add/Remove content' was chosen from the context menu
+        //in the Calendar do not append these buttons
+        if ($(".ui-dialog-content").length === 0) {
+            $menu.append("<div class='btn-group'>" +
                     "<button  title='Jump to the current playing track' class='ui-state-disabled btn btn-small' disabled='disabled'>" +
                     "<i class='icon-white icon-step-forward'></i></button></div>")
             .append("<div class='btn-group'>" +
                     "<button title='Cancel current show' class='ui-state-disabled btn btn-small btn-danger' disabled='disabled'>" +
                     "<i class='icon-white icon-ban-circle'></i></button></div>");
+        }
 
         $toolbar.append($menu);
         $menu = undefined;
diff --git a/airtime_mvc/tests/phpunit.xml b/airtime_mvc/tests/phpunit.xml
index e69de29bb..01ad1609e 100644
--- a/airtime_mvc/tests/phpunit.xml
+++ b/airtime_mvc/tests/phpunit.xml
@@ -0,0 +1,2 @@
+
+<!-- b bs -->