diff --git a/modules/ds_extras/ds_extras.admin.inc b/modules/ds_extras/ds_extras.admin.inc
index 11e3e05..0913cc8 100644
--- a/modules/ds_extras/ds_extras.admin.inc
+++ b/modules/ds_extras/ds_extras.admin.inc
@@ -239,7 +239,7 @@ function ds_extras_settings_submit($form, &$form_state) {
   cache_clear_all('theme_registry:', 'cache', TRUE);
   cache_clear_all('module_implements', 'cache_bootstrap');
   cache_clear_all('field_info_fields', 'cache_field');
-  menu_rebuild();
+  variable_set('menu_rebuild_needed', TRUE);
 }
 
 /**
diff --git a/modules/ds_extras/ds_extras.module b/modules/ds_extras/ds_extras.module
index 9ea559a..98b272a 100644
--- a/modules/ds_extras/ds_extras.module
+++ b/modules/ds_extras/ds_extras.module
@@ -689,6 +689,7 @@ function ds_extras_field_extra_fields() {
 function ds_extras_preprocess_view_layout(&$variables) {
 
   if ($layout = ds_get_layout('ds_views', $variables['view']->name . '-' . $variables['view']->current_display, 'default')) {
+
     $variables['elements']['#entity_type'] = $variables['#entity_type'] = 'ds_views';
     $variables['elements']['#bundle'] = $variables['#bundle'] = $variables['view']->name . '-' . $variables['view']->current_display;
     $variables['elements']['#view_mode'] = 'default';
diff --git a/modules/ds_extras/ds_extras.vd.inc b/modules/ds_extras/ds_extras.vd.inc
index a34cd37..d4eabdd 100644
--- a/modules/ds_extras/ds_extras.vd.inc
+++ b/modules/ds_extras/ds_extras.vd.inc
@@ -259,6 +259,14 @@ function ds_extras_vd_bundle_remove_submit($form, &$form_state) {
     ->condition('bundle', $bundle)
     ->execute();
 
+  // Remove from bundle settings.
+  $bundle_settings = variable_get('field_bundle_settings', array());
+  unset($bundle_settings['ds_views'][$bundle]);
+  if (empty($bundle_settings['ds_views'])) {
+    unset($bundle_settings['ds_views']);
+  }
+  variable_set('field_bundle_settings', $bundle_settings);
+
   // Clear entity cache and field info fields cache.
   cache_clear_all('field_info_fields', 'cache_field');
   cache_clear_all('entity_info', 'cache', TRUE);