diff --git a/modules/openlayers_views/openlayers_views.module b/modules/openlayers_views/openlayers_views.module
index 8f497a5..4423158 100644
--- a/modules/openlayers_views/openlayers_views.module
+++ b/modules/openlayers_views/openlayers_views.module
@@ -102,7 +102,7 @@ function openlayers_views_openlayers_layers() {
   foreach ($views as $view) {
     foreach ($view->display as $display => $data) {
       $view->set_display($display);
-      
+
       // Check for OpenLayers Data Overlays
       if ($data->display_plugin == 'openlayers') {
         //Build Layer
@@ -113,6 +113,7 @@ function openlayers_views_openlayers_layers() {
           !empty($view->display['default']->handler->options['title']) ?
             $view->display['default']->handler->options['title'] :
             $view->name;
+        $layer->title .= ' - ' . $data->display_title;
         $layer->description = $view->description . ' - ' . $data->display_title;
         $layer->data = array(
           'layer_type' => 'openlayers_views_vector',
@@ -126,8 +127,8 @@ function openlayers_views_openlayers_layers() {
         );
         $layers[$layer->name] = $layer;
       }
-      
-      // Make GeoJSON layers from the geo_json module
+
+      // Make GeoJSON layers from the views_geojson module
       if ($view->display_handler->get_option('style_plugin') == 'views_geojson' &&
         $view->display_handler->display->display_plugin == 'page' &&
         $view->display_handler->get_option('path') != ''
@@ -139,16 +140,17 @@ function openlayers_views_openlayers_layers() {
           !empty($view->display['default']->handler->options['title']) ?
             $view->display['default']->handler->options['title'] :
             $view->name;
-        $layer->description = $view->description . ' - ' . $layer->title;
-        
+        $layer->title .= ' - ' . $data->display_title;
+        $layer->description = $view->description . ' - ' . $data->display_title;
+
         // Determine if we should use a BBOX strategy.
         $useBBOX = FALSE;
         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;  
+          $useBBOX = TRUE;
         }
-        
+
         $layer->data = array(
           'layer_type' => 'openlayers_layer_type_geojson',
           'url' => url($view->display_handler->get_option('path'), array('absolute' => TRUE)),