diff --git a/airtime_mvc/application/forms/SmartBlockCriteria.php b/airtime_mvc/application/forms/SmartBlockCriteria.php
index 5e724c017..e9a5b8adb 100644
--- a/airtime_mvc/application/forms/SmartBlockCriteria.php
+++ b/airtime_mvc/application/forms/SmartBlockCriteria.php
@@ -115,7 +115,7 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
         $storedCrit = Application_Model_Block::getCriteria($p_blockId);
        
         /* $modRoadMap stores the number of modifier rows each
-         * criteria row has. We need to know this so we index the
+         * criteria row has. We need to know this so we display the
          * the form elements properly
          */
         $modRowMap = array();
@@ -125,7 +125,10 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
             $openSmartBlockOption = true;
         }
         
-        $criteriaKeys = array_keys($storedCrit["crit"]);
+        $criteriaKeys = array();
+        if (isset($storedCrit["crit"])) {
+            $criteriaKeys = array_keys($storedCrit["crit"]);
+        }
         $numElements = count($criteriaOptions);
         for ($i = 0; $i < $numElements; $i++) {
             $criteriaType = "";
@@ -210,7 +213,7 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
                 } else if (count($storedCrit["crit"][$criteriaKeys[$i]]) > 1) {
                     $n = $j - 1;
                     $criteria = new Zend_Form_Element_Select("sp_criteria_field_".$i."_".$n);
-                    $criteria->setAttrib('class', 'input_select sp_input_select')
+                    $criteria->setAttrib('class', 'input_select sp_input_select sp-invisible')
                              ->setValue('Select criteria')
                              ->setDecorators(array('viewHelper'))
                              ->setMultiOptions($criteriaOptions)
diff --git a/airtime_mvc/application/models/Block.php b/airtime_mvc/application/models/Block.php
index 12a5f38e3..702c1621d 100644
--- a/airtime_mvc/application/models/Block.php
+++ b/airtime_mvc/application/models/Block.php
@@ -992,9 +992,8 @@ EOT;
                     $error[] =  "Value cannot be empty";
                 }
                 if(count($error) > 0){
-                    $errors[] = array("element"=>"sp_criteria_field_".$key."_".$i, "msg"=>$error);
+                    $errors[] = array("element"=>"sp_criteria_field_".$modKeys[$i]."_".$key, "msg"=>$error);
                 }
-                $count++;
             }//end mod foreach
         }//for loop
         
diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css
index 427cdd782..7c01ec209 100644
--- a/airtime_mvc/public/css/styles.css
+++ b/airtime_mvc/public/css/styles.css
@@ -418,6 +418,10 @@ input[type="text"]:focus, input[type="password"]:focus, textarea:focus, .input_t
 }
 
 /***** SMART PLAYLIST SPECIFIC STYLES BEGIN *****/
+.sp-invisible{
+    visibility: hidden;
+}
+
 .sp_input_select{
     width: 130px;
 }
diff --git a/airtime_mvc/public/js/airtime/playlist/smart_playlistbuilder.js b/airtime_mvc/public/js/airtime/playlist/smart_playlistbuilder.js
index c0b595ed9..5d903622a 100644
--- a/airtime_mvc/public/js/airtime/playlist/smart_playlistbuilder.js
+++ b/airtime_mvc/public/js/airtime/playlist/smart_playlistbuilder.js
@@ -43,6 +43,14 @@ function setSmartPlaylistEvents() {
             newRowVal = newRow.find('input[name^="sp_criteria_value"]'),
             newRowExtra = newRow.find('input[name^="sp_criteria_extra"]'),
             newRowRemove = newRow.find('a[id^="criteria_remove"]');
+
+        //remove error msg
+        if (newRow.children().hasClass('errors sp-errors')) {
+            newRow.find('span[class="errors sp-errors"]').remove();
+        }
+        
+        //hide the critieria field select box
+        newRowCrit.addClass('sp-invisible');
         
         //append modifier index to the new modifier row
         newRowCrit.attr('name', 'sp_criteria_field_'+row_index+'_'+mod_index);
@@ -65,6 +73,9 @@ function setSmartPlaylistEvents() {
         newRow.find('.criteria_add').remove();
         
         $(this).parent().after(newRow);
+        appendAddButton();
+        appendModAddButton();
+        removeButtonCheck();
     });
 	
     /********** REMOVE ROW **********/
@@ -75,7 +86,6 @@ function setSmartPlaylistEvents() {
         var list_length = list.find("div:visible").length;
         var count = list_length - curr_pos;
         var next = curr.next();
-        var add_button = form.find('a[id="criteria_add"]');
         var item_to_hide;
         
         //remove error message from current row, if any
@@ -148,8 +158,11 @@ function setSmartPlaylistEvents() {
 
         list.next().show();
         
+        reindexElements();
+        
         // always put '+' button on the last enabled row
         appendAddButton();
+        appendModAddButton();
         // remove the 'x' button if only one row is enabled
         removeButtonCheck();
     });
@@ -217,6 +230,7 @@ function setSmartPlaylistEvents() {
 
     setupUI();
     appendAddButton();
+    appendModAddButton();
     removeButtonCheck();
 }
 
@@ -228,6 +242,80 @@ function setStaticLengthHolder(lenVal) {
 }
 */
 
+/* This function appends a '+' button for the last
+ * modifier row of each criteria.
+ * If there are no modifier rows, the '+' button
+ * remains at the criteria row
+ */
+function appendModAddButton() {
+    var divs = $('#smart-playlist-form').find('div select[name^="sp_criteria_modifier"]').parent(':visible');
+    $.each(divs, function(i, div){
+        if (i > 0) {
+            if ($(div).find('select[name^="sp_criteria_field"]').val() == $(div).prev().find('select[name^="sp_criteria_field"]').val()) {
+             
+                $(div).prev().find('a[id^="modifier_add"]').addClass('sp-invisible');
+                if (i+1 == divs.length) {
+                    $(div).find('a[id^="modifier_add"]').removeClass('sp-invisible');
+                }
+            } else {
+                $(div).prev().find('a[id^="modifier_add"]').removeClass('sp-invisible');
+            }
+        }    
+    });
+}
+
+/* This function re-indexes all the form elements.
+ * We need to do this everytime a row gets deleted
+ */
+function reindexElements() {
+    var divs = $('#smart-playlist-form').find('div select[name^="sp_criteria_field"]').parent(),
+        index = 0,
+        modIndex = 0;
+    $.each(divs, function(i, div){
+        if (i > 0 && index < 26) {
+            /* If the current row and previous row have the same criteria field,
+             * the the current row becomes a modifier
+             */
+            if ($(div).find('select[name^="sp_criteria_field"]').val() != '0' &&
+                $(div).find('select[name^="sp_criteria_field"]').val() == $(div).prev().find('select[name^="sp_criteria_field"]').val()) {
+                
+                $(div).find('select[name^="sp_criteria_field"]').attr('name', 'sp_criteria_field_'+index+'_'+modIndex);
+                $(div).find('select[name^="sp_criteria_field"]').attr('id', 'sp_criteria_field_'+index+'_'+modIndex);
+                if (!$(div).find('select[name^="sp_criteria_field"]').hasClass('sp-invisible')) {
+                    $(div).find('select[name^="sp_criteria_field"]').addClass('sp-invisible');
+                }
+                $(div).find('select[name^="sp_criteria_modifier"]').attr('name', 'sp_criteria_modifier_'+index+'_'+modIndex);
+                $(div).find('select[name^="sp_criteria_modifier"]').attr('id', 'sp_criteria_modifier_'+index+'_'+modIndex);
+                $(div).find('input[name^="sp_criteria_value"]').attr('name', 'sp_criteria_value_'+index+'_'+modIndex);
+                $(div).find('input[name^="sp_criteria_value"]').attr('id', 'sp_criteria_value_'+index+'_'+modIndex);
+                $(div).find('input[name^="sp_criteria_extra"]').attr('name', 'sp_criteria_extra_'+index+'_'+modIndex);
+                $(div).find('input[name^="sp_criteria_extra"]').attr('id', 'sp_criteria_extra_'+index+'_'+modIndex);
+                $(div).find('a[name^="modifier_add"]').attr('id', 'modifier_add_'+index);
+                $(div).find('a[id^="criteria_remove"]').attr('id', 'criteria_remove_'+index+'_'+modIndex);
+                modIndex++;
+            } else {
+                index++;
+                $(div).find('select[name^="sp_criteria_field"]').attr('name', 'sp_criteria_field_'+index);
+                $(div).find('select[name^="sp_criteria_field"]').attr('id', 'sp_criteria_field_'+index);
+                if ($(div).find('select[name^="sp_criteria_field"]').hasClass('sp-invisible')) {
+                    $(div).find('select[name^="sp_criteria_field"]').removeClass('sp-invisible');
+                }
+                $(div).find('select[name^="sp_criteria_modifier"]').attr('name', 'sp_criteria_modifier_'+index);
+                $(div).find('select[name^="sp_criteria_modifier"]').attr('id', 'sp_criteria_modifier_'+index);
+                $(div).find('input[name^="sp_criteria_value"]').attr('name', 'sp_criteria_value_'+index);
+                $(div).find('input[name^="sp_criteria_value"]').attr('id', 'sp_criteria_value_'+index);
+                $(div).find('input[name^="sp_criteria_extra"]').attr('name', 'sp_criteria_extra_'+index);
+                $(div).find('input[name^="sp_criteria_extra"]').attr('id', 'sp_criteria_extra_'+index);
+                $(div).find('a[name^="modifier_add"]').attr('id', 'modifier_add_'+index);
+                $(div).find('a[id^="criteria_remove"]').attr('id', 'criteria_remove_'+index);
+                modIndex = 0;
+            }
+        } else if (i > 0) {
+            $(div).remove();
+        }
+    });
+}
+
 function setupUI() {
     var playlist_type = $('input:radio[name=sp_type]:checked').val();
     var target_length = $('input[name="sp_limit_value"]').val();