diff --git a/flexslider_picture/flexslider_picture.module b/flexslider_picture/flexslider_picture.module
index cea1722..d1e67ac 100644
--- a/flexslider_picture/flexslider_picture.module
+++ b/flexslider_picture/flexslider_picture.module
@@ -62,16 +62,18 @@ function flexslider_picture_field_formatter_settings_summary($field, $instance,
  */
 function flexslider_picture_field_formatter_view($entity_type, $entity, $field, $instance, $langcode, $items, $display) {
   $element = flexslider_fields_field_formatter_view($entity_type, $entity, $field, $instance, $langcode, $items, $display);
-  $optionset = flexslider_optionset_load($element['#settings']['optionset']);
-  foreach ($element['#items'] as $child => $data) {
-    if ($optionset && isset($optionset->imagestyle_type) && !empty($optionset->imagestyle_type) && $optionset->imagestyle_type == 'picture_mapping') {
-      $element['#items'][$child]['#attached'] = array(
-        'library' => array(
-          array('picture', 'matchmedia'),
-          array('picture', 'picturefill'),
-          array('picture', 'picture.ajax'),
-        ),
-      );
+  if (!empty($items)) {
+    $optionset = flexslider_optionset_load($element['#settings']['optionset']);
+    foreach ($element['#items'] as $child => $data) {
+      if ($optionset && isset($optionset->imagestyle_type) && !empty($optionset->imagestyle_type) && $optionset->imagestyle_type == 'picture_mapping') {
+        $element['#items'][$child]['#attached'] = array(
+          'library' => array(
+            array('picture', 'matchmedia'),
+            array('picture', 'picturefill'),
+            array('picture', 'picture.ajax'),
+          ),
+        );
+      }
     }
   }
   return $element;
@@ -82,7 +84,7 @@ function flexslider_picture_field_formatter_view($entity_type, $entity, $field,
  */
 function flexslider_picture_form_ctools_export_ui_edit_item_form_alter(&$form, &$form_state) {
   if ($form_state['plugin']['schema'] == 'flexslider_optionset') {
-    $form['image_style']['imagestyle_type'] = array(
+    $picture_flexslider_options['imagestyle_type'] = array(
       '#type' => 'radios',
       '#title' => t('Image type'),
       '#description' => t(
@@ -97,20 +99,18 @@ function flexslider_picture_form_ctools_export_ui_edit_item_form_alter(&$form, &
       '#default_value' => (isset($form_state['item']->imagestyle_type) && !empty($form_state['item']->imagestyle_type)) ? $form_state['item']->imagestyle_type : 'image_style',
     );
 
-    $form['image_style']['normal']['#description'] .= ' ' . t('If you selected Picture Mapping above, this image style will be used as a fallback.');
-
     $options = picture_get_mapping_options();
-    $form['image_style']['mapping'] = array(
+    $picture_flexslider_options['mapping'] = array(
       '#title' => t('Normal picuture mapping'),
       '#states' => array(
         'visible' => array(
           ':input[name="image_style[imagestyle_type]"]' => array('value' => 'picture_mapping'),
-        )
+        ),
       ),
       '#weight' => -1,
     );
     if (!empty($options)) {
-      $form['image_style']['mapping'] += array(
+      $picture_flexslider_options['mapping'] += array(
         '#type' => 'select',
         '#description' => t('Picture mapping for the main stage images.'),
         '#options' => $options,
@@ -118,19 +118,19 @@ function flexslider_picture_form_ctools_export_ui_edit_item_form_alter(&$form, &
       );
     }
     else {
-      $form['image_style']['mapping'] += array(
+      $picture_flexslider_options['mapping'] += array(
         '#type' => 'item',
         '#markup' => t('There\'re no picture mappings defined, you\'ll have to !create them first.', array('!create' => l(t('create'), 'admin/config/media/picture'))),
       );
     }
 
     // Colorbox support.
-    $form['image_style']['colorboxEnabled'] = array(
+    $picture_flexslider_options['colorboxEnabled'] = array(
       '#title' => t('Enable colorbox'),
       '#type' => 'checkbox',
       '#default_value' => (!empty($form_state['item']->options['colorboxEnabled'])) ? $form_state['item']->options['colorboxEnabled'] : '',
     );
-    $form['image_style']['colorboxImageStyle'] = array(
+    $picture_flexslider_options['colorboxImageStyle'] = array(
       '#title' => t('Colorbox group'),
       '#type' => 'select',
       '#default_value' => (!empty($form_state['item']->options['colorboxImageStyle'])) ? $form_state['item']->options['colorboxImageStyle'] : '',
@@ -143,6 +143,13 @@ function flexslider_picture_form_ctools_export_ui_edit_item_form_alter(&$form, &
       ),
     );
 
+    // Add these options to the vertical tabs.
+    $form['options'][] = array(
+      '#type' => 'fieldset',
+      '#title' => t('Picture Integration Options'),
+      'picture_flexslider_options' => array('#tree' => TRUE) + $picture_flexslider_options,
+    );
+
     $form['#submit'][] = '_flexslider_picture_ctools_export_ui_edit_item_form_submit';
   }
 }
@@ -151,7 +158,8 @@ function flexslider_picture_form_ctools_export_ui_edit_item_form_alter(&$form, &
  * Submit callback.
  */
 function _flexslider_picture_ctools_export_ui_edit_item_form_submit($form, &$form_state) {
-  $fields = array_intersect_key($form_state['values']['image_style'], drupal_map_assoc(array('imagestyle_type', 'mapping')));
+  $picture_flexslider_options = $form_state['values']['picture_flexslider_options'];
+  $fields = array_intersect_key($picture_flexslider_options, drupal_map_assoc(array('imagestyle_type', 'mapping')));
   $fields['flexslider_optionset'] = $form_state['values']['name'];
   $q = db_merge('flexslider_picture_optionset')
       ->key(array('flexslider_optionset' => $form_state['values']['name']))
@@ -162,8 +170,8 @@ function _flexslider_picture_ctools_export_ui_edit_item_form_submit($form, &$for
   // @todo Should we move it into our own table or how likely is it that
   // flexslider itself will add colorbox support and thus add "similar" options?
   $optionset = &$form_state['optionset'];
-  $optionset->options['colorboxEnabled'] = !empty($form_state['values']['image_style']['colorboxEnabled']);
-  $optionset->options['colorboxImageStyle'] = !empty($form_state['values']['image_style']['colorboxImageStyle']) ? $form_state['values']['image_style']['colorboxImageStyle'] : '';
+  $optionset->options['colorboxEnabled'] = !empty($picture_flexslider_options['colorboxEnabled']);
+  $optionset->options['colorboxImageStyle'] = !empty($picture_flexslider_options['colorboxImageStyle']) ? $picture_flexslider_options['colorboxImageStyle'] : '';
 }
 
 /**
diff --git a/flexslider_picture/theme/flexslider_picture.theme.inc b/flexslider_picture/theme/flexslider_picture.theme.inc
index ad94c52..820166d 100644
--- a/flexslider_picture/theme/flexslider_picture.theme.inc
+++ b/flexslider_picture/theme/flexslider_picture.theme.inc
@@ -96,7 +96,7 @@ function theme_flexslider_picture_list(&$vars) {
         $output .= theme('flexslider_list_item', array(
           'item' => $rendered_item,
           'thumb' => $item['thumb'],
-          'optionset' => $vars['settings']['optionset'],
+          'settings' => $vars['settings'],
         ));
       }
       $output .= "</$type>";