diff --git a/plugins/bean/bean_relevant.inc b/plugins/bean/bean_relevant.inc
index 5ca6dc1..04d79ad 100644
--- a/plugins/bean/bean_relevant.inc
+++ b/plugins/bean/bean_relevant.inc
@@ -42,15 +42,18 @@ class RelevantContentBean extends BeanPlugin {
       '#default_value' => isset($bean->display_options['num_posts']) ?
         $bean->display_options['num_posts'] : 3,
     );
-
+    
+    $options['title'] = 'Linked Title';
+    $entity_info = entity_get_info();
+    foreach ($entity_info['node']['view modes'] as $key => $value) {
+      $options[$key] = $value['label'];
+    }
+    
     $form['header']['display_options']['node_display'] = array(
       '#type' => 'select',
       '#title' => t('Node display'),
       '#description' => t('Display listed nodes in this format.'),
-      '#options' => array(
-        'title' => 'Linked Title',
-        'default' => 'Default',
-        'teaser' => 'Teaser'),
+      '#options' => $options,
       '#default_value' => isset($bean->display_options['node_display']) ?
         $bean->display_options['node_display'] : 'title',
     );
@@ -432,35 +435,23 @@ class RelevantContentBean extends BeanPlugin {
       }
     }
 
+		$content['bean_relevant']['#markup'] = '';
     $result = $data->execute();
-
     if (isset($result['node'])) {
-
       $nodes = entity_load('node', array_keys($result['node']));
-      $items = array();
       foreach ($nodes as $node) {
-
-        $items[] = l($node->title, 'node/' . $node->nid);
-
-        if ($bean->display_options['node_display'] != 'title') {
-          $display_content = node_view($node, $bean->display_options['node_display']);
-          $body = $display_content['body'][0]['#markup'];
-          $items[] = $body;
+        if($bean->display_options['node_display'] == 'title') {
+          $content['bean_relevant']['#markup'] .= '<div>' . l($node->title, 'node/' . $node->nid) . '</div>';
+        } 
+        else {
+          $content['nodes'][$node->nid] = node_view($node, $bean->display_options['node_display']);
         }
       }
-
-      $output = '';
-      foreach ($items as $item) {
-        $output .= '<div>' . $item . '</div>';
-      }
-
     }
     else {
-      $output = '';
       $bean->title = '';
     }
 
-    $content['bean_relevant']['#markup'] = $output;
     return $content;
   }