diff --git a/node_subpages.module b/node_subpages.module
index dcf0011..decd3f8 100644
--- a/node_subpages.module
+++ b/node_subpages.module
@@ -165,6 +165,7 @@ function _node_subpages_menu_bar() {
   
   $subpages = node_subpages_list_for_type($current_node->type);
   if (isset($subpages)) {
+    drupal_add_css(drupal_get_path('module', 'node_subpages') . '/css/theme-default.css');
     $lang = $current_node->language;
     
     $have_default_view_tab = FALSE;
@@ -216,7 +217,7 @@ function _node_subpages_menu_bar() {
         );
         array_unshift($items, $view_tab);
       }
-      return theme('links', array('links' => $items));
+      return theme('links', array('links' => $items, 'attributes' => array('class' => array('sub-page-menu'))));
     }
     
   }
@@ -691,3 +692,14 @@ function node_subpages_features_export_alter(&$export, $module_name) {
     }
   }
 }
+
+
+/**
+ * Implements hook_entity_info_alter().
+ */
+function node_subpages_entity_info_alter(&$entity_info) {
+  $entity_info['node']['view modes']['node_subpages'] = array(
+    'label' => t('Sub Pages'),
+    'custom settings' => TRUE,
+  );
+}
diff --git a/plugins/node_subpages_content/field.inc b/plugins/node_subpages_content/field.inc
index ff84085..5f3b433 100644
--- a/plugins/node_subpages_content/field.inc
+++ b/plugins/node_subpages_content/field.inc
@@ -25,9 +25,7 @@ function node_subpages_content_field_config($type, $plugin_config) {
   if ($fields) {
     foreach ($fields as $field_key => $field_details) {
       // Only allow Text fields to be used for subpages
-      if ($field_details['widget']['module'] == 'text') {
         $options[$field_key] = $field_details['label'] . ' (' . $field_key . ')';
-      }
     }
   }
   
@@ -57,21 +55,14 @@ function node_subpages_content_field_config_save_prep($values) {
  * Should this use field_attach_view? See node_build_content().
  */
 function node_subpages_content_field_content($node, $plugin_config) {
-  // Get the field content. This will be an array of items
   $items = field_get_items('node', $node, $plugin_config['field']);
-
-  // Loop over the field values and run them through check_markup to make sure
-  // that the text formats are used.
-  $values = array();
-  foreach ($items as $item) {
-    $cleaned = trim(check_markup($item['value'], $item['format'], $node->language));
-    if (!empty($cleaned)) {
-      $values[]= $cleaned;
-    }
-  }
-
-  // Finally, implode the fields
-  return implode($values);
+  
+  $fields_info = field_info_instances('node', $node->type);
+  $instance = $fields_info[$plugin_config['field']];
+  $view_mode_settings = field_view_mode_settings($instance['entity_type'], $instance['bundle']);
+  $display = field_get_display($instance, 'node_subpages', $node);
+  
+  return render(field_view_field('node', $node,$plugin_config['field'],$display));
 }