diff --git a/modules/openlayers_views/openlayers_views.module b/modules/openlayers_views/openlayers_views.module
index 9a470d9..816cb24 100644
--- a/modules/openlayers_views/openlayers_views.module
+++ b/modules/openlayers_views/openlayers_views.module
@@ -15,9 +15,9 @@ function openlayers_views_help($path, $arg) {
   switch ($path) {
     case 'admin/help#openlayers_views':
       return '<p>'
-        . t('The OpenLayers Views module provides a set of plugins '
+      . t('The OpenLayers Views module provides a set of plugins '
         . 'for Views.')
-        . '</p>';
+      . '</p>';
   }
 }
 
@@ -115,26 +115,24 @@ function openlayers_views_openlayers_layers() {
       // Check for OpenLayers Data Overlays
       if ($view->display_handler->get_option('style_plugin') == 'openlayers_data' && $display != 'default') {
         //Build Layer
-        $layer = new openlayers_layer_type_openlayers_views_vector();
+        $layer = new stdClass();
         $layer->api_version = 1;
         $layer->name = $view->name . '_' . $display;
         $layer->title = empty($data->display_options['title']) ? $view->name : $data->display_options['title'];
         $layer->title .= ' - ' . $data->display_title;
         $layer->description = $view->description;
-        $layer->data['views'] = array('view' => $view->name, 'display' => $display);
-        $layers[$layer->name] = $layer;
-      }
-
-      // Check for OpenLayers Data Image Overlays
-      if ($view->display_handler->get_option('style_plugin') == 'openlayers_data_image' && $display != 'default') {
-        //Build Layer
-        $layer = new openlayers_layer_type_openlayers_views_image();
-        $layer->api_version = 1;
-        $layer->name = $view->name . '_' . $display;
-        $layer->title = empty($data->display_options['title']) ? $view->name : $data->display_options['title'];
-        $layer->title .= ' - ' . $data->display_title;
-        $layer->description = $view->description;
-        $layer->data['views'] = array('view' => $view->name, 'display' => $display);
+        $layer->data = array(
+          'layer_type' => 'openlayers_views_vector',
+          'layer_handler' => 'openlayers_views_vector',
+          'projection' => array('EPSG:4326'),
+          'isBaseLayer' => FALSE,
+          'vector' => TRUE,
+          'type' => 'Vector',
+          'url' => array(),
+          'options' => array(),
+          'events' => array(),
+          'views' => array('view' => $view->name, 'display' => $display),
+        );
         $layers[$layer->name] = $layer;
       }
 
@@ -143,7 +141,7 @@ function openlayers_views_openlayers_layers() {
         $view->display_handler->display->display_plugin == 'page' &&
         $view->display_handler->get_option('path') != ''
       ) {
-        $layer = new openlayers_layer_type_geojson();
+        $layer = new stdClass();
         $layer->api_version = 1;
         $layer->name = $view->name . '_' . $display;
         $layer->title = empty($data->display_options['title']) ? $view->name : $data->display_options['title'];
@@ -152,17 +150,19 @@ function openlayers_views_openlayers_layers() {
 
         // Determine if we should use a BBOX strategy.
         $useBBOX = FALSE;
-        if (isset($data->display_options['arguments']) &&
-          isset($data->display_options['arguments']['bbox_argument']) &&
-          $view->data->display_options['arguments']['bbox_argument']['arg_id'] == 'bbox') {
+        if (isset($view->display['default']->display_options['arguments']) &&
+          isset($view->display['default']->display_options['arguments']['bbox_argument']) &&
+          $view->display['default']->display_options['arguments']['bbox_argument']['arg_id'] == 'bbox') {
           $useBBOX = TRUE;
         }
 
-        $layer->data['url'] = url($view->display_handler->get_option('path'), array('absolute' => TRUE));
-        $layer->data['geojson_data'] = '';
-        $layer->data['views'] = array('view' => $view->name, 'display' => $display);
-        $layer->data['useBBOX'] = $useBBOX;
-
+        $layer->data = array(
+          'layer_type' => 'openlayers_layer_type_geojson',
+          'url' => url($view->display_handler->get_option('path'), array('absolute' => TRUE)),
+          'geojson_data' => '',
+          'views' => array('view' => $view->name, 'display' => $display),
+          'useBBOX' => $useBBOX,
+        );
         $layers[$layer->name] = $layer;
       }
     }
@@ -208,6 +208,13 @@ function openlayers_views_field_formatter_view($entity_type, $entity, $field, $i
  * Implements hook_field_formatter_settings_form().
  */
 function openlayers_views_field_formatter_settings_form($field, $instance, $view_mode, $form, &$form_state) {
+  ctools_include('export-ui');
+  $plugin = ctools_get_export_ui('openlayers_styles');
+
+  if (!$plugin) {
+    return;
+  }
+
   $display = $instance['display'][$view_mode];
   $settings = $display['settings'];
 
@@ -217,8 +224,6 @@ function openlayers_views_field_formatter_settings_form($field, $instance, $view
 
   $form_state['item'] = $style;
 
-  ctools_include('export-ui');
-  $plugin = ctools_get_export_ui('openlayers_styles');
   $handler = ctools_export_ui_get_handler($plugin);
 
   call_user_func_array(array($handler, 'edit_form'), array(&$form, &$form_state));