diff --git a/airtime_mvc/application/forms/SmartBlockCriteria.php b/airtime_mvc/application/forms/SmartBlockCriteria.php
index 4c307cdb9..bc22b731d 100644
--- a/airtime_mvc/application/forms/SmartBlockCriteria.php
+++ b/airtime_mvc/application/forms/SmartBlockCriteria.php
@@ -370,6 +370,10 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
         // add elelments that needs to be added
         // set multioption for modifier according to criteria_field
         $modRowMap = array();
+        if (!isset($data['criteria'])) {
+            return $data;
+        }
+
         foreach ($data['criteria'] as $critKey=>$d) {
             $count = 1;
             foreach ($d as $modKey=>$modInfo) {
diff --git a/airtime_mvc/application/layouts/scripts/layout.phtml b/airtime_mvc/application/layouts/scripts/layout.phtml
index 98ecccb3d..e2e486415 100644
--- a/airtime_mvc/application/layouts/scripts/layout.phtml
+++ b/airtime_mvc/application/layouts/scripts/layout.phtml
@@ -67,7 +67,9 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
             </li>
         </ul>
         <a href="/Plupload">
-            <button id="add_media_btn" class="btn btn-small dashboard-btn">Upload</button>
+            <button id="add_media_btn" class="btn btn-small dashboard-btn btn-new">
+                <span><?php echo _("Upload") ?></span>
+            </button>
         </a>
     </div>
     <div class="media_type_selector top-link" data-selection-id="1">
diff --git a/airtime_mvc/application/models/Block.php b/airtime_mvc/application/models/Block.php
index a61c68658..767a982e7 100644
--- a/airtime_mvc/application/models/Block.php
+++ b/airtime_mvc/application/models/Block.php
@@ -1517,27 +1517,27 @@ SQL;
                     $i++;
                 }
             }
-
-            // check if file exists
-            $qry->add("file_exists", "true", Criteria::EQUAL);
-            $qry->add("hidden", "false", Criteria::EQUAL);
-            $sortTracks = 'random';
-            if (isset($storedCrit['sort'])) {
-                $sortTracks = $storedCrit['sort']['value'];
-            }
-            if ($sortTracks == 'newest') {
-                $qry->addDescendingOrderByColumn('utime');
-            }
-            else if ($sortTracks == 'oldest') {
-                $qry->addAscendingOrderByColumn('utime');
-            }
-            else if ($sortTracks == 'random') {
-                $qry->addAscendingOrderByColumn('random()');
-            } else {
-                Logging::warning("Unimplemented sortTracks type in ".__FILE__);
-            }
-
         }
+
+        // check if file exists
+        $qry->add("file_exists", "true", Criteria::EQUAL);
+        $qry->add("hidden", "false", Criteria::EQUAL);
+        $sortTracks = 'random';
+        if (isset($storedCrit['sort'])) {
+            $sortTracks = $storedCrit['sort']['value'];
+        }
+        if ($sortTracks == 'newest') {
+            $qry->addDescendingOrderByColumn('utime');
+        }
+        else if ($sortTracks == 'oldest') {
+            $qry->addAscendingOrderByColumn('utime');
+        }
+        else if ($sortTracks == 'random') {
+            $qry->addAscendingOrderByColumn('random()');
+        } else {
+            Logging::warning("Unimplemented sortTracks type in ".__FILE__);
+        }
+
         // construct limit restriction
         $limits = array();
         
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 7f99abf97..032ae669f 100644
--- a/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml
+++ b/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml
@@ -89,9 +89,9 @@
                 }
                 $nextDisabled = $this->element->getElement("sp_criteria_field_".$nextIndex)->getAttrib('disabled') == 'disabled'?true:false;
         ?>
-            <div <?php if (($i > 0) && $disabled) {
-                           echo 'style=display:none';
-                       } ?>>
+            <div <?php if (/*($i > 0) && */ $disabled) {
+                          echo 'style=display:none';
+                      } ?> >
                 <?php echo $this->element->getElement("sp_criteria_field_".$i."_".$j) ?>
                 <?php echo $this->element->getElement("sp_criteria_modifier_".$i."_".$j) ?>
                 <?php echo $this->element->getElement("sp_criteria_value_".$i."_".$j) ?>
diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css
index f2a21787d..6d099d4fd 100644
--- a/airtime_mvc/public/css/styles.css
+++ b/airtime_mvc/public/css/styles.css
@@ -3275,6 +3275,9 @@ dd .stream-status {
 
 #add_media_btn {
     width: 100%;
+    font-size: 16px;
+    height: 38px;
+    border-radius: 3px;
 }
 
 .add-show-submit.btn:hover {
@@ -3296,11 +3299,11 @@ dd .stream-status {
 }
 
 .btn-new {
-    background: #237686;
+    background: #246B86;
 }
 .btn-new:active, .btn-new:hover,
 .btn-new[disabled], .btn-new[disabled]:active {
-    background-color: #1c606e;
+    background-color: #185b6e;
 }
 
 .dark_class
diff --git a/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js b/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js
index d44ce8b30..57c3666a0 100644
--- a/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js
+++ b/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js
@@ -11,18 +11,30 @@ function setSmartBlockEvents() {
         
         var div = $('dd[id="sp_criteria-element"]').children('div:visible:last');
 
-        div.find('.db-logic-label').text('and').show();
-        div = div.next().show();
+        if (div.length == 0) {
+            div = $('dd[id="sp_criteria-element"]').children('div:first');
+            div.children().removeAttr('disabled');
+            div.show();
 
-        div.children().removeAttr('disabled');
-        div = div.next();
-        if (div.length === 0) {
-            $(this).hide();
+            appendAddButton();
+            appendModAddButton();
+            removeButtonCheck();
+
+        } else {
+
+            div.find('.db-logic-label').text('and').show();
+            div = div.next().show();
+
+            div.children().removeAttr('disabled');
+            div = div.next();
+            if (div.length === 0) {
+                $(this).hide();
+            }
+
+            appendAddButton();
+            appendModAddButton();
+            removeButtonCheck();
         }
-        
-        appendAddButton();
-        appendModAddButton();
-        removeButtonCheck();
     });
     
     /********** ADD MODIFIER ROW **********/
@@ -512,7 +524,9 @@ function callback(json, type) {
 
             form.find('.success').show();
         }
-	    form.find('.smart-block-form').removeClass("closed");
+        removeButtonCheck();
+
+        form.find('.smart-block-form').removeClass("closed");
     } else {
         if (json.result == "0") {
             $('.active-tab #sp-success-saved').text($.i18n._('Smart block saved')).show();
@@ -524,6 +538,7 @@ function callback(json, type) {
         }
         else {
             AIRTIME.playlist.playlistResponse(json);
+            removeButtonCheck();
         }
         form.find('.smart-block-form').removeClass("closed");
     }
@@ -551,6 +566,7 @@ function appendAddButton() {
 }
 
 function removeButtonCheck() {
+    /*
     var rows = $('.active-tab dd[id="sp_criteria-element"]').children('div'),
         enabled = rows.find('select[name^="sp_criteria_field"]:enabled'),
         rmv_button = enabled.siblings('a[id^="criteria_remove"]');
@@ -560,7 +576,7 @@ function removeButtonCheck() {
     } else {
         rmv_button.removeAttr('disabled');
         rmv_button.show();
-    }
+    }*/
 }
 
 function enableLoadingIcon() {