diff --git a/cod_session/cod_session.features.field.inc b/cod_session/cod_session.features.field.inc
index afa53f6..cbbdd9f 100644
--- a/cod_session/cod_session.features.field.inc
+++ b/cod_session/cod_session.features.field.inc
@@ -10,7 +10,7 @@
 function cod_session_field_default_fields() {
   $fields = array();
 
-  // Exported field: 'node-page-body'
+  // Exported field: 'node-page-body'.
   $fields['node-page-body'] = array(
     'field_config' => array(
       'active' => '1',
@@ -36,6 +36,7 @@ function cod_session_field_default_fields() {
           0 => 'format',
         ),
       ),
+      'locked' => '0',
       'module' => 'text',
       'settings' => array(
         'field_permissions' => array(
@@ -93,7 +94,7 @@ function cod_session_field_default_fields() {
     ),
   );
 
-  // Exported field: 'node-room-body'
+  // Exported field: 'node-room-body'.
   $fields['node-room-body'] = array(
     'field_config' => array(
       'active' => '1',
@@ -119,6 +120,7 @@ function cod_session_field_default_fields() {
           0 => 'format',
         ),
       ),
+      'locked' => '0',
       'module' => 'text',
       'settings' => array(
         'field_permissions' => array(
@@ -178,7 +180,7 @@ function cod_session_field_default_fields() {
     ),
   );
 
-  // Exported field: 'node-room-field_room_capacity'
+  // Exported field: 'node-room-field_room_capacity'.
   $fields['node-room-field_room_capacity'] = array(
     'field_config' => array(
       'active' => '1',
@@ -199,6 +201,7 @@ function cod_session_field_default_fields() {
           0 => 'format',
         ),
       ),
+      'locked' => '0',
       'module' => 'text',
       'settings' => array(
         'max_length' => '60',
@@ -246,7 +249,7 @@ function cod_session_field_default_fields() {
     ),
   );
 
-  // Exported field: 'node-room-field_room_photo'
+  // Exported field: 'node-room-field_room_photo'.
   $fields['node-room-field_room_photo'] = array(
     'field_config' => array(
       'active' => '1',
@@ -267,6 +270,7 @@ function cod_session_field_default_fields() {
           0 => 'fid',
         ),
       ),
+      'locked' => '0',
       'module' => 'image',
       'settings' => array(
         'default_image' => 0,
@@ -303,6 +307,7 @@ function cod_session_field_default_fields() {
       'required' => 0,
       'settings' => array(
         'alt_field' => 0,
+        'default_image' => 0,
         'file_directory' => '',
         'file_extensions' => 'png gif jpg jpeg',
         'max_filesize' => '',
@@ -324,7 +329,7 @@ function cod_session_field_default_fields() {
     ),
   );
 
-  // Exported field: 'node-room-field_room_session_capacity'
+  // Exported field: 'node-room-field_room_session_capacity'.
   $fields['node-room-field_room_session_capacity'] = array(
     'field_config' => array(
       'active' => '1',
@@ -337,6 +342,7 @@ function cod_session_field_default_fields() {
       ),
       'foreign keys' => array(),
       'indexes' => array(),
+      'locked' => '0',
       'module' => 'number',
       'settings' => array(),
       'translatable' => '0',
@@ -388,7 +394,7 @@ function cod_session_field_default_fields() {
     ),
   );
 
-  // Exported field: 'node-schedule_item-body'
+  // Exported field: 'node-schedule_item-body'.
   $fields['node-schedule_item-body'] = array(
     'field_config' => array(
       'active' => '1',
@@ -414,6 +420,7 @@ function cod_session_field_default_fields() {
           0 => 'format',
         ),
       ),
+      'locked' => '0',
       'module' => 'text',
       'settings' => array(
         'field_permissions' => array(
@@ -472,7 +479,7 @@ function cod_session_field_default_fields() {
     ),
   );
 
-  // Exported field: 'node-schedule_item-field_accepted'
+  // Exported field: 'node-schedule_item-field_accepted'.
   $fields['node-schedule_item-field_accepted'] = array(
     'field_config' => array(
       'active' => '1',
@@ -489,6 +496,7 @@ function cod_session_field_default_fields() {
           0 => 'value',
         ),
       ),
+      'locked' => '0',
       'module' => 'list',
       'settings' => array(
         'allowed_values' => array(
@@ -545,69 +553,63 @@ function cod_session_field_default_fields() {
     ),
   );
 
-  // Exported field: 'node-schedule_item-field_session_room'
-  $fields['node-schedule_item-field_session_room'] = array(
+  // Exported field: 'node-schedule_item-field_schedule_room'.
+  $fields['node-schedule_item-field_schedule_room'] = array(
     'field_config' => array(
       'active' => '1',
-      'cardinality' => '-1',
+      'cardinality' => '1',
       'deleted' => '0',
       'entity_types' => array(),
-      'field_name' => 'field_session_room',
+      'field_name' => 'field_schedule_room',
       'field_permissions' => array(
-        'type' => '2',
-      ),
-      'foreign keys' => array(
-        'nid' => array(
-          'columns' => array(
-            'nid' => 'nid',
-          ),
-          'table' => 'node',
-        ),
+        'type' => '0',
       ),
+      'foreign keys' => array(),
       'indexes' => array(
-        'nid' => array(
-          0 => 'nid',
+        'target_id' => array(
+          0 => 'target_id',
         ),
       ),
-      'module' => 'node_reference',
+      'locked' => '0',
+      'module' => 'entityreference',
       'settings' => array(
-        'field_permissions' => array(
-          'create' => 0,
-          'edit' => 'edit',
-          'edit own' => 0,
-          'view' => 'view',
-          'view own' => 0,
-        ),
-        'referenceable_types' => array(
-          'article' => 0,
-          'bof_session' => 0,
-          'page' => 0,
-          'room' => 'room',
-          'schedule_item' => 0,
-          'session' => 0,
-          'time_slot' => 0,
-        ),
-        'view' => array(
-          'args' => array(),
-          'display_name' => '',
-          'view_name' => '',
+        'handler' => 'base',
+        'handler_settings' => array(
+          'behaviors' => array(
+            'views-select-list' => array(
+              'status' => 0,
+            ),
+          ),
+          'sort' => array(
+            'direction' => 'ASC',
+            'field' => 'body:value',
+            'property' => 'title',
+            'type' => 'property',
+          ),
+          'target_bundles' => array(
+            'room' => 'room',
+          ),
         ),
+        'handler_submit' => 'Change handler',
+        'target_type' => 'node',
       ),
-      'translatable' => '1',
-      'type' => 'node_reference',
+      'translatable' => '0',
+      'type' => 'entityreference',
     ),
     'field_instance' => array(
       'bundle' => 'schedule_item',
       'default_value' => NULL,
       'deleted' => '0',
-      'description' => 'Select room(s) in which the session occurs.',
+      'description' => '',
       'display' => array(
         'default' => array(
           'label' => 'above',
-          'module' => 'node_reference',
-          'settings' => array(),
-          'type' => 'node_reference_default',
-          'weight' => '4',
+          'module' => 'entityreference',
+          'settings' => array(
+            'link' => FALSE,
+          ),
+          'type' => 'entityreference_label',
+          'weight' => 6,
         ),
         'teaser' => array(
           'label' => 'above',
@@ -617,7 +619,7 @@ function cod_session_field_default_fields() {
         ),
       ),
       'entity_type' => 'node',
-      'field_name' => 'field_session_room',
+      'field_name' => 'field_schedule_room',
       'label' => 'Room',
       'required' => 0,
       'settings' => array(
@@ -633,56 +635,48 @@ function cod_session_field_default_fields() {
     ),
   );
 
-  // Exported field: 'node-schedule_item-field_session_slot'
-  $fields['node-schedule_item-field_session_slot'] = array(
+  // Exported field: 'node-schedule_item-field_schedule_time_slot'.
+  $fields['node-schedule_item-field_schedule_time_slot'] = array(
     'field_config' => array(
       'active' => '1',
       'cardinality' => '1',
       'deleted' => '0',
       'entity_types' => array(),
-      'field_name' => 'field_session_slot',
+      'field_name' => 'field_schedule_time_slot',
       'field_permissions' => array(
-        'type' => '2',
-      ),
-      'foreign keys' => array(
-        'nid' => array(
-          'columns' => array(
-            'nid' => 'nid',
-          ),
-          'table' => 'node',
-        ),
+        'type' => '0',
       ),
+      'foreign keys' => array(),
       'indexes' => array(
-        'nid' => array(
-          0 => 'nid',
+        'target_id' => array(
+          0 => 'target_id',
         ),
       ),
-      'module' => 'node_reference',
+      'locked' => '0',
+      'module' => 'entityreference',
       'settings' => array(
-        'field_permissions' => array(
-          'create' => 0,
-          'edit' => 'edit',
-          'edit own' => 0,
-          'view' => 'view',
-          'view own' => 0,
-        ),
-        'referenceable_types' => array(
-          'article' => 0,
-          'bof_session' => 0,
-          'page' => 0,
-          'room' => 0,
-          'schedule_item' => 0,
-          'session' => 0,
-          'time_slot' => 'time_slot',
-        ),
-        'view' => array(
-          'args' => array(),
-          'display_name' => '',
-          'view_name' => '',
+        'handler' => 'base',
+        'handler_settings' => array(
+          'behaviors' => array(
+            'views-select-list' => array(
+              'status' => 0,
+            ),
+          ),
+          'sort' => array(
+            'direction' => 'ASC',
+            'field' => 'body:value',
+            'property' => 'title',
+            'type' => 'property',
+          ),
+          'target_bundles' => array(
+            'time_slot' => 'time_slot',
+          ),
         ),
+        'handler_submit' => 'Change handler',
+        'target_type' => 'node',
       ),
-      'translatable' => '1',
-      'type' => 'node_reference',
+      'translatable' => '0',
+      'type' => 'entityreference',
     ),
     'field_instance' => array(
       'bundle' => 'schedule_item',
@@ -691,11 +685,13 @@ function cod_session_field_default_fields() {
       'description' => '',
       'display' => array(
         'default' => array(
-          'label' => 'inline',
-          'module' => 'node_reference',
-          'settings' => array(),
-          'type' => 'node_reference_default',
-          'weight' => '3',
+          'label' => 'above',
+          'module' => 'entityreference',
+          'settings' => array(
+            'link' => FALSE,
+          ),
+          'type' => 'entityreference_label',
+          'weight' => 5,
         ),
         'teaser' => array(
           'label' => 'above',
@@ -705,7 +701,7 @@ function cod_session_field_default_fields() {
         ),
       ),
       'entity_type' => 'node',
-      'field_name' => 'field_session_slot',
+      'field_name' => 'field_schedule_time_slot',
       'label' => 'Time slot',
       'required' => 0,
       'settings' => array(
@@ -721,7 +717,7 @@ function cod_session_field_default_fields() {
     ),
   );
 
-  // Exported field: 'node-session-body'
+  // Exported field: 'node-session-body'.
   $fields['node-session-body'] = array(
     'field_config' => array(
       'active' => '1',
@@ -747,6 +743,7 @@ function cod_session_field_default_fields() {
           0 => 'format',
         ),
       ),
+      'locked' => '0',
       'module' => 'text',
       'settings' => array(
         'field_permissions' => array(
@@ -806,7 +803,7 @@ function cod_session_field_default_fields() {
     ),
   );
 
-  // Exported field: 'node-session-field_accepted'
+  // Exported field: 'node-session-field_accepted'.
   $fields['node-session-field_accepted'] = array(
     'field_config' => array(
       'active' => '1',
@@ -823,6 +820,7 @@ function cod_session_field_default_fields() {
           0 => 'value',
         ),
       ),
+      'locked' => '0',
       'module' => 'list',
       'settings' => array(
         'allowed_values' => array(
@@ -878,12 +876,12 @@ function cod_session_field_default_fields() {
         'module' => 'options',
         'settings' => array(),
         'type' => 'options_buttons',
-        'weight' => '8',
+        'weight' => '11',
       ),
     ),
   );
 
-  // Exported field: 'node-session-field_experience'
+  // Exported field: 'node-session-field_experience'.
   $fields['node-session-field_experience'] = array(
     'field_config' => array(
       'active' => '1',
@@ -900,6 +898,7 @@ function cod_session_field_default_fields() {
           0 => 'value',
         ),
       ),
+      'locked' => '0',
       'module' => 'list',
       'settings' => array(
         'allowed_values' => array(
@@ -956,69 +955,63 @@ function cod_session_field_default_fields() {
     ),
   );
 
-  // Exported field: 'node-session-field_session_room'
+  // Exported field: 'node-session-field_session_room'.
   $fields['node-session-field_session_room'] = array(
     'field_config' => array(
       'active' => '1',
-      'cardinality' => '-1',
+      'cardinality' => '1',
       'deleted' => '0',
       'entity_types' => array(),
       'field_name' => 'field_session_room',
       'field_permissions' => array(
-        'type' => '2',
-      ),
-      'foreign keys' => array(
-        'nid' => array(
-          'columns' => array(
-            'nid' => 'nid',
-          ),
-          'table' => 'node',
-        ),
+        'type' => '0',
       ),
+      'foreign keys' => array(),
       'indexes' => array(
-        'nid' => array(
-          0 => 'nid',
+        'target_id' => array(
+          0 => 'target_id',
         ),
       ),
-      'module' => 'node_reference',
+      'locked' => '0',
+      'module' => 'entityreference',
       'settings' => array(
-        'field_permissions' => array(
-          'create' => 0,
-          'edit' => 'edit',
-          'edit own' => 0,
-          'view' => 'view',
-          'view own' => 0,
-        ),
-        'referenceable_types' => array(
-          'article' => 0,
-          'bof_session' => 0,
-          'page' => 0,
-          'room' => 'room',
-          'schedule_item' => 0,
-          'session' => 0,
-          'time_slot' => 0,
-        ),
-        'view' => array(
-          'args' => array(),
-          'display_name' => '',
-          'view_name' => '',
+        'handler' => 'base',
+        'handler_settings' => array(
+          'behaviors' => array(
+            'views-select-list' => array(
+              'status' => 0,
+            ),
+          ),
+          'sort' => array(
+            'direction' => 'ASC',
+            'field' => 'body:value',
+            'property' => 'title',
+            'type' => 'property',
+          ),
+          'target_bundles' => array(
+            'room' => 'room',
+          ),
         ),
+        'handler_submit' => 'Change handler',
+        'target_type' => 'node',
       ),
-      'translatable' => '1',
-      'type' => 'node_reference',
+      'translatable' => '0',
+      'type' => 'entityreference',
     ),
     'field_instance' => array(
       'bundle' => 'session',
       'default_value' => NULL,
       'deleted' => '0',
-      'description' => 'Select room(s) in which the session occurs.',
+      'description' => '',
       'display' => array(
         'default' => array(
-          'label' => 'inline',
-          'module' => 'node_reference',
-          'settings' => array(),
-          'type' => 'node_reference_default',
-          'weight' => '7',
+          'label' => 'above',
+          'module' => 'entityreference',
+          'settings' => array(
+            'link' => FALSE,
+          ),
+          'type' => 'entityreference_label',
+          'weight' => 10,
         ),
         'teaser' => array(
           'label' => 'above',
@@ -1036,64 +1029,58 @@ function cod_session_field_default_fields() {
       ),
       'widget' => array(
         'active' => 1,
-        'module' => 'options',
-        'settings' => array(),
-        'type' => 'options_buttons',
-        'weight' => '7',
+        'module' => 'entityreference',
+        'settings' => array(
+          'match_operator' => 'CONTAINS',
+          'path' => '',
+          'size' => '60',
+        ),
+        'type' => 'entityreference_autocomplete',
+        'weight' => '13',
       ),
     ),
   );
 
-  // Exported field: 'node-session-field_session_slot'
-  $fields['node-session-field_session_slot'] = array(
+  // Exported field: 'node-session-field_session_speakers'.
+  $fields['node-session-field_session_speakers'] = array(
     'field_config' => array(
       'active' => '1',
-      'cardinality' => '1',
+      'cardinality' => '-1',
       'deleted' => '0',
       'entity_types' => array(),
-      'field_name' => 'field_session_slot',
+      'field_name' => 'field_session_speakers',
       'field_permissions' => array(
-        'type' => '2',
-      ),
-      'foreign keys' => array(
-        'nid' => array(
-          'columns' => array(
-            'nid' => 'nid',
-          ),
-          'table' => 'node',
-        ),
+        'type' => '0',
       ),
+      'foreign keys' => array(),
       'indexes' => array(
-        'nid' => array(
-          0 => 'nid',
+        'target_id' => array(
+          0 => 'target_id',
         ),
       ),
-      'module' => 'node_reference',
+      'locked' => '0',
+      'module' => 'entityreference',
       'settings' => array(
-        'field_permissions' => array(
-          'create' => 0,
-          'edit' => 'edit',
-          'edit own' => 0,
-          'view' => 'view',
-          'view own' => 0,
-        ),
-        'referenceable_types' => array(
-          'article' => 0,
-          'bof_session' => 0,
-          'page' => 0,
-          'room' => 0,
-          'schedule_item' => 0,
-          'session' => 0,
-          'time_slot' => 'time_slot',
-        ),
-        'view' => array(
-          'args' => array(),
-          'display_name' => '',
-          'view_name' => '',
+        'handler' => 'base',
+        'handler_settings' => array(
+          'behaviors' => array(
+            'views-select-list' => array(
+              'status' => 0,
+            ),
+          ),
+          'sort' => array(
+            'direction' => 'ASC',
+            'field' => 'field_profile_first:value',
+            'property' => 'name',
+            'type' => 'property',
+          ),
+          'target_bundles' => array(),
         ),
+        'handler_submit' => 'Change handler',
+        'target_type' => 'user',
       ),
-      'translatable' => '1',
-      'type' => 'node_reference',
+      'translatable' => '0',
+      'type' => 'entityreference',
     ),
     'field_instance' => array(
       'bundle' => 'session',
@@ -1102,11 +1089,13 @@ function cod_session_field_default_fields() {
       'description' => '',
       'display' => array(
         'default' => array(
-          'label' => 'inline',
-          'module' => 'node_reference',
-          'settings' => array(),
-          'type' => 'node_reference_default',
-          'weight' => '6',
+          'label' => 'above',
+          'module' => 'entityreference',
+          'settings' => array(
+            'link' => FALSE,
+          ),
+          'type' => 'entityreference_label',
+          'weight' => 11,
         ),
         'teaser' => array(
           'label' => 'above',
@@ -1116,70 +1105,83 @@ function cod_session_field_default_fields() {
         ),
       ),
       'entity_type' => 'node',
-      'field_name' => 'field_session_slot',
-      'label' => 'Time slot',
+      'field_name' => 'field_session_speakers',
+      'label' => 'Speakers',
       'required' => 0,
       'settings' => array(
         'user_register_form' => FALSE,
       ),
       'widget' => array(
         'active' => 1,
-        'module' => 'options',
-        'settings' => array(),
-        'type' => 'options_select',
-        'weight' => '6',
+        'module' => 'entityreference',
+        'settings' => array(
+          'match_operator' => 'CONTAINS',
+          'path' => '',
+          'size' => '60',
+        ),
+        'type' => 'entityreference_autocomplete',
+        'weight' => '1',
       ),
     ),
   );
 
-  // Exported field: 'node-session-field_slides'
-  $fields['node-session-field_slides'] = array(
+  // Exported field: 'node-session-field_session_time_slot'.
+  $fields['node-session-field_session_time_slot'] = array(
     'field_config' => array(
       'active' => '1',
-      'cardinality' => '-1',
+      'cardinality' => '1',
       'deleted' => '0',
       'entity_types' => array(),
-      'field_name' => 'field_slides',
-      'foreign keys' => array(
-        'fid' => array(
-          'columns' => array(
-            'fid' => 'fid',
-          ),
-          'table' => 'file_managed',
-        ),
+      'field_name' => 'field_session_time_slot',
+      'field_permissions' => array(
+        'type' => '0',
       ),
+      'foreign keys' => array(),
       'indexes' => array(
-        'fid' => array(
-          0 => 'fid',
+        'target_id' => array(
+          0 => 'target_id',
         ),
       ),
-      'module' => 'file',
+      'locked' => '0',
+      'module' => 'entityreference',
       'settings' => array(
-        'display_default' => 1,
-        'display_field' => 1,
-        'field_permissions' => array(
-          'create' => 'create',
-          'edit' => 0,
-          'edit own' => 'edit own',
-          'view' => 'view',
-          'view own' => 0,
+        'handler' => 'base',
+        'handler_settings' => array(
+          'behaviors' => array(
+            'views-select-list' => array(
+              'status' => 0,
+            ),
+          ),
+          'sort' => array(
+            'direction' => 'ASC',
+            'field' => 'body:value',
+            'property' => 'title',
+            'type' => 'property',
+          ),
+          'target_bundles' => array(
+            'time_slot' => 'time_slot',
+          ),
         ),
-        'uri_scheme' => 'public',
+        'handler_submit' => 'Change handler',
+        'target_type' => 'node',
       ),
-      'translatable' => '1',
-      'type' => 'file',
+      'translatable' => '0',
+      'type' => 'entityreference',
     ),
     'field_instance' => array(
       'bundle' => 'session',
+      'default_value' => NULL,
       'deleted' => '0',
-      'description' => 'Upload your slides here as a PDF, or link to them from the description. (This is typically done after your session.)',
+      'description' => '',
       'display' => array(
         'default' => array(
           'label' => 'above',
-          'module' => 'file',
-          'settings' => array(),
-          'type' => 'file_default',
-          'weight' => '2',
+          'module' => 'entityreference',
+          'settings' => array(
+            'link' => FALSE,
+          ),
+          'type' => 'entityreference_label',
+          'weight' => 9,
         ),
         'teaser' => array(
           'label' => 'above',
@@ -1189,51 +1191,48 @@ function cod_session_field_default_fields() {
         ),
       ),
       'entity_type' => 'node',
-      'field_name' => 'field_slides',
-      'label' => 'Slides',
+      'field_name' => 'field_session_time_slot',
+      'label' => 'Time slot',
       'required' => 0,
       'settings' => array(
-        'description_field' => 0,
-        'file_directory' => 'slides',
-        'file_extensions' => 'ppt pdf odt odp',
-        'max_filesize' => '',
         'user_register_form' => FALSE,
       ),
       'widget' => array(
         'active' => 1,
-        'module' => 'file',
-        'settings' => array(
-          'progress_indicator' => 'throbber',
-        ),
-        'type' => 'file_generic',
-        'weight' => '3',
+        'module' => 'options',
+        'settings' => array(),
+        'type' => 'options_select',
+        'weight' => '12',
       ),
     ),
   );
 
-  // Exported field: 'node-session-field_speakers'
-  $fields['node-session-field_speakers'] = array(
+  // Exported field: 'node-session-field_slides'.
+  $fields['node-session-field_slides'] = array(
     'field_config' => array(
       'active' => '1',
       'cardinality' => '-1',
       'deleted' => '0',
       'entity_types' => array(),
-      'field_name' => 'field_speakers',
+      'field_name' => 'field_slides',
       'foreign keys' => array(
-        'uid' => array(
+        'fid' => array(
           'columns' => array(
-            'uid' => 'uid',
+            'fid' => 'fid',
           ),
-          'table' => 'users',
+          'table' => 'file_managed',
         ),
       ),
       'indexes' => array(
-        'uid' => array(
-          0 => 'uid',
+        'fid' => array(
+          0 => 'fid',
         ),
       ),
-      'module' => 'user_reference',
+      'locked' => '0',
+      'module' => 'file',
       'settings' => array(
+        'display_default' => 1,
+        'display_field' => 1,
         'field_permissions' => array(
           'create' => 'create',
           'edit' => 0,
@@ -1241,37 +1240,22 @@ function cod_session_field_default_fields() {
           'view' => 'view',
           'view own' => 0,
         ),
-        'referenceable_roles' => array(
-          2 => 0,
-          3 => 0,
-          4 => 0,
-          5 => 0,
-        ),
-        'referenceable_status' => array(
-          0 => 0,
-          1 => '1',
-        ),
-        'view' => array(
-          'args' => array(),
-          'display_name' => '',
-          'view_name' => '',
-        ),
+        'uri_scheme' => 'public',
       ),
       'translatable' => '1',
-      'type' => 'user_reference',
+      'type' => 'file',
     ),
     'field_instance' => array(
       'bundle' => 'session',
-      'default_value' => NULL,
       'deleted' => '0',
-      'description' => 'Add your username and optionally 1-5 additional speaker usernames.',
+      'description' => 'Upload your slides here as a PDF, or link to them from the description. (This is typically done after your session.)',
       'display' => array(
         'default' => array(
           'label' => 'above',
-          'module' => 'user_reference',
+          'module' => 'file',
           'settings' => array(),
-          'type' => 'user_reference_default',
-          'weight' => '1',
+          'type' => 'file_default',
+          'weight' => '2',
         ),
         'teaser' => array(
           'label' => 'above',
@@ -1281,27 +1265,29 @@ function cod_session_field_default_fields() {
         ),
       ),
       'entity_type' => 'node',
-      'field_name' => 'field_speakers',
-      'label' => 'Speaker(s)',
+      'field_name' => 'field_slides',
+      'label' => 'Slides',
       'required' => 0,
       'settings' => array(
+        'description_field' => 0,
+        'file_directory' => 'slides',
+        'file_extensions' => 'ppt pdf odt odp',
+        'max_filesize' => '',
         'user_register_form' => FALSE,
       ),
       'widget' => array(
         'active' => 1,
-        'module' => 'user_reference',
+        'module' => 'file',
         'settings' => array(
-          'autocomplete_match' => 'contains',
-          'autocomplete_path' => 'user_reference/autocomplete',
-          'size' => '40',
+          'progress_indicator' => 'throbber',
         ),
-        'type' => 'user_reference_autocomplete',
-        'weight' => '1',
+        'type' => 'file_generic',
+        'weight' => '3',
       ),
     ),
   );
 
-  // Exported field: 'node-session-field_track'
+  // Exported field: 'node-session-field_track'.
   $fields['node-session-field_track'] = array(
     'field_config' => array(
       'active' => '1',
@@ -1315,6 +1301,7 @@ function cod_session_field_default_fields() {
           0 => 'value',
         ),
       ),
+      'locked' => '0',
       'module' => 'list',
       'settings' => array(
         'allowed_values' => array(
@@ -1371,7 +1358,7 @@ function cod_session_field_default_fields() {
     ),
   );
 
-  // Exported field: 'node-time_slot-field_slot_datetime'
+  // Exported field: 'node-time_slot-field_slot_datetime'.
   $fields['node-time_slot-field_slot_datetime'] = array(
     'field_config' => array(
       'active' => '1',
@@ -1381,6 +1368,7 @@ function cod_session_field_default_fields() {
       'field_name' => 'field_slot_datetime',
       'foreign keys' => array(),
       'indexes' => array(),
+      'locked' => '0',
       'module' => 'date',
       'settings' => array(
         'field_permissions' => array(
@@ -1486,7 +1474,6 @@ function cod_session_field_default_fields() {
 
   // Translatables
   // Included for use with string extractors like potx.
-  t('Add your username and optionally 1-5 additional speaker usernames.');
   t('Body');
   t('Capacity');
   t('Date and time');
@@ -1496,10 +1483,9 @@ function cod_session_field_default_fields() {
   t('Number of sessions or BoFs that this room can hold in a time slot. Used to allow multiple BoFs in the same room at the same time slot.');
   t('Photo');
   t('Room');
-  t('Select room(s) in which the session occurs.');
   t('Session capacity');
   t('Slides');
-  t('Speaker(s)');
+  t('Speakers');
   t('Status');
   t('Time slot');
   t('Track');
diff --git a/cod_session/cod_session.features.menu_custom.inc b/cod_session/cod_session.features.menu_custom.inc
index 4dc41ba..26dece4 100644
--- a/cod_session/cod_session.features.menu_custom.inc
+++ b/cod_session/cod_session.features.menu_custom.inc
@@ -10,13 +10,13 @@
 function cod_session_menu_default_menu_custom() {
   $menus = array();
 
-  // Exported menu: main-menu
+  // Exported menu: main-menu.
   $menus['main-menu'] = array(
     'menu_name' => 'main-menu',
     'title' => 'Main menu',
     'description' => 'The <em>Main</em> menu is used on many sites to show the major sections of the site, often in a top navigation bar.',
   );
-  // Exported menu: menu-menu-quick-links
+  // Exported menu: menu-menu-quick-links.
   $menus['menu-menu-quick-links'] = array(
     'menu_name' => 'menu-menu-quick-links',
     'title' => 'Quick links - Authenticated',
diff --git a/cod_session/cod_session.features.user_permission.inc b/cod_session/cod_session.features.user_permission.inc
index d5d7869..a8c6d7c 100644
--- a/cod_session/cod_session.features.user_permission.inc
+++ b/cod_session/cod_session.features.user_permission.inc
@@ -10,7 +10,7 @@
 function cod_session_user_default_permissions() {
   $permissions = array();
 
-  // Exported permission: create field_accepted
+  // Exported permission: create field_accepted.
   $permissions['create field_accepted'] = array(
     'name' => 'create field_accepted',
     'roles' => array(
@@ -19,7 +19,7 @@ function cod_session_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
-  // Exported permission: create room content
+  // Exported permission: create room content.
   $permissions['create room content'] = array(
     'name' => 'create room content',
     'roles' => array(
@@ -28,7 +28,7 @@ function cod_session_user_default_permissions() {
     'module' => 'node',
   );
 
-  // Exported permission: create schedule_item content
+  // Exported permission: create schedule_item content.
   $permissions['create schedule_item content'] = array(
     'name' => 'create schedule_item content',
     'roles' => array(
@@ -37,7 +37,7 @@ function cod_session_user_default_permissions() {
     'module' => 'node',
   );
 
-  // Exported permission: create session content
+  // Exported permission: create session content.
   $permissions['create session content'] = array(
     'name' => 'create session content',
     'roles' => array(
@@ -46,7 +46,7 @@ function cod_session_user_default_permissions() {
     'module' => 'node',
   );
 
-  // Exported permission: create time_slot content
+  // Exported permission: create time_slot content.
   $permissions['create time_slot content'] = array(
     'name' => 'create time_slot content',
     'roles' => array(
@@ -55,7 +55,7 @@ function cod_session_user_default_permissions() {
     'module' => 'node',
   );
 
-  // Exported permission: delete any room content
+  // Exported permission: delete any room content.
   $permissions['delete any room content'] = array(
     'name' => 'delete any room content',
     'roles' => array(
@@ -64,7 +64,7 @@ function cod_session_user_default_permissions() {
     'module' => 'node',
   );
 
-  // Exported permission: delete any schedule_item content
+  // Exported permission: delete any schedule_item content.
   $permissions['delete any schedule_item content'] = array(
     'name' => 'delete any schedule_item content',
     'roles' => array(
@@ -73,7 +73,7 @@ function cod_session_user_default_permissions() {
     'module' => 'node',
   );
 
-  // Exported permission: delete any session content
+  // Exported permission: delete any session content.
   $permissions['delete any session content'] = array(
     'name' => 'delete any session content',
     'roles' => array(
@@ -82,7 +82,7 @@ function cod_session_user_default_permissions() {
     'module' => 'node',
   );
 
-  // Exported permission: delete any time_slot content
+  // Exported permission: delete any time_slot content.
   $permissions['delete any time_slot content'] = array(
     'name' => 'delete any time_slot content',
     'roles' => array(
@@ -91,7 +91,7 @@ function cod_session_user_default_permissions() {
     'module' => 'node',
   );
 
-  // Exported permission: delete own session content
+  // Exported permission: delete own session content.
   $permissions['delete own session content'] = array(
     'name' => 'delete own session content',
     'roles' => array(
@@ -100,7 +100,7 @@ function cod_session_user_default_permissions() {
     'module' => 'node',
   );
 
-  // Exported permission: edit any room content
+  // Exported permission: edit any room content.
   $permissions['edit any room content'] = array(
     'name' => 'edit any room content',
     'roles' => array(
@@ -109,7 +109,7 @@ function cod_session_user_default_permissions() {
     'module' => 'node',
   );
 
-  // Exported permission: edit any schedule_item content
+  // Exported permission: edit any schedule_item content.
   $permissions['edit any schedule_item content'] = array(
     'name' => 'edit any schedule_item content',
     'roles' => array(
@@ -118,7 +118,7 @@ function cod_session_user_default_permissions() {
     'module' => 'node',
   );
 
-  // Exported permission: edit any session content
+  // Exported permission: edit any session content.
   $permissions['edit any session content'] = array(
     'name' => 'edit any session content',
     'roles' => array(
@@ -127,7 +127,7 @@ function cod_session_user_default_permissions() {
     'module' => 'node',
   );
 
-  // Exported permission: edit any time_slot content
+  // Exported permission: edit any time_slot content.
   $permissions['edit any time_slot content'] = array(
     'name' => 'edit any time_slot content',
     'roles' => array(
@@ -136,7 +136,7 @@ function cod_session_user_default_permissions() {
     'module' => 'node',
   );
 
-  // Exported permission: edit field_accepted
+  // Exported permission: edit field_accepted.
   $permissions['edit field_accepted'] = array(
     'name' => 'edit field_accepted',
     'roles' => array(
@@ -145,7 +145,7 @@ function cod_session_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
-  // Exported permission: edit own field_accepted
+  // Exported permission: edit own field_accepted.
   $permissions['edit own field_accepted'] = array(
     'name' => 'edit own field_accepted',
     'roles' => array(
@@ -154,7 +154,7 @@ function cod_session_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
-  // Exported permission: edit own session content
+  // Exported permission: edit own session content.
   $permissions['edit own session content'] = array(
     'name' => 'edit own session content',
     'roles' => array(
@@ -163,7 +163,7 @@ function cod_session_user_default_permissions() {
     'module' => 'node',
   );
 
-  // Exported permission: view field_accepted
+  // Exported permission: view field_accepted.
   $permissions['view field_accepted'] = array(
     'name' => 'view field_accepted',
     'roles' => array(
diff --git a/cod_session/cod_session.features.user_role.inc b/cod_session/cod_session.features.user_role.inc
index 187327d..2a7f1ad 100644
--- a/cod_session/cod_session.features.user_role.inc
+++ b/cod_session/cod_session.features.user_role.inc
@@ -10,7 +10,7 @@
 function cod_session_user_default_roles() {
   $roles = array();
 
-  // Exported role: session organizer
+  // Exported role: session organizer.
   $roles['session organizer'] = array(
     'name' => 'session organizer',
     'weight' => '3',
diff --git a/cod_session/cod_session.field_group.inc b/cod_session/cod_session.field_group.inc
index c05392c..8541c03 100644
--- a/cod_session/cod_session.field_group.inc
+++ b/cod_session/cod_session.field_group.inc
@@ -10,7 +10,7 @@
 function cod_session_field_group_info() {
   $export = array();
 
-  $field_group = new stdClass;
+  $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
   $field_group->api_version = 1;
   $field_group->identifier = 'group_audience|node|session|default';
@@ -37,7 +37,7 @@ function cod_session_field_group_info() {
   );
   $export['group_audience|node|session|default'] = $field_group;
 
-  $field_group = new stdClass;
+  $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
   $field_group->api_version = 1;
   $field_group->identifier = 'group_audience|node|session|form';
@@ -50,8 +50,8 @@ function cod_session_field_group_info() {
     'label' => 'Audience',
     'weight' => '5',
     'children' => array(
-      0 => 'field_track',
-      1 => 'field_experience',
+      0 => 'field_experience',
+      1 => 'field_track',
     ),
     'format_type' => 'fieldset',
     'format_settings' => array(
@@ -64,7 +64,7 @@ function cod_session_field_group_info() {
   );
   $export['group_audience|node|session|form'] = $field_group;
 
-  $field_group = new stdClass;
+  $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
   $field_group->api_version = 1;
   $field_group->identifier = 'group_schedule_info|node|schedule_item|default';
@@ -92,7 +92,7 @@ function cod_session_field_group_info() {
   );
   $export['group_schedule_info|node|schedule_item|default'] = $field_group;
 
-  $field_group = new stdClass;
+  $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
   $field_group->api_version = 1;
   $field_group->identifier = 'group_schedule_info|node|session|default';
@@ -120,7 +120,7 @@ function cod_session_field_group_info() {
   );
   $export['group_schedule_info|node|session|default'] = $field_group;
 
-  $field_group = new stdClass;
+  $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
   $field_group->api_version = 1;
   $field_group->identifier = 'group_schedule|node|schedule_item|form';
@@ -134,8 +134,8 @@ function cod_session_field_group_info() {
     'weight' => '1',
     'children' => array(
       0 => 'field_accepted',
-      1 => 'field_session_slot',
-      2 => 'field_session_room',
+      1 => 'field_schedule_time_slot',
+      2 => 'field_schedule_room',
     ),
     'format_type' => 'fieldset',
     'format_settings' => array(
@@ -150,7 +150,7 @@ function cod_session_field_group_info() {
   );
   $export['group_schedule|node|schedule_item|form'] = $field_group;
 
-  $field_group = new stdClass;
+  $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
   $field_group->api_version = 1;
   $field_group->identifier = 'group_schedule|node|session|form';
@@ -163,9 +163,9 @@ function cod_session_field_group_info() {
     'label' => 'Schedule Info',
     'weight' => '4',
     'children' => array(
-      0 => 'field_session_slot',
-      1 => 'field_session_room',
-      2 => 'field_accepted',
+      0 => 'field_accepted',
+      1 => 'field_session_time_slot',
+      2 => 'field_session_room',
     ),
     'format_type' => 'fieldset',
     'format_settings' => array(
diff --git a/cod_session/cod_session.info b/cod_session/cod_session.info
index c86744a..54aff6f 100644
--- a/cod_session/cod_session.info
+++ b/cod_session/cod_session.info
@@ -1,135 +1,137 @@
-name = "COD Session"
-description = "COD Session Scheduling & Voting"
-core = "7.x"
-package = "COD"
-php = "5.2.4"
-project = "cod_session"
-dependencies[] = "auto_nodetitle"
-dependencies[] = "cod_base"
-dependencies[] = "date"
-dependencies[] = "date_popup"
-dependencies[] = "features"
-dependencies[] = "field_group"
-dependencies[] = "field_permissions"
-dependencies[] = "flag"
-dependencies[] = "image"
-dependencies[] = "list"
-dependencies[] = "menu"
-dependencies[] = "node_reference"
-dependencies[] = "number"
-dependencies[] = "search"
-dependencies[] = "strongarm"
-dependencies[] = "user_reference"
-dependencies[] = "views"
-dependencies[] = "views_bulk_operations"
-dependencies[] = "views_content"
-dependencies[] = "views_ui"
-datestamp = "1312320179"
-features[ctools][] = "field_group:field_group:1"
-features[ctools][] = "strongarm:strongarm:1"
-features[ctools][] = "views:views_default:3.0"
-features[field][] = "node-page-body"
-features[field][] = "node-room-body"
-features[field][] = "node-room-field_room_capacity"
-features[field][] = "node-room-field_room_photo"
-features[field][] = "node-room-field_room_session_capacity"
-features[field][] = "node-schedule_item-body"
-features[field][] = "node-schedule_item-field_accepted"
-features[field][] = "node-schedule_item-field_session_room"
-features[field][] = "node-schedule_item-field_session_slot"
-features[field][] = "node-session-body"
-features[field][] = "node-session-field_accepted"
-features[field][] = "node-session-field_experience"
-features[field][] = "node-session-field_session_room"
-features[field][] = "node-session-field_session_slot"
-features[field][] = "node-session-field_slides"
-features[field][] = "node-session-field_speakers"
-features[field][] = "node-session-field_track"
-features[field][] = "node-time_slot-field_slot_datetime"
-features[field_group][] = "group_audience|node|session|default"
-features[field_group][] = "group_audience|node|session|form"
-features[field_group][] = "group_schedule_info|node|schedule_item|default"
-features[field_group][] = "group_schedule_info|node|session|default"
-features[field_group][] = "group_schedule|node|schedule_item|form"
-features[field_group][] = "group_schedule|node|session|form"
-features[flag][] = "session_confirm"
-features[flag][] = "session_schedule"
-features[flag][] = "session_vote"
-features[menu_custom][] = "main-menu"
-features[menu_custom][] = "menu-menu-quick-links"
-features[menu_links][] = "main-menu:program"
-features[menu_links][] = "main-menu:program/sessions"
-features[menu_links][] = "menu-menu-quick-links:program/session-schedule/your-schedule"
-features[node][] = "page"
-features[node][] = "room"
-features[node][] = "schedule_item"
-features[node][] = "session"
-features[node][] = "time_slot"
-features[user_permission][] = "create field_accepted"
-features[user_permission][] = "create room content"
-features[user_permission][] = "create schedule_item content"
-features[user_permission][] = "create session content"
-features[user_permission][] = "create time_slot content"
-features[user_permission][] = "delete any room content"
-features[user_permission][] = "delete any schedule_item content"
-features[user_permission][] = "delete any session content"
-features[user_permission][] = "delete any time_slot content"
-features[user_permission][] = "delete own session content"
-features[user_permission][] = "edit any room content"
-features[user_permission][] = "edit any schedule_item content"
-features[user_permission][] = "edit any session content"
-features[user_permission][] = "edit any time_slot content"
-features[user_permission][] = "edit field_accepted"
-features[user_permission][] = "edit own field_accepted"
-features[user_permission][] = "edit own session content"
-features[user_permission][] = "view field_accepted"
-features[user_role][] = "session organizer"
-features[variable][] = "ant_pattern_time_slot"
-features[variable][] = "ant_time_slot"
-features[variable][] = "comment_anonymous_room"
-features[variable][] = "comment_anonymous_schedule_item"
-features[variable][] = "comment_anonymous_session"
-features[variable][] = "comment_anonymous_time_slot"
-features[variable][] = "comment_default_mode_room"
-features[variable][] = "comment_default_mode_schedule_item"
-features[variable][] = "comment_default_mode_session"
-features[variable][] = "comment_default_mode_time_slot"
-features[variable][] = "comment_default_per_page_room"
-features[variable][] = "comment_default_per_page_schedule_item"
-features[variable][] = "comment_default_per_page_session"
-features[variable][] = "comment_default_per_page_time_slot"
-features[variable][] = "comment_form_location_room"
-features[variable][] = "comment_form_location_schedule_item"
-features[variable][] = "comment_form_location_session"
-features[variable][] = "comment_form_location_time_slot"
-features[variable][] = "comment_page"
-features[variable][] = "comment_preview_room"
-features[variable][] = "comment_preview_schedule_item"
-features[variable][] = "comment_preview_session"
-features[variable][] = "comment_preview_time_slot"
-features[variable][] = "comment_room"
-features[variable][] = "comment_schedule_item"
-features[variable][] = "comment_session"
-features[variable][] = "comment_subject_field_room"
-features[variable][] = "comment_subject_field_schedule_item"
-features[variable][] = "comment_subject_field_session"
-features[variable][] = "comment_subject_field_time_slot"
-features[variable][] = "comment_time_slot"
-features[variable][] = "menu_options_time_slot"
-features[variable][] = "menu_parent_time_slot"
-features[variable][] = "node_options_page"
-features[variable][] = "node_options_room"
-features[variable][] = "node_options_schedule_item"
-features[variable][] = "node_options_session"
-features[variable][] = "node_options_time_slot"
-features[variable][] = "node_preview_time_slot"
-features[variable][] = "node_submitted_page"
-features[variable][] = "node_submitted_time_slot"
-features[views_view][] = "cod_schedule"
-features[views_view][] = "cod_time_slots"
-features[views_view][] = "schedule_room_list"
-features[views_view][] = "sessions"
-features[views_view][] = "sessions_admin"
-features[views_view][] = "sessions_admin_contact"
-features[views_view][] = "sessions_speaker_confirmation"
-files[] = "cod_session_views_style_plugin_schedule.inc"
+name = COD Session
+description = COD Session Scheduling & Voting
+core = 7.x
+package = COD
+php = 5.2.4
+project = cod_session
+dependencies[] = auto_nodetitle
+dependencies[] = cod_base
+dependencies[] = date
+dependencies[] = date_popup
+dependencies[] = entityreference
+dependencies[] = features
+dependencies[] = field_group
+dependencies[] = field_permissions
+dependencies[] = flag
+dependencies[] = image
+dependencies[] = list
+dependencies[] = menu
+dependencies[] = number
+dependencies[] = search
+dependencies[] = strongarm
+dependencies[] = views
+dependencies[] = views_bulk_operations
+dependencies[] = views_content
+dependencies[] = views_ui
+datestamp = 1312320179
+features[ctools][] = field_group:field_group:1
+features[ctools][] = strongarm:strongarm:1
+features[ctools][] = views:views_default:3.0
+features[features_api][] = api:1
+features[field][] = node-page-body
+features[field][] = node-room-body
+features[field][] = node-room-field_room_capacity
+features[field][] = node-room-field_room_photo
+features[field][] = node-room-field_room_session_capacity
+features[field][] = node-schedule_item-body
+features[field][] = node-schedule_item-field_accepted
+features[field][] = node-schedule_item-field_schedule_room
+features[field][] = node-schedule_item-field_schedule_time_slot
+features[field][] = node-session-body
+features[field][] = node-session-field_accepted
+features[field][] = node-session-field_experience
+features[field][] = node-session-field_session_room
+features[field][] = node-session-field_session_speakers
+features[field][] = node-session-field_session_time_slot
+features[field][] = node-session-field_slides
+features[field][] = node-session-field_track
+features[field][] = node-time_slot-field_slot_datetime
+features[field_group][] = group_audience|node|session|default
+features[field_group][] = group_audience|node|session|form
+features[field_group][] = group_schedule_info|node|schedule_item|default
+features[field_group][] = group_schedule_info|node|session|default
+features[field_group][] = group_schedule|node|schedule_item|form
+features[field_group][] = group_schedule|node|session|form
+features[flag][] = session_confirm
+features[flag][] = session_schedule
+features[flag][] = session_vote
+features[menu_custom][] = main-menu
+features[menu_custom][] = menu-menu-quick-links
+features[menu_links][] = main-menu:program
+features[menu_links][] = main-menu:program/sessions
+features[menu_links][] = menu-menu-quick-links:program/session-schedule/your-schedule
+features[node][] = page
+features[node][] = room
+features[node][] = schedule_item
+features[node][] = session
+features[node][] = time_slot
+features[user_permission][] = create field_accepted
+features[user_permission][] = create room content
+features[user_permission][] = create schedule_item content
+features[user_permission][] = create session content
+features[user_permission][] = create time_slot content
+features[user_permission][] = delete any room content
+features[user_permission][] = delete any schedule_item content
+features[user_permission][] = delete any session content
+features[user_permission][] = delete any time_slot content
+features[user_permission][] = delete own session content
+features[user_permission][] = edit any room content
+features[user_permission][] = edit any schedule_item content
+features[user_permission][] = edit any session content
+features[user_permission][] = edit any time_slot content
+features[user_permission][] = edit field_accepted
+features[user_permission][] = edit own field_accepted
+features[user_permission][] = edit own session content
+features[user_permission][] = view field_accepted
+features[user_role][] = session organizer
+features[variable][] = ant_pattern_time_slot
+features[variable][] = ant_time_slot
+features[variable][] = comment_anonymous_room
+features[variable][] = comment_anonymous_schedule_item
+features[variable][] = comment_anonymous_session
+features[variable][] = comment_anonymous_time_slot
+features[variable][] = comment_default_mode_room
+features[variable][] = comment_default_mode_schedule_item
+features[variable][] = comment_default_mode_session
+features[variable][] = comment_default_mode_time_slot
+features[variable][] = comment_default_per_page_room
+features[variable][] = comment_default_per_page_schedule_item
+features[variable][] = comment_default_per_page_session
+features[variable][] = comment_default_per_page_time_slot
+features[variable][] = comment_form_location_room
+features[variable][] = comment_form_location_schedule_item
+features[variable][] = comment_form_location_session
+features[variable][] = comment_form_location_time_slot
+features[variable][] = comment_page
+features[variable][] = comment_preview_room
+features[variable][] = comment_preview_schedule_item
+features[variable][] = comment_preview_session
+features[variable][] = comment_preview_time_slot
+features[variable][] = comment_room
+features[variable][] = comment_schedule_item
+features[variable][] = comment_session
+features[variable][] = comment_subject_field_room
+features[variable][] = comment_subject_field_schedule_item
+features[variable][] = comment_subject_field_session
+features[variable][] = comment_subject_field_time_slot
+features[variable][] = comment_time_slot
+features[variable][] = field_bundle_settings_node__schedule_item
+features[variable][] = field_bundle_settings_node__session
+features[variable][] = menu_options_time_slot
+features[variable][] = menu_parent_time_slot
+features[variable][] = node_options_page
+features[variable][] = node_options_room
+features[variable][] = node_options_schedule_item
+features[variable][] = node_options_session
+features[variable][] = node_options_time_slot
+features[variable][] = node_preview_time_slot
+features[variable][] = node_submitted_page
+features[variable][] = node_submitted_time_slot
+features[views_view][] = cod_schedule
+features[views_view][] = cod_time_slots
+features[views_view][] = schedule_room_list
+features[views_view][] = sessions
+features[views_view][] = sessions_admin
+features[views_view][] = sessions_admin_contact
+features[views_view][] = sessions_speaker_confirmation
+files[] = cod_session_views_style_plugin_schedule.inc
diff --git a/cod_session/cod_session.strongarm.inc b/cod_session/cod_session.strongarm.inc
index e429724..a07812f 100644
--- a/cod_session/cod_session.strongarm.inc
+++ b/cod_session/cod_session.strongarm.inc
@@ -10,224 +10,258 @@
 function cod_session_strongarm() {
   $export = array();
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'ant_pattern_time_slot';
   $strongarm->value = '[node:field_slot_datetime]';
   $export['ant_pattern_time_slot'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'ant_time_slot';
   $strongarm->value = '1';
   $export['ant_time_slot'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'comment_anonymous_room';
   $strongarm->value = 0;
   $export['comment_anonymous_room'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'comment_anonymous_schedule_item';
   $strongarm->value = 0;
   $export['comment_anonymous_schedule_item'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'comment_anonymous_session';
   $strongarm->value = 0;
   $export['comment_anonymous_session'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'comment_anonymous_time_slot';
   $strongarm->value = 0;
   $export['comment_anonymous_time_slot'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'comment_default_mode_room';
   $strongarm->value = 1;
   $export['comment_default_mode_room'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'comment_default_mode_schedule_item';
   $strongarm->value = 1;
   $export['comment_default_mode_schedule_item'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'comment_default_mode_session';
   $strongarm->value = 1;
   $export['comment_default_mode_session'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'comment_default_mode_time_slot';
   $strongarm->value = 1;
   $export['comment_default_mode_time_slot'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'comment_default_per_page_room';
   $strongarm->value = '50';
   $export['comment_default_per_page_room'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'comment_default_per_page_schedule_item';
   $strongarm->value = '50';
   $export['comment_default_per_page_schedule_item'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'comment_default_per_page_session';
   $strongarm->value = '50';
   $export['comment_default_per_page_session'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'comment_default_per_page_time_slot';
   $strongarm->value = '50';
   $export['comment_default_per_page_time_slot'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'comment_form_location_room';
   $strongarm->value = 1;
   $export['comment_form_location_room'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'comment_form_location_schedule_item';
   $strongarm->value = 1;
   $export['comment_form_location_schedule_item'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'comment_form_location_session';
   $strongarm->value = 1;
   $export['comment_form_location_session'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'comment_form_location_time_slot';
   $strongarm->value = 1;
   $export['comment_form_location_time_slot'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'comment_page';
   $strongarm->value = 0;
   $export['comment_page'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'comment_preview_room';
   $strongarm->value = '1';
   $export['comment_preview_room'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'comment_preview_schedule_item';
   $strongarm->value = '1';
   $export['comment_preview_schedule_item'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'comment_preview_session';
   $strongarm->value = '1';
   $export['comment_preview_session'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'comment_preview_time_slot';
   $strongarm->value = '1';
   $export['comment_preview_time_slot'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'comment_room';
   $strongarm->value = '1';
   $export['comment_room'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'comment_schedule_item';
   $strongarm->value = '1';
   $export['comment_schedule_item'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'comment_session';
   $strongarm->value = '2';
   $export['comment_session'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'comment_subject_field_room';
   $strongarm->value = 1;
   $export['comment_subject_field_room'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'comment_subject_field_schedule_item';
   $strongarm->value = 1;
   $export['comment_subject_field_schedule_item'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'comment_subject_field_session';
   $strongarm->value = 1;
   $export['comment_subject_field_session'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'comment_subject_field_time_slot';
   $strongarm->value = 1;
   $export['comment_subject_field_time_slot'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'comment_time_slot';
   $strongarm->value = '1';
   $export['comment_time_slot'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'field_bundle_settings_node__schedule_item';
+  $strongarm->value = array(
+    'view_modes' => array(),
+    'extra_fields' => array(
+      'form' => array(
+        'title' => array(
+          'weight' => '-5',
+        ),
+      ),
+      'display' => array(),
+    ),
+  );
+  $export['field_bundle_settings_node__schedule_item'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'field_bundle_settings_node__session';
+  $strongarm->value = array(
+    'view_modes' => array(),
+    'extra_fields' => array(
+      'form' => array(
+        'title' => array(
+          'weight' => '0',
+        ),
+      ),
+      'display' => array(),
+    ),
+  );
+  $export['field_bundle_settings_node__session'] = $strongarm;
+
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'menu_options_time_slot';
@@ -236,14 +270,14 @@ function cod_session_strongarm() {
   );
   $export['menu_options_time_slot'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'menu_parent_time_slot';
   $strongarm->value = 'main-menu:0';
   $export['menu_parent_time_slot'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'node_options_page';
@@ -252,7 +286,7 @@ function cod_session_strongarm() {
   );
   $export['node_options_page'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'node_options_room';
@@ -262,7 +296,7 @@ function cod_session_strongarm() {
   );
   $export['node_options_room'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'node_options_schedule_item';
@@ -272,7 +306,7 @@ function cod_session_strongarm() {
   );
   $export['node_options_schedule_item'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'node_options_session';
@@ -282,7 +316,7 @@ function cod_session_strongarm() {
   );
   $export['node_options_session'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'node_options_time_slot';
@@ -292,21 +326,21 @@ function cod_session_strongarm() {
   );
   $export['node_options_time_slot'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'node_preview_time_slot';
   $strongarm->value = '1';
   $export['node_preview_time_slot'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'node_submitted_page';
   $strongarm->value = FALSE;
   $export['node_submitted_page'] = $strongarm;
 
-  $strongarm = new stdClass;
+  $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'node_submitted_time_slot';
diff --git a/cod_session/cod_session.views_default.inc b/cod_session/cod_session.views_default.inc
index dcb35e8..587ce37 100644
--- a/cod_session/cod_session.views_default.inc
+++ b/cod_session/cod_session.views_default.inc
@@ -102,32 +102,37 @@ function cod_session_views_default_views() {
   $handler->display->display_options['fields']['title']['empty_zero'] = 0;
   $handler->display->display_options['fields']['title']['hide_alter_empty'] = 1;
   $handler->display->display_options['fields']['title']['link_to_node'] = 1;
-  /* Field: Content: Speaker(s) */
-  $handler->display->display_options['fields']['field_speakers']['id'] = 'field_speakers';
-  $handler->display->display_options['fields']['field_speakers']['table'] = 'field_data_field_speakers';
-  $handler->display->display_options['fields']['field_speakers']['field'] = 'field_speakers';
-  $handler->display->display_options['fields']['field_speakers']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['field_speakers']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['field_speakers']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['element_label_colon'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['field_speakers']['hide_empty'] = 1;
-  $handler->display->display_options['fields']['field_speakers']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['hide_alter_empty'] = 1;
-  $handler->display->display_options['fields']['field_speakers']['group_rows'] = 1;
-  $handler->display->display_options['fields']['field_speakers']['delta_offset'] = '0';
-  $handler->display->display_options['fields']['field_speakers']['delta_reversed'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['delta_first_last'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['field_api_classes'] = 0;
+  /* Field: Content: Speakers */
+  $handler->display->display_options['fields']['field_session_speakers']['id'] = 'field_session_speakers';
+  $handler->display->display_options['fields']['field_session_speakers']['table'] = 'field_data_field_session_speakers';
+  $handler->display->display_options['fields']['field_session_speakers']['field'] = 'field_session_speakers';
+  $handler->display->display_options['fields']['field_session_speakers']['label'] = '';
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['alter_text'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['make_link'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['absolute'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['external'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['replace_spaces'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['trim_whitespace'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['nl2br'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['word_boundary'] = 1;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['ellipsis'] = 1;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['more_link'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['strip_tags'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['trim'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['element_label_colon'] = FALSE;
+  $handler->display->display_options['fields']['field_session_speakers']['element_default_classes'] = 1;
+  $handler->display->display_options['fields']['field_session_speakers']['hide_empty'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['empty_zero'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['hide_alter_empty'] = 1;
+  $handler->display->display_options['fields']['field_session_speakers']['settings'] = array(
+    'link' => 0,
+  );
+  $handler->display->display_options['fields']['field_session_speakers']['group_rows'] = 1;
+  $handler->display->display_options['fields']['field_session_speakers']['delta_offset'] = '0';
+  $handler->display->display_options['fields']['field_session_speakers']['delta_reversed'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['delta_first_last'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['field_api_classes'] = 0;
   /* Field: Content: Experience level */
   $handler->display->display_options['fields']['field_experience']['id'] = 'field_experience';
   $handler->display->display_options['fields']['field_experience']['table'] = 'field_data_field_experience';
@@ -201,18 +206,12 @@ function cod_session_views_default_views() {
     1 => '1',
   );
   $handler->display->display_options['filters']['field_accepted_value']['group'] = 1;
-  /* Filter criterion: Content: Room (field_session_room) */
+  /* Filter criterion: Broken/missing handler */
   $handler->display->display_options['filters']['field_session_room_nid']['id'] = 'field_session_room_nid';
   $handler->display->display_options['filters']['field_session_room_nid']['table'] = 'field_data_field_session_room';
   $handler->display->display_options['filters']['field_session_room_nid']['field'] = 'field_session_room_nid';
   $handler->display->display_options['filters']['field_session_room_nid']['operator'] = 'not empty';
   $handler->display->display_options['filters']['field_session_room_nid']['group'] = 1;
-  /* Filter criterion: Content: Time slot (field_session_slot) */
-  $handler->display->display_options['filters']['field_session_slot_nid']['id'] = 'field_session_slot_nid';
-  $handler->display->display_options['filters']['field_session_slot_nid']['table'] = 'field_data_field_session_slot';
-  $handler->display->display_options['filters']['field_session_slot_nid']['field'] = 'field_session_slot_nid';
-  $handler->display->display_options['filters']['field_session_slot_nid']['operator'] = 'not empty';
-  $handler->display->display_options['filters']['field_session_slot_nid']['group'] = 1;
 
   /* Display: Schedule */
   $handler = $view->new_display('page', 'Schedule', 'page_1');
@@ -270,13 +269,13 @@ function cod_session_views_default_views() {
     1 => '1',
   );
   $handler->display->display_options['filters']['field_accepted_value']['group'] = 1;
-  /* Filter criterion: Content: Room (field_session_room) */
+  /* Filter criterion: Broken/missing handler */
   $handler->display->display_options['filters']['field_session_room_nid']['id'] = 'field_session_room_nid';
   $handler->display->display_options['filters']['field_session_room_nid']['table'] = 'field_data_field_session_room';
   $handler->display->display_options['filters']['field_session_room_nid']['field'] = 'field_session_room_nid';
   $handler->display->display_options['filters']['field_session_room_nid']['operator'] = 'not empty';
   $handler->display->display_options['filters']['field_session_room_nid']['group'] = 1;
-  /* Filter criterion: Content: Time slot (field_session_slot) */
+  /* Filter criterion: Broken/missing handler */
   $handler->display->display_options['filters']['field_session_slot_nid']['id'] = 'field_session_slot_nid';
   $handler->display->display_options['filters']['field_session_slot_nid']['table'] = 'field_data_field_session_slot';
   $handler->display->display_options['filters']['field_session_slot_nid']['field'] = 'field_session_slot_nid';
@@ -561,32 +560,7 @@ function cod_session_views_default_views() {
   $handler->display->display_options['fields']['title']['empty_zero'] = 0;
   $handler->display->display_options['fields']['title']['hide_alter_empty'] = 0;
   $handler->display->display_options['fields']['title']['link_to_node'] = 1;
-  /* Field: Content: Speaker(s) */
-  $handler->display->display_options['fields']['field_speakers']['id'] = 'field_speakers';
-  $handler->display->display_options['fields']['field_speakers']['table'] = 'field_data_field_speakers';
-  $handler->display->display_options['fields']['field_speakers']['field'] = 'field_speakers';
-  $handler->display->display_options['fields']['field_speakers']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['field_speakers']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['field_speakers']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['element_label_colon'] = 1;
-  $handler->display->display_options['fields']['field_speakers']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['field_speakers']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['hide_alter_empty'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['group_rows'] = 1;
-  $handler->display->display_options['fields']['field_speakers']['delta_offset'] = '0';
-  $handler->display->display_options['fields']['field_speakers']['delta_reversed'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['field_api_classes'] = 0;
-  /* Field: Content: Description */
+  /* Field: Content: Body */
   $handler->display->display_options['fields']['body']['id'] = 'body';
   $handler->display->display_options['fields']['body']['table'] = 'field_data_body';
   $handler->display->display_options['fields']['body']['field'] = 'body';
@@ -741,6 +715,156 @@ function cod_session_views_default_views() {
 
   /* Display: Page: Proposed */
   $handler = $view->new_display('page', 'Page: Proposed', 'page_proposed');
+  $handler->display->display_options['defaults']['fields'] = FALSE;
+  /* Field: Content: Title */
+  $handler->display->display_options['fields']['title']['id'] = 'title';
+  $handler->display->display_options['fields']['title']['table'] = 'node';
+  $handler->display->display_options['fields']['title']['field'] = 'title';
+  $handler->display->display_options['fields']['title']['label'] = 'Session';
+  $handler->display->display_options['fields']['title']['alter']['alter_text'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['make_link'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['absolute'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['external'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['replace_spaces'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['trim_whitespace'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['nl2br'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['word_boundary'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['ellipsis'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['strip_tags'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['trim'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['title']['element_label_colon'] = 0;
+  $handler->display->display_options['fields']['title']['element_default_classes'] = 1;
+  $handler->display->display_options['fields']['title']['hide_empty'] = 0;
+  $handler->display->display_options['fields']['title']['empty_zero'] = 0;
+  $handler->display->display_options['fields']['title']['hide_alter_empty'] = 0;
+  $handler->display->display_options['fields']['title']['link_to_node'] = 1;
+  /* Field: Content: Speakers */
+  $handler->display->display_options['fields']['field_session_speakers']['id'] = 'field_session_speakers';
+  $handler->display->display_options['fields']['field_session_speakers']['table'] = 'field_data_field_session_speakers';
+  $handler->display->display_options['fields']['field_session_speakers']['field'] = 'field_session_speakers';
+  $handler->display->display_options['fields']['field_session_speakers']['label'] = '';
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['alter_text'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['make_link'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['absolute'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['external'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['replace_spaces'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['trim_whitespace'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['nl2br'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['word_boundary'] = 1;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['ellipsis'] = 1;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['more_link'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['strip_tags'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['trim'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['element_label_colon'] = FALSE;
+  $handler->display->display_options['fields']['field_session_speakers']['element_default_classes'] = 1;
+  $handler->display->display_options['fields']['field_session_speakers']['hide_empty'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['empty_zero'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['hide_alter_empty'] = 1;
+  $handler->display->display_options['fields']['field_session_speakers']['settings'] = array(
+    'link' => 0,
+  );
+  $handler->display->display_options['fields']['field_session_speakers']['group_rows'] = 1;
+  $handler->display->display_options['fields']['field_session_speakers']['delta_offset'] = '0';
+  $handler->display->display_options['fields']['field_session_speakers']['delta_reversed'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['delta_first_last'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['field_api_classes'] = 0;
+  /* Field: Content: Body */
+  $handler->display->display_options['fields']['body']['id'] = 'body';
+  $handler->display->display_options['fields']['body']['table'] = 'field_data_body';
+  $handler->display->display_options['fields']['body']['field'] = 'body';
+  $handler->display->display_options['fields']['body']['label'] = '';
+  $handler->display->display_options['fields']['body']['alter']['alter_text'] = 0;
+  $handler->display->display_options['fields']['body']['alter']['make_link'] = 0;
+  $handler->display->display_options['fields']['body']['alter']['absolute'] = 0;
+  $handler->display->display_options['fields']['body']['alter']['external'] = 0;
+  $handler->display->display_options['fields']['body']['alter']['replace_spaces'] = 0;
+  $handler->display->display_options['fields']['body']['alter']['trim_whitespace'] = 0;
+  $handler->display->display_options['fields']['body']['alter']['nl2br'] = 0;
+  $handler->display->display_options['fields']['body']['alter']['max_length'] = '200';
+  $handler->display->display_options['fields']['body']['alter']['word_boundary'] = 1;
+  $handler->display->display_options['fields']['body']['alter']['ellipsis'] = 1;
+  $handler->display->display_options['fields']['body']['alter']['strip_tags'] = 0;
+  $handler->display->display_options['fields']['body']['alter']['trim'] = 1;
+  $handler->display->display_options['fields']['body']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['body']['element_label_colon'] = FALSE;
+  $handler->display->display_options['fields']['body']['element_default_classes'] = 1;
+  $handler->display->display_options['fields']['body']['hide_empty'] = 0;
+  $handler->display->display_options['fields']['body']['empty_zero'] = 0;
+  $handler->display->display_options['fields']['body']['hide_alter_empty'] = 0;
+  $handler->display->display_options['fields']['body']['type'] = 'text_summary_or_trimmed';
+  $handler->display->display_options['fields']['body']['settings'] = array(
+    'trim_length' => '250',
+  );
+  $handler->display->display_options['fields']['body']['field_api_classes'] = 0;
+  /* Field: Content: Status */
+  $handler->display->display_options['fields']['field_accepted']['id'] = 'field_accepted';
+  $handler->display->display_options['fields']['field_accepted']['table'] = 'field_data_field_accepted';
+  $handler->display->display_options['fields']['field_accepted']['field'] = 'field_accepted';
+  $handler->display->display_options['fields']['field_accepted']['exclude'] = TRUE;
+  $handler->display->display_options['fields']['field_accepted']['alter']['alter_text'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['alter']['make_link'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['alter']['absolute'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['alter']['external'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['alter']['replace_spaces'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['alter']['trim_whitespace'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['alter']['nl2br'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['alter']['word_boundary'] = 1;
+  $handler->display->display_options['fields']['field_accepted']['alter']['ellipsis'] = 1;
+  $handler->display->display_options['fields']['field_accepted']['alter']['strip_tags'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['alter']['trim'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['element_label_colon'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['element_default_classes'] = 1;
+  $handler->display->display_options['fields']['field_accepted']['hide_empty'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['empty_zero'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['hide_alter_empty'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['field_api_classes'] = 0;
+  /* Field: Content: Experience level */
+  $handler->display->display_options['fields']['field_experience']['id'] = 'field_experience';
+  $handler->display->display_options['fields']['field_experience']['table'] = 'field_data_field_experience';
+  $handler->display->display_options['fields']['field_experience']['field'] = 'field_experience';
+  $handler->display->display_options['fields']['field_experience']['alter']['alter_text'] = 0;
+  $handler->display->display_options['fields']['field_experience']['alter']['make_link'] = 0;
+  $handler->display->display_options['fields']['field_experience']['alter']['absolute'] = 0;
+  $handler->display->display_options['fields']['field_experience']['alter']['external'] = 0;
+  $handler->display->display_options['fields']['field_experience']['alter']['replace_spaces'] = 0;
+  $handler->display->display_options['fields']['field_experience']['alter']['trim_whitespace'] = 0;
+  $handler->display->display_options['fields']['field_experience']['alter']['nl2br'] = 0;
+  $handler->display->display_options['fields']['field_experience']['alter']['word_boundary'] = 1;
+  $handler->display->display_options['fields']['field_experience']['alter']['ellipsis'] = 1;
+  $handler->display->display_options['fields']['field_experience']['alter']['strip_tags'] = 0;
+  $handler->display->display_options['fields']['field_experience']['alter']['trim'] = 0;
+  $handler->display->display_options['fields']['field_experience']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['field_experience']['element_label_colon'] = 0;
+  $handler->display->display_options['fields']['field_experience']['element_default_classes'] = 1;
+  $handler->display->display_options['fields']['field_experience']['hide_empty'] = 0;
+  $handler->display->display_options['fields']['field_experience']['empty_zero'] = 0;
+  $handler->display->display_options['fields']['field_experience']['hide_alter_empty'] = 0;
+  $handler->display->display_options['fields']['field_experience']['field_api_classes'] = 0;
+  /* Field: Content: Track */
+  $handler->display->display_options['fields']['field_track']['id'] = 'field_track';
+  $handler->display->display_options['fields']['field_track']['table'] = 'field_data_field_track';
+  $handler->display->display_options['fields']['field_track']['field'] = 'field_track';
+  $handler->display->display_options['fields']['field_track']['alter']['alter_text'] = 0;
+  $handler->display->display_options['fields']['field_track']['alter']['make_link'] = 0;
+  $handler->display->display_options['fields']['field_track']['alter']['absolute'] = 0;
+  $handler->display->display_options['fields']['field_track']['alter']['external'] = 0;
+  $handler->display->display_options['fields']['field_track']['alter']['replace_spaces'] = 0;
+  $handler->display->display_options['fields']['field_track']['alter']['trim_whitespace'] = 0;
+  $handler->display->display_options['fields']['field_track']['alter']['nl2br'] = 0;
+  $handler->display->display_options['fields']['field_track']['alter']['word_boundary'] = 1;
+  $handler->display->display_options['fields']['field_track']['alter']['ellipsis'] = 1;
+  $handler->display->display_options['fields']['field_track']['alter']['strip_tags'] = 0;
+  $handler->display->display_options['fields']['field_track']['alter']['trim'] = 0;
+  $handler->display->display_options['fields']['field_track']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['field_track']['element_label_colon'] = 0;
+  $handler->display->display_options['fields']['field_track']['element_default_classes'] = 1;
+  $handler->display->display_options['fields']['field_track']['hide_empty'] = 0;
+  $handler->display->display_options['fields']['field_track']['empty_zero'] = 0;
+  $handler->display->display_options['fields']['field_track']['hide_alter_empty'] = 0;
+  $handler->display->display_options['fields']['field_track']['field_api_classes'] = 0;
   $handler->display->display_options['defaults']['filters'] = FALSE;
   /* Filter criterion: Content: Published */
   $handler->display->display_options['filters']['status']['id'] = 'status';
@@ -871,6 +995,156 @@ function cod_session_views_default_views() {
   $handler->display->display_options['empty']['area']['content'] = 'No sessions have been accepted yet.';
   $handler->display->display_options['empty']['area']['format'] = 'plain_text';
   $handler->display->display_options['empty']['area']['tokenize'] = 0;
+  $handler->display->display_options['defaults']['fields'] = FALSE;
+  /* Field: Content: Title */
+  $handler->display->display_options['fields']['title']['id'] = 'title';
+  $handler->display->display_options['fields']['title']['table'] = 'node';
+  $handler->display->display_options['fields']['title']['field'] = 'title';
+  $handler->display->display_options['fields']['title']['label'] = 'Session';
+  $handler->display->display_options['fields']['title']['alter']['alter_text'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['make_link'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['absolute'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['external'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['replace_spaces'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['trim_whitespace'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['nl2br'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['word_boundary'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['ellipsis'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['strip_tags'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['trim'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['title']['element_label_colon'] = 0;
+  $handler->display->display_options['fields']['title']['element_default_classes'] = 1;
+  $handler->display->display_options['fields']['title']['hide_empty'] = 0;
+  $handler->display->display_options['fields']['title']['empty_zero'] = 0;
+  $handler->display->display_options['fields']['title']['hide_alter_empty'] = 0;
+  $handler->display->display_options['fields']['title']['link_to_node'] = 1;
+  /* Field: Content: Speakers */
+  $handler->display->display_options['fields']['field_session_speakers']['id'] = 'field_session_speakers';
+  $handler->display->display_options['fields']['field_session_speakers']['table'] = 'field_data_field_session_speakers';
+  $handler->display->display_options['fields']['field_session_speakers']['field'] = 'field_session_speakers';
+  $handler->display->display_options['fields']['field_session_speakers']['label'] = '';
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['alter_text'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['make_link'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['absolute'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['external'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['replace_spaces'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['trim_whitespace'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['nl2br'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['word_boundary'] = 1;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['ellipsis'] = 1;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['more_link'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['strip_tags'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['trim'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['element_label_colon'] = FALSE;
+  $handler->display->display_options['fields']['field_session_speakers']['element_default_classes'] = 1;
+  $handler->display->display_options['fields']['field_session_speakers']['hide_empty'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['empty_zero'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['hide_alter_empty'] = 1;
+  $handler->display->display_options['fields']['field_session_speakers']['settings'] = array(
+    'link' => 0,
+  );
+  $handler->display->display_options['fields']['field_session_speakers']['group_rows'] = 1;
+  $handler->display->display_options['fields']['field_session_speakers']['delta_offset'] = '0';
+  $handler->display->display_options['fields']['field_session_speakers']['delta_reversed'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['delta_first_last'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['field_api_classes'] = 0;
+  /* Field: Content: Body */
+  $handler->display->display_options['fields']['body']['id'] = 'body';
+  $handler->display->display_options['fields']['body']['table'] = 'field_data_body';
+  $handler->display->display_options['fields']['body']['field'] = 'body';
+  $handler->display->display_options['fields']['body']['label'] = '';
+  $handler->display->display_options['fields']['body']['alter']['alter_text'] = 0;
+  $handler->display->display_options['fields']['body']['alter']['make_link'] = 0;
+  $handler->display->display_options['fields']['body']['alter']['absolute'] = 0;
+  $handler->display->display_options['fields']['body']['alter']['external'] = 0;
+  $handler->display->display_options['fields']['body']['alter']['replace_spaces'] = 0;
+  $handler->display->display_options['fields']['body']['alter']['trim_whitespace'] = 0;
+  $handler->display->display_options['fields']['body']['alter']['nl2br'] = 0;
+  $handler->display->display_options['fields']['body']['alter']['max_length'] = '200';
+  $handler->display->display_options['fields']['body']['alter']['word_boundary'] = 1;
+  $handler->display->display_options['fields']['body']['alter']['ellipsis'] = 1;
+  $handler->display->display_options['fields']['body']['alter']['strip_tags'] = 0;
+  $handler->display->display_options['fields']['body']['alter']['trim'] = 1;
+  $handler->display->display_options['fields']['body']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['body']['element_label_colon'] = FALSE;
+  $handler->display->display_options['fields']['body']['element_default_classes'] = 1;
+  $handler->display->display_options['fields']['body']['hide_empty'] = 0;
+  $handler->display->display_options['fields']['body']['empty_zero'] = 0;
+  $handler->display->display_options['fields']['body']['hide_alter_empty'] = 0;
+  $handler->display->display_options['fields']['body']['type'] = 'text_summary_or_trimmed';
+  $handler->display->display_options['fields']['body']['settings'] = array(
+    'trim_length' => '250',
+  );
+  $handler->display->display_options['fields']['body']['field_api_classes'] = 0;
+  /* Field: Content: Status */
+  $handler->display->display_options['fields']['field_accepted']['id'] = 'field_accepted';
+  $handler->display->display_options['fields']['field_accepted']['table'] = 'field_data_field_accepted';
+  $handler->display->display_options['fields']['field_accepted']['field'] = 'field_accepted';
+  $handler->display->display_options['fields']['field_accepted']['exclude'] = TRUE;
+  $handler->display->display_options['fields']['field_accepted']['alter']['alter_text'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['alter']['make_link'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['alter']['absolute'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['alter']['external'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['alter']['replace_spaces'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['alter']['trim_whitespace'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['alter']['nl2br'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['alter']['word_boundary'] = 1;
+  $handler->display->display_options['fields']['field_accepted']['alter']['ellipsis'] = 1;
+  $handler->display->display_options['fields']['field_accepted']['alter']['strip_tags'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['alter']['trim'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['element_label_colon'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['element_default_classes'] = 1;
+  $handler->display->display_options['fields']['field_accepted']['hide_empty'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['empty_zero'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['hide_alter_empty'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['field_api_classes'] = 0;
+  /* Field: Content: Experience level */
+  $handler->display->display_options['fields']['field_experience']['id'] = 'field_experience';
+  $handler->display->display_options['fields']['field_experience']['table'] = 'field_data_field_experience';
+  $handler->display->display_options['fields']['field_experience']['field'] = 'field_experience';
+  $handler->display->display_options['fields']['field_experience']['alter']['alter_text'] = 0;
+  $handler->display->display_options['fields']['field_experience']['alter']['make_link'] = 0;
+  $handler->display->display_options['fields']['field_experience']['alter']['absolute'] = 0;
+  $handler->display->display_options['fields']['field_experience']['alter']['external'] = 0;
+  $handler->display->display_options['fields']['field_experience']['alter']['replace_spaces'] = 0;
+  $handler->display->display_options['fields']['field_experience']['alter']['trim_whitespace'] = 0;
+  $handler->display->display_options['fields']['field_experience']['alter']['nl2br'] = 0;
+  $handler->display->display_options['fields']['field_experience']['alter']['word_boundary'] = 1;
+  $handler->display->display_options['fields']['field_experience']['alter']['ellipsis'] = 1;
+  $handler->display->display_options['fields']['field_experience']['alter']['strip_tags'] = 0;
+  $handler->display->display_options['fields']['field_experience']['alter']['trim'] = 0;
+  $handler->display->display_options['fields']['field_experience']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['field_experience']['element_label_colon'] = 0;
+  $handler->display->display_options['fields']['field_experience']['element_default_classes'] = 1;
+  $handler->display->display_options['fields']['field_experience']['hide_empty'] = 0;
+  $handler->display->display_options['fields']['field_experience']['empty_zero'] = 0;
+  $handler->display->display_options['fields']['field_experience']['hide_alter_empty'] = 0;
+  $handler->display->display_options['fields']['field_experience']['field_api_classes'] = 0;
+  /* Field: Content: Track */
+  $handler->display->display_options['fields']['field_track']['id'] = 'field_track';
+  $handler->display->display_options['fields']['field_track']['table'] = 'field_data_field_track';
+  $handler->display->display_options['fields']['field_track']['field'] = 'field_track';
+  $handler->display->display_options['fields']['field_track']['alter']['alter_text'] = 0;
+  $handler->display->display_options['fields']['field_track']['alter']['make_link'] = 0;
+  $handler->display->display_options['fields']['field_track']['alter']['absolute'] = 0;
+  $handler->display->display_options['fields']['field_track']['alter']['external'] = 0;
+  $handler->display->display_options['fields']['field_track']['alter']['replace_spaces'] = 0;
+  $handler->display->display_options['fields']['field_track']['alter']['trim_whitespace'] = 0;
+  $handler->display->display_options['fields']['field_track']['alter']['nl2br'] = 0;
+  $handler->display->display_options['fields']['field_track']['alter']['word_boundary'] = 1;
+  $handler->display->display_options['fields']['field_track']['alter']['ellipsis'] = 1;
+  $handler->display->display_options['fields']['field_track']['alter']['strip_tags'] = 0;
+  $handler->display->display_options['fields']['field_track']['alter']['trim'] = 0;
+  $handler->display->display_options['fields']['field_track']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['field_track']['element_label_colon'] = 0;
+  $handler->display->display_options['fields']['field_track']['element_default_classes'] = 1;
+  $handler->display->display_options['fields']['field_track']['hide_empty'] = 0;
+  $handler->display->display_options['fields']['field_track']['empty_zero'] = 0;
+  $handler->display->display_options['fields']['field_track']['hide_alter_empty'] = 0;
+  $handler->display->display_options['fields']['field_track']['field_api_classes'] = 0;
   $handler->display->display_options['defaults']['sorts'] = FALSE;
   /* Sort criterion: Content: Title */
   $handler->display->display_options['sorts']['title']['id'] = 'title';
@@ -963,12 +1237,6 @@ function cod_session_views_default_views() {
   $handler->display->display_options['pager']['options']['id'] = '0';
   $handler->display->display_options['pager']['options']['expose']['items_per_page_options_all'] = 0;
   $handler->display->display_options['defaults']['relationships'] = FALSE;
-  /* Relationship: Content: Time slot (field_session_slot) */
-  $handler->display->display_options['relationships']['field_session_slot_nid']['id'] = 'field_session_slot_nid';
-  $handler->display->display_options['relationships']['field_session_slot_nid']['table'] = 'field_data_field_session_slot';
-  $handler->display->display_options['relationships']['field_session_slot_nid']['field'] = 'field_session_slot_nid';
-  $handler->display->display_options['relationships']['field_session_slot_nid']['required'] = 0;
-  $handler->display->display_options['relationships']['field_session_slot_nid']['delta'] = '-1';
   $handler->display->display_options['defaults']['fields'] = FALSE;
   /* Field: Content: Status */
   $handler->display->display_options['fields']['field_accepted']['id'] = 'field_accepted';
@@ -1103,12 +1371,11 @@ function cod_session_views_default_views() {
   $handler->display->display_options['row_options']['default_field_elements'] = 1;
   $handler->display->display_options['defaults']['row_options'] = FALSE;
   $handler->display->display_options['defaults']['relationships'] = FALSE;
-  /* Relationship: Content: Speaker(s) (field_speakers) */
+  /* Relationship: Broken/missing handler */
   $handler->display->display_options['relationships']['field_speakers_uid']['id'] = 'field_speakers_uid';
   $handler->display->display_options['relationships']['field_speakers_uid']['table'] = 'field_data_field_speakers';
   $handler->display->display_options['relationships']['field_speakers_uid']['field'] = 'field_speakers_uid';
   $handler->display->display_options['relationships']['field_speakers_uid']['required'] = 0;
-  $handler->display->display_options['relationships']['field_speakers_uid']['delta'] = '-1';
   $handler->display->display_options['defaults']['fields'] = FALSE;
   /* Field: User: Picture */
   $handler->display->display_options['fields']['picture']['id'] = 'picture';
@@ -1386,31 +1653,37 @@ function cod_session_views_default_views() {
   $handler->display->display_options['fields']['field_accepted']['empty_zero'] = 0;
   $handler->display->display_options['fields']['field_accepted']['hide_alter_empty'] = 0;
   $handler->display->display_options['fields']['field_accepted']['field_api_classes'] = 0;
-  /* Field: Content: Speaker(s) */
-  $handler->display->display_options['fields']['field_speakers']['id'] = 'field_speakers';
-  $handler->display->display_options['fields']['field_speakers']['table'] = 'field_data_field_speakers';
-  $handler->display->display_options['fields']['field_speakers']['field'] = 'field_speakers';
-  $handler->display->display_options['fields']['field_speakers']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['field_speakers']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['field_speakers']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['element_label_colon'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['field_speakers']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['hide_alter_empty'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['group_rows'] = 1;
-  $handler->display->display_options['fields']['field_speakers']['delta_offset'] = '0';
-  $handler->display->display_options['fields']['field_speakers']['delta_reversed'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['field_api_classes'] = 0;
+  /* Field: Content: Speakers */
+  $handler->display->display_options['fields']['field_session_speakers']['id'] = 'field_session_speakers';
+  $handler->display->display_options['fields']['field_session_speakers']['table'] = 'field_data_field_session_speakers';
+  $handler->display->display_options['fields']['field_session_speakers']['field'] = 'field_session_speakers';
+  $handler->display->display_options['fields']['field_session_speakers']['label'] = '';
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['alter_text'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['make_link'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['absolute'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['external'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['replace_spaces'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['trim_whitespace'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['nl2br'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['word_boundary'] = 1;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['ellipsis'] = 1;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['more_link'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['strip_tags'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['trim'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['element_label_colon'] = FALSE;
+  $handler->display->display_options['fields']['field_session_speakers']['element_default_classes'] = 1;
+  $handler->display->display_options['fields']['field_session_speakers']['hide_empty'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['empty_zero'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['hide_alter_empty'] = 1;
+  $handler->display->display_options['fields']['field_session_speakers']['settings'] = array(
+    'link' => 0,
+  );
+  $handler->display->display_options['fields']['field_session_speakers']['group_rows'] = 1;
+  $handler->display->display_options['fields']['field_session_speakers']['delta_offset'] = '0';
+  $handler->display->display_options['fields']['field_session_speakers']['delta_reversed'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['delta_first_last'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['field_api_classes'] = 0;
   /* Field: Content: Experience level */
   $handler->display->display_options['fields']['field_experience']['id'] = 'field_experience';
   $handler->display->display_options['fields']['field_experience']['table'] = 'field_data_field_experience';
@@ -1550,6 +1823,148 @@ function cod_session_views_default_views() {
   $handler->display->display_options['empty']['area']['content'] = 'No sessions have been accepted yet. When you accept unprocessed sessions, they will show up here.';
   $handler->display->display_options['empty']['area']['format'] = 'filtered_html';
   $handler->display->display_options['empty']['area']['tokenize'] = 0;
+  $handler->display->display_options['defaults']['fields'] = FALSE;
+  /* Field: Content: Title */
+  $handler->display->display_options['fields']['title']['id'] = 'title';
+  $handler->display->display_options['fields']['title']['table'] = 'node';
+  $handler->display->display_options['fields']['title']['field'] = 'title';
+  $handler->display->display_options['fields']['title']['alter']['alter_text'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['make_link'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['absolute'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['external'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['replace_spaces'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['trim_whitespace'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['nl2br'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['word_boundary'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['ellipsis'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['strip_tags'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['trim'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['title']['element_label_colon'] = 0;
+  $handler->display->display_options['fields']['title']['element_default_classes'] = 1;
+  $handler->display->display_options['fields']['title']['hide_empty'] = 0;
+  $handler->display->display_options['fields']['title']['empty_zero'] = 0;
+  $handler->display->display_options['fields']['title']['hide_alter_empty'] = 0;
+  $handler->display->display_options['fields']['title']['link_to_node'] = 1;
+  /* Field: Content: Status */
+  $handler->display->display_options['fields']['field_accepted']['id'] = 'field_accepted';
+  $handler->display->display_options['fields']['field_accepted']['table'] = 'field_data_field_accepted';
+  $handler->display->display_options['fields']['field_accepted']['field'] = 'field_accepted';
+  $handler->display->display_options['fields']['field_accepted']['alter']['alter_text'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['alter']['make_link'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['alter']['absolute'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['alter']['external'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['alter']['replace_spaces'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['alter']['trim_whitespace'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['alter']['nl2br'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['alter']['word_boundary'] = 1;
+  $handler->display->display_options['fields']['field_accepted']['alter']['ellipsis'] = 1;
+  $handler->display->display_options['fields']['field_accepted']['alter']['strip_tags'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['alter']['trim'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['element_label_colon'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['element_default_classes'] = 1;
+  $handler->display->display_options['fields']['field_accepted']['hide_empty'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['empty_zero'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['hide_alter_empty'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['field_api_classes'] = 0;
+  /* Field: Content: Speakers */
+  $handler->display->display_options['fields']['field_session_speakers']['id'] = 'field_session_speakers';
+  $handler->display->display_options['fields']['field_session_speakers']['table'] = 'field_data_field_session_speakers';
+  $handler->display->display_options['fields']['field_session_speakers']['field'] = 'field_session_speakers';
+  $handler->display->display_options['fields']['field_session_speakers']['label'] = '';
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['alter_text'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['make_link'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['absolute'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['external'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['replace_spaces'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['trim_whitespace'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['nl2br'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['word_boundary'] = 1;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['ellipsis'] = 1;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['more_link'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['strip_tags'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['trim'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['element_label_colon'] = FALSE;
+  $handler->display->display_options['fields']['field_session_speakers']['element_default_classes'] = 1;
+  $handler->display->display_options['fields']['field_session_speakers']['hide_empty'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['empty_zero'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['hide_alter_empty'] = 1;
+  $handler->display->display_options['fields']['field_session_speakers']['settings'] = array(
+    'link' => 0,
+  );
+  $handler->display->display_options['fields']['field_session_speakers']['group_rows'] = 1;
+  $handler->display->display_options['fields']['field_session_speakers']['delta_offset'] = '0';
+  $handler->display->display_options['fields']['field_session_speakers']['delta_reversed'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['delta_first_last'] = 0;
+  $handler->display->display_options['fields']['field_session_speakers']['field_api_classes'] = 0;
+  /* Field: Content: Experience level */
+  $handler->display->display_options['fields']['field_experience']['id'] = 'field_experience';
+  $handler->display->display_options['fields']['field_experience']['table'] = 'field_data_field_experience';
+  $handler->display->display_options['fields']['field_experience']['field'] = 'field_experience';
+  $handler->display->display_options['fields']['field_experience']['alter']['alter_text'] = 0;
+  $handler->display->display_options['fields']['field_experience']['alter']['make_link'] = 0;
+  $handler->display->display_options['fields']['field_experience']['alter']['absolute'] = 0;
+  $handler->display->display_options['fields']['field_experience']['alter']['external'] = 0;
+  $handler->display->display_options['fields']['field_experience']['alter']['replace_spaces'] = 0;
+  $handler->display->display_options['fields']['field_experience']['alter']['trim_whitespace'] = 0;
+  $handler->display->display_options['fields']['field_experience']['alter']['nl2br'] = 0;
+  $handler->display->display_options['fields']['field_experience']['alter']['word_boundary'] = 1;
+  $handler->display->display_options['fields']['field_experience']['alter']['ellipsis'] = 1;
+  $handler->display->display_options['fields']['field_experience']['alter']['strip_tags'] = 0;
+  $handler->display->display_options['fields']['field_experience']['alter']['trim'] = 0;
+  $handler->display->display_options['fields']['field_experience']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['field_experience']['element_label_colon'] = 0;
+  $handler->display->display_options['fields']['field_experience']['element_default_classes'] = 1;
+  $handler->display->display_options['fields']['field_experience']['hide_empty'] = 0;
+  $handler->display->display_options['fields']['field_experience']['empty_zero'] = 0;
+  $handler->display->display_options['fields']['field_experience']['hide_alter_empty'] = 0;
+  $handler->display->display_options['fields']['field_experience']['field_api_classes'] = 0;
+  /* Field: Content: Track */
+  $handler->display->display_options['fields']['field_track']['id'] = 'field_track';
+  $handler->display->display_options['fields']['field_track']['table'] = 'field_data_field_track';
+  $handler->display->display_options['fields']['field_track']['field'] = 'field_track';
+  $handler->display->display_options['fields']['field_track']['alter']['alter_text'] = 0;
+  $handler->display->display_options['fields']['field_track']['alter']['make_link'] = 0;
+  $handler->display->display_options['fields']['field_track']['alter']['absolute'] = 0;
+  $handler->display->display_options['fields']['field_track']['alter']['external'] = 0;
+  $handler->display->display_options['fields']['field_track']['alter']['replace_spaces'] = 0;
+  $handler->display->display_options['fields']['field_track']['alter']['trim_whitespace'] = 0;
+  $handler->display->display_options['fields']['field_track']['alter']['nl2br'] = 0;
+  $handler->display->display_options['fields']['field_track']['alter']['word_boundary'] = 1;
+  $handler->display->display_options['fields']['field_track']['alter']['ellipsis'] = 1;
+  $handler->display->display_options['fields']['field_track']['alter']['strip_tags'] = 0;
+  $handler->display->display_options['fields']['field_track']['alter']['trim'] = 0;
+  $handler->display->display_options['fields']['field_track']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['field_track']['element_label_colon'] = 0;
+  $handler->display->display_options['fields']['field_track']['element_default_classes'] = 1;
+  $handler->display->display_options['fields']['field_track']['hide_empty'] = 0;
+  $handler->display->display_options['fields']['field_track']['empty_zero'] = 0;
+  $handler->display->display_options['fields']['field_track']['hide_alter_empty'] = 0;
+  $handler->display->display_options['fields']['field_track']['field_api_classes'] = 0;
+  /* Field: Node: Edit link */
+  $handler->display->display_options['fields']['edit_node']['id'] = 'edit_node';
+  $handler->display->display_options['fields']['edit_node']['table'] = 'views_entity_node';
+  $handler->display->display_options['fields']['edit_node']['field'] = 'edit_node';
+  $handler->display->display_options['fields']['edit_node']['label'] = '';
+  $handler->display->display_options['fields']['edit_node']['alter']['alter_text'] = 0;
+  $handler->display->display_options['fields']['edit_node']['alter']['make_link'] = 0;
+  $handler->display->display_options['fields']['edit_node']['alter']['absolute'] = 0;
+  $handler->display->display_options['fields']['edit_node']['alter']['external'] = 0;
+  $handler->display->display_options['fields']['edit_node']['alter']['replace_spaces'] = 0;
+  $handler->display->display_options['fields']['edit_node']['alter']['trim_whitespace'] = 0;
+  $handler->display->display_options['fields']['edit_node']['alter']['nl2br'] = 0;
+  $handler->display->display_options['fields']['edit_node']['alter']['word_boundary'] = 1;
+  $handler->display->display_options['fields']['edit_node']['alter']['ellipsis'] = 1;
+  $handler->display->display_options['fields']['edit_node']['alter']['strip_tags'] = 0;
+  $handler->display->display_options['fields']['edit_node']['alter']['trim'] = 0;
+  $handler->display->display_options['fields']['edit_node']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['edit_node']['element_label_colon'] = FALSE;
+  $handler->display->display_options['fields']['edit_node']['element_default_classes'] = 1;
+  $handler->display->display_options['fields']['edit_node']['hide_empty'] = 0;
+  $handler->display->display_options['fields']['edit_node']['empty_zero'] = 0;
+  $handler->display->display_options['fields']['edit_node']['hide_alter_empty'] = 0;
   $handler->display->display_options['defaults']['sorts'] = FALSE;
   /* Sort criterion: Content: Title */
   $handler->display->display_options['sorts']['title']['id'] = 'title';
@@ -1572,18 +1987,12 @@ function cod_session_views_default_views() {
     1 => '1',
   );
   $handler->display->display_options['filters']['field_accepted_value']['group'] = 1;
-  /* Filter criterion: Content: Room (field_session_room) */
+  /* Filter criterion: Broken/missing handler */
   $handler->display->display_options['filters']['field_session_room_nid']['id'] = 'field_session_room_nid';
   $handler->display->display_options['filters']['field_session_room_nid']['table'] = 'field_data_field_session_room';
   $handler->display->display_options['filters']['field_session_room_nid']['field'] = 'field_session_room_nid';
   $handler->display->display_options['filters']['field_session_room_nid']['operator'] = 'empty';
   $handler->display->display_options['filters']['field_session_room_nid']['group'] = 1;
-  /* Filter criterion: Content: Time slot (field_session_slot) */
-  $handler->display->display_options['filters']['field_session_slot_nid']['id'] = 'field_session_slot_nid';
-  $handler->display->display_options['filters']['field_session_slot_nid']['table'] = 'field_data_field_session_slot';
-  $handler->display->display_options['filters']['field_session_slot_nid']['field'] = 'field_session_slot_nid';
-  $handler->display->display_options['filters']['field_session_slot_nid']['operator'] = 'empty';
-  $handler->display->display_options['filters']['field_session_slot_nid']['group'] = 1;
   /* Filter criterion: Content: Track (field_track) */
   $handler->display->display_options['filters']['field_track_value']['id'] = 'field_track_value';
   $handler->display->display_options['filters']['field_track_value']['table'] = 'field_data_field_track';
@@ -1813,7 +2222,7 @@ function cod_session_views_default_views() {
   $handler->display->display_options['filters']['status']['field'] = 'status';
   $handler->display->display_options['filters']['status']['value'] = '1';
   $handler->display->display_options['filters']['status']['group'] = 0;
-  /* Filter criterion: Content: Room (field_session_room) */
+  /* Filter criterion: Broken/missing handler */
   $handler->display->display_options['filters']['field_session_room_nid']['id'] = 'field_session_room_nid';
   $handler->display->display_options['filters']['field_session_room_nid']['table'] = 'field_data_field_session_room';
   $handler->display->display_options['filters']['field_session_room_nid']['field'] = 'field_session_room_nid';
@@ -1823,13 +2232,6 @@ function cod_session_views_default_views() {
   $handler->display->display_options['filters']['field_session_room_nid']['expose']['label'] = 'Room';
   $handler->display->display_options['filters']['field_session_room_nid']['expose']['operator'] = 'field_session_room_nid_op';
   $handler->display->display_options['filters']['field_session_room_nid']['expose']['identifier'] = 'room';
-  $handler->display->display_options['filters']['field_session_room_nid']['expose']['reduce'] = 0;
-  /* Filter criterion: Content: Time slot (field_session_slot) */
-  $handler->display->display_options['filters']['field_session_slot_nid']['id'] = 'field_session_slot_nid';
-  $handler->display->display_options['filters']['field_session_slot_nid']['table'] = 'field_data_field_session_slot';
-  $handler->display->display_options['filters']['field_session_slot_nid']['field'] = 'field_session_slot_nid';
-  $handler->display->display_options['filters']['field_session_slot_nid']['operator'] = 'not empty';
-  $handler->display->display_options['filters']['field_session_slot_nid']['group'] = 0;
   /* Filter criterion: Content: Track (field_track) */
   $handler->display->display_options['filters']['field_track_value']['id'] = 'field_track_value';
   $handler->display->display_options['filters']['field_track_value']['table'] = 'field_data_field_track';
@@ -1989,13 +2391,16 @@ function cod_session_views_default_views() {
   $handler->display->display_options['empty']['area']['content'] = 'There are no speakers in this category.';
   $handler->display->display_options['empty']['area']['format'] = 'filtered_html';
   $handler->display->display_options['empty']['area']['tokenize'] = 0;
-  /* Relationship: Content: Speaker(s) (field_speakers) */
-  $handler->display->display_options['relationships']['field_speakers_uid']['id'] = 'field_speakers_uid';
-  $handler->display->display_options['relationships']['field_speakers_uid']['table'] = 'field_data_field_speakers';
-  $handler->display->display_options['relationships']['field_speakers_uid']['field'] = 'field_speakers_uid';
-  $handler->display->display_options['relationships']['field_speakers_uid']['label'] = 'Speaker(s)';
-  $handler->display->display_options['relationships']['field_speakers_uid']['required'] = 1;
-  $handler->display->display_options['relationships']['field_speakers_uid']['delta'] = '-1';
+  /* Relationship: Content: Author */
+  $handler->display->display_options['relationships']['uid']['id'] = 'uid';
+  $handler->display->display_options['relationships']['uid']['table'] = 'node';
+  $handler->display->display_options['relationships']['uid']['field'] = 'uid';
+  /* Relationship: Entity Reference: Referenced Entity */
+  $handler->display->display_options['relationships']['field_session_speakers_target_id']['id'] = 'field_session_speakers_target_id';
+  $handler->display->display_options['relationships']['field_session_speakers_target_id']['table'] = 'field_data_field_session_speakers';
+  $handler->display->display_options['relationships']['field_session_speakers_target_id']['field'] = 'field_session_speakers_target_id';
+  $handler->display->display_options['relationships']['field_session_speakers_target_id']['label'] = 'speaker(s)';
+  $handler->display->display_options['relationships']['field_session_speakers_target_id']['required'] = 1;
   /* Field: Bulk operations: Content */
   $handler->display->display_options['fields']['views_bulk_operations']['id'] = 'views_bulk_operations';
   $handler->display->display_options['fields']['views_bulk_operations']['table'] = 'node';
@@ -2190,55 +2595,11 @@ function cod_session_views_default_views() {
   $handler->display->display_options['fields']['title']['empty_zero'] = 0;
   $handler->display->display_options['fields']['title']['hide_alter_empty'] = 0;
   $handler->display->display_options['fields']['title']['link_to_node'] = 1;
-  /* Field: User: First name */
-  $handler->display->display_options['fields']['field_profile_first']['id'] = 'field_profile_first';
-  $handler->display->display_options['fields']['field_profile_first']['table'] = 'field_data_field_profile_first';
-  $handler->display->display_options['fields']['field_profile_first']['field'] = 'field_profile_first';
-  $handler->display->display_options['fields']['field_profile_first']['relationship'] = 'field_speakers_uid';
-  $handler->display->display_options['fields']['field_profile_first']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['field_profile_first']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['field_profile_first']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['field_profile_first']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['field_profile_first']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['field_profile_first']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['field_profile_first']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['field_profile_first']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['field_profile_first']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['field_profile_first']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['field_profile_first']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['field_profile_first']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['field_profile_first']['element_label_colon'] = 0;
-  $handler->display->display_options['fields']['field_profile_first']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['field_profile_first']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['field_profile_first']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['field_profile_first']['hide_alter_empty'] = 0;
-  /* Field: User: Last name */
-  $handler->display->display_options['fields']['field_profile_last']['id'] = 'field_profile_last';
-  $handler->display->display_options['fields']['field_profile_last']['table'] = 'field_data_field_profile_last';
-  $handler->display->display_options['fields']['field_profile_last']['field'] = 'field_profile_last';
-  $handler->display->display_options['fields']['field_profile_last']['relationship'] = 'field_speakers_uid';
-  $handler->display->display_options['fields']['field_profile_last']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['field_profile_last']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['field_profile_last']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['field_profile_last']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['field_profile_last']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['field_profile_last']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['field_profile_last']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['field_profile_last']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['field_profile_last']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['field_profile_last']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['field_profile_last']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['field_profile_last']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['field_profile_last']['element_label_colon'] = 0;
-  $handler->display->display_options['fields']['field_profile_last']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['field_profile_last']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['field_profile_last']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['field_profile_last']['hide_alter_empty'] = 0;
   /* Field: User: Name */
   $handler->display->display_options['fields']['name']['id'] = 'name';
   $handler->display->display_options['fields']['name']['table'] = 'users';
   $handler->display->display_options['fields']['name']['field'] = 'name';
-  $handler->display->display_options['fields']['name']['relationship'] = 'field_speakers_uid';
+  $handler->display->display_options['fields']['name']['relationship'] = 'uid';
   $handler->display->display_options['fields']['name']['label'] = 'Username';
   $handler->display->display_options['fields']['name']['alter']['alter_text'] = 0;
   $handler->display->display_options['fields']['name']['alter']['make_link'] = 0;
@@ -2263,7 +2624,7 @@ function cod_session_views_default_views() {
   $handler->display->display_options['fields']['mail']['id'] = 'mail';
   $handler->display->display_options['fields']['mail']['table'] = 'users';
   $handler->display->display_options['fields']['mail']['field'] = 'mail';
-  $handler->display->display_options['fields']['mail']['relationship'] = 'field_speakers_uid';
+  $handler->display->display_options['fields']['mail']['relationship'] = 'uid';
   $handler->display->display_options['fields']['mail']['alter']['alter_text'] = 0;
   $handler->display->display_options['fields']['mail']['alter']['make_link'] = 0;
   $handler->display->display_options['fields']['mail']['alter']['absolute'] = 0;
@@ -2282,33 +2643,6 @@ function cod_session_views_default_views() {
   $handler->display->display_options['fields']['mail']['empty_zero'] = 0;
   $handler->display->display_options['fields']['mail']['hide_alter_empty'] = 0;
   $handler->display->display_options['fields']['mail']['link_to_user'] = 0;
-  /* Field: Content: Speaker(s) */
-  $handler->display->display_options['fields']['field_speakers']['id'] = 'field_speakers';
-  $handler->display->display_options['fields']['field_speakers']['table'] = 'field_data_field_speakers';
-  $handler->display->display_options['fields']['field_speakers']['field'] = 'field_speakers';
-  $handler->display->display_options['fields']['field_speakers']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['field_speakers']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['field_speakers']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['element_label_colon'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['field_speakers']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['hide_alter_empty'] = 1;
-  $handler->display->display_options['fields']['field_speakers']['group_rows'] = 1;
-  $handler->display->display_options['fields']['field_speakers']['delta_limit'] = '5';
-  $handler->display->display_options['fields']['field_speakers']['delta_offset'] = '0';
-  $handler->display->display_options['fields']['field_speakers']['delta_reversed'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['delta_first_last'] = 0;
-  $handler->display->display_options['fields']['field_speakers']['field_api_classes'] = 0;
   /* Filter criterion: Content: Published */
   $handler->display->display_options['filters']['status']['id'] = 'status';
   $handler->display->display_options['filters']['status']['table'] = 'node';
@@ -2492,7 +2826,7 @@ function cod_session_views_default_views() {
   $handler->display->display_options['filters']['field_accepted_value']['value'] = array(
     1 => '1',
   );
-  /* Filter criterion: Content: Room (field_session_room) */
+  /* Filter criterion: Broken/missing handler */
   $handler->display->display_options['filters']['field_session_room_nid']['id'] = 'field_session_room_nid';
   $handler->display->display_options['filters']['field_session_room_nid']['table'] = 'field_data_field_session_room';
   $handler->display->display_options['filters']['field_session_room_nid']['field'] = 'field_session_room_nid';
@@ -2550,12 +2884,12 @@ function cod_session_views_default_views() {
   $handler->display->display_options['filters']['field_accepted_value']['value'] = array(
     1 => '1',
   );
-  /* Filter criterion: Content: Room (field_session_room) */
+  /* Filter criterion: Broken/missing handler */
   $handler->display->display_options['filters']['field_session_room_nid']['id'] = 'field_session_room_nid';
   $handler->display->display_options['filters']['field_session_room_nid']['table'] = 'field_data_field_session_room';
   $handler->display->display_options['filters']['field_session_room_nid']['field'] = 'field_session_room_nid';
   $handler->display->display_options['filters']['field_session_room_nid']['operator'] = 'not empty';
-  /* Filter criterion: Content: Time slot (field_session_slot) */
+  /* Filter criterion: Broken/missing handler */
   $handler->display->display_options['filters']['field_session_slot_nid']['id'] = 'field_session_slot_nid';
   $handler->display->display_options['filters']['field_session_slot_nid']['table'] = 'field_data_field_session_slot';
   $handler->display->display_options['filters']['field_session_slot_nid']['field'] = 'field_session_slot_nid';
@@ -2582,13 +2916,6 @@ function cod_session_views_default_views() {
   $handler->display->display_options['header']['area']['format'] = 'full_html';
   $handler->display->display_options['header']['area']['tokenize'] = 0;
   $handler->display->display_options['defaults']['relationships'] = FALSE;
-  /* Relationship: Content: Speaker(s) (field_speakers) */
-  $handler->display->display_options['relationships']['field_speakers_uid']['id'] = 'field_speakers_uid';
-  $handler->display->display_options['relationships']['field_speakers_uid']['table'] = 'field_data_field_speakers';
-  $handler->display->display_options['relationships']['field_speakers_uid']['field'] = 'field_speakers_uid';
-  $handler->display->display_options['relationships']['field_speakers_uid']['label'] = 'Speaker(s)';
-  $handler->display->display_options['relationships']['field_speakers_uid']['required'] = 1;
-  $handler->display->display_options['relationships']['field_speakers_uid']['delta'] = '-1';
   /* Relationship: Flags: session_confirm */
   $handler->display->display_options['relationships']['flag_content_rel']['id'] = 'flag_content_rel';
   $handler->display->display_options['relationships']['flag_content_rel']['table'] = 'node';
@@ -2597,6 +2924,12 @@ function cod_session_views_default_views() {
   $handler->display->display_options['relationships']['flag_content_rel']['required'] = 0;
   $handler->display->display_options['relationships']['flag_content_rel']['flag'] = 'session_confirm';
   $handler->display->display_options['relationships']['flag_content_rel']['user_scope'] = 'any';
+  /* Relationship: Entity Reference: Referenced Entity */
+  $handler->display->display_options['relationships']['field_session_speakers_target_id']['id'] = 'field_session_speakers_target_id';
+  $handler->display->display_options['relationships']['field_session_speakers_target_id']['table'] = 'field_data_field_session_speakers';
+  $handler->display->display_options['relationships']['field_session_speakers_target_id']['field'] = 'field_session_speakers_target_id';
+  $handler->display->display_options['relationships']['field_session_speakers_target_id']['label'] = 'speaker(s)';
+  $handler->display->display_options['relationships']['field_session_speakers_target_id']['required'] = 1;
   $handler->display->display_options['defaults']['filters'] = FALSE;
   /* Filter criterion: Content: Published */
   $handler->display->display_options['filters']['status']['id'] = 'status';
@@ -2619,7 +2952,7 @@ function cod_session_views_default_views() {
   $handler->display->display_options['filters']['field_accepted_value']['value'] = array(
     1 => '1',
   );
-  /* Filter criterion: Content: Room (field_session_room) */
+  /* Filter criterion: Broken/missing handler */
   $handler->display->display_options['filters']['field_session_room_nid']['id'] = 'field_session_room_nid';
   $handler->display->display_options['filters']['field_session_room_nid']['table'] = 'field_data_field_session_room';
   $handler->display->display_options['filters']['field_session_room_nid']['field'] = 'field_session_room_nid';
@@ -2631,7 +2964,7 @@ function cod_session_views_default_views() {
   $handler->display->display_options['filters']['flagged']['field'] = 'flagged';
   $handler->display->display_options['filters']['flagged']['relationship'] = 'flag_content_rel';
   $handler->display->display_options['filters']['flagged']['value'] = '0';
-  /* Filter criterion: Content: Time slot (field_session_slot) */
+  /* Filter criterion: Broken/missing handler */
   $handler->display->display_options['filters']['field_session_slot_nid']['id'] = 'field_session_slot_nid';
   $handler->display->display_options['filters']['field_session_slot_nid']['table'] = 'field_data_field_session_slot';
   $handler->display->display_options['filters']['field_session_slot_nid']['field'] = 'field_session_slot_nid';
@@ -2668,13 +3001,6 @@ function cod_session_views_default_views() {
   $handler->display->display_options['empty']['area']['format'] = 'filtered_html';
   $handler->display->display_options['empty']['area']['tokenize'] = 0;
   $handler->display->display_options['defaults']['relationships'] = FALSE;
-  /* Relationship: Content: Speaker(s) (field_speakers) */
-  $handler->display->display_options['relationships']['field_speakers_uid']['id'] = 'field_speakers_uid';
-  $handler->display->display_options['relationships']['field_speakers_uid']['table'] = 'field_data_field_speakers';
-  $handler->display->display_options['relationships']['field_speakers_uid']['field'] = 'field_speakers_uid';
-  $handler->display->display_options['relationships']['field_speakers_uid']['label'] = 'Speaker(s)';
-  $handler->display->display_options['relationships']['field_speakers_uid']['required'] = 1;
-  $handler->display->display_options['relationships']['field_speakers_uid']['delta'] = '-1';
   /* Relationship: Flags: session_confirm */
   $handler->display->display_options['relationships']['flag_content_rel']['id'] = 'flag_content_rel';
   $handler->display->display_options['relationships']['flag_content_rel']['table'] = 'node';
@@ -2682,6 +3008,12 @@ function cod_session_views_default_views() {
   $handler->display->display_options['relationships']['flag_content_rel']['label'] = 'session_confirm';
   $handler->display->display_options['relationships']['flag_content_rel']['flag'] = 'session_confirm';
   $handler->display->display_options['relationships']['flag_content_rel']['user_scope'] = 'any';
+  /* Relationship: Entity Reference: Referenced Entity */
+  $handler->display->display_options['relationships']['field_session_speakers_target_id']['id'] = 'field_session_speakers_target_id';
+  $handler->display->display_options['relationships']['field_session_speakers_target_id']['table'] = 'field_data_field_session_speakers';
+  $handler->display->display_options['relationships']['field_session_speakers_target_id']['field'] = 'field_session_speakers_target_id';
+  $handler->display->display_options['relationships']['field_session_speakers_target_id']['label'] = 'speaker(s)';
+  $handler->display->display_options['relationships']['field_session_speakers_target_id']['required'] = 1;
   $handler->display->display_options['defaults']['filters'] = FALSE;
   /* Filter criterion: Content: Published */
   $handler->display->display_options['filters']['status']['id'] = 'status';
@@ -2706,16 +3038,11 @@ function cod_session_views_default_views() {
     1 => '1',
   );
   $handler->display->display_options['filters']['field_accepted_value']['group'] = 0;
-  /* Filter criterion: Content: Room (field_session_room) */
+  /* Filter criterion: Broken/missing handler */
   $handler->display->display_options['filters']['field_session_room_nid']['id'] = 'field_session_room_nid';
   $handler->display->display_options['filters']['field_session_room_nid']['table'] = 'field_data_field_session_room';
   $handler->display->display_options['filters']['field_session_room_nid']['field'] = 'field_session_room_nid';
   $handler->display->display_options['filters']['field_session_room_nid']['operator'] = 'not empty';
-  /* Filter criterion: Content: Time slot (field_session_slot) */
-  $handler->display->display_options['filters']['field_session_slot_nid']['id'] = 'field_session_slot_nid';
-  $handler->display->display_options['filters']['field_session_slot_nid']['table'] = 'field_data_field_session_slot';
-  $handler->display->display_options['filters']['field_session_slot_nid']['field'] = 'field_session_slot_nid';
-  $handler->display->display_options['filters']['field_session_slot_nid']['operator'] = 'not empty';
   $handler->display->display_options['path'] = 'conference-admin/contact-speakers/confirmed';
   $handler->display->display_options['menu']['type'] = 'tab';
   $handler->display->display_options['menu']['title'] = 'Confirmed';
@@ -2800,28 +3127,32 @@ function cod_session_views_default_views() {
   $handler->display->display_options['fields']['title']['empty_zero'] = 0;
   $handler->display->display_options['fields']['title']['link_to_node'] = 1;
   /* Field: Content: Time slot */
-  $handler->display->display_options['fields']['field_session_slot']['id'] = 'field_session_slot';
-  $handler->display->display_options['fields']['field_session_slot']['table'] = 'field_data_field_session_slot';
-  $handler->display->display_options['fields']['field_session_slot']['field'] = 'field_session_slot';
-  $handler->display->display_options['fields']['field_session_slot']['label'] = 'Session date & time';
-  $handler->display->display_options['fields']['field_session_slot']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['field_session_slot']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['field_session_slot']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['field_session_slot']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['field_session_slot']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['field_session_slot']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['field_session_slot']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['field_session_slot']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['field_session_slot']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['field_session_slot']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['field_session_slot']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['field_session_slot']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['field_session_slot']['element_label_colon'] = 0;
-  $handler->display->display_options['fields']['field_session_slot']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['field_session_slot']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['field_session_slot']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['field_session_slot']['hide_alter_empty'] = 1;
-  $handler->display->display_options['fields']['field_session_slot']['field_api_classes'] = 0;
+  $handler->display->display_options['fields']['field_session_time_slot']['id'] = 'field_session_time_slot';
+  $handler->display->display_options['fields']['field_session_time_slot']['table'] = 'field_data_field_session_time_slot';
+  $handler->display->display_options['fields']['field_session_time_slot']['field'] = 'field_session_time_slot';
+  $handler->display->display_options['fields']['field_session_time_slot']['label'] = '';
+  $handler->display->display_options['fields']['field_session_time_slot']['alter']['alter_text'] = 0;
+  $handler->display->display_options['fields']['field_session_time_slot']['alter']['make_link'] = 0;
+  $handler->display->display_options['fields']['field_session_time_slot']['alter']['absolute'] = 0;
+  $handler->display->display_options['fields']['field_session_time_slot']['alter']['external'] = 0;
+  $handler->display->display_options['fields']['field_session_time_slot']['alter']['replace_spaces'] = 0;
+  $handler->display->display_options['fields']['field_session_time_slot']['alter']['trim_whitespace'] = 0;
+  $handler->display->display_options['fields']['field_session_time_slot']['alter']['nl2br'] = 0;
+  $handler->display->display_options['fields']['field_session_time_slot']['alter']['word_boundary'] = 1;
+  $handler->display->display_options['fields']['field_session_time_slot']['alter']['ellipsis'] = 1;
+  $handler->display->display_options['fields']['field_session_time_slot']['alter']['more_link'] = 0;
+  $handler->display->display_options['fields']['field_session_time_slot']['alter']['strip_tags'] = 0;
+  $handler->display->display_options['fields']['field_session_time_slot']['alter']['trim'] = 0;
+  $handler->display->display_options['fields']['field_session_time_slot']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['field_session_time_slot']['element_label_colon'] = FALSE;
+  $handler->display->display_options['fields']['field_session_time_slot']['element_default_classes'] = 1;
+  $handler->display->display_options['fields']['field_session_time_slot']['hide_empty'] = 0;
+  $handler->display->display_options['fields']['field_session_time_slot']['empty_zero'] = 0;
+  $handler->display->display_options['fields']['field_session_time_slot']['hide_alter_empty'] = 1;
+  $handler->display->display_options['fields']['field_session_time_slot']['settings'] = array(
+    'link' => 0,
+  );
+  $handler->display->display_options['fields']['field_session_time_slot']['field_api_classes'] = 0;
   /* Field: Flags: Flag link */
   $handler->display->display_options['fields']['ops']['id'] = 'ops';
   $handler->display->display_options['fields']['ops']['table'] = 'flag_content';
@@ -2846,22 +3177,12 @@ function cod_session_views_default_views() {
   $handler->display->display_options['fields']['ops']['hide_empty'] = 0;
   $handler->display->display_options['fields']['ops']['empty_zero'] = 0;
   $handler->display->display_options['fields']['ops']['hide_alter_empty'] = 0;
-  /* Contextual filter: Content: Speaker(s) (field_speakers) */
-  $handler->display->display_options['arguments']['field_speakers_uid']['id'] = 'field_speakers_uid';
-  $handler->display->display_options['arguments']['field_speakers_uid']['table'] = 'field_data_field_speakers';
-  $handler->display->display_options['arguments']['field_speakers_uid']['field'] = 'field_speakers_uid';
-  $handler->display->display_options['arguments']['field_speakers_uid']['default_action'] = 'default';
-  $handler->display->display_options['arguments']['field_speakers_uid']['default_argument_type'] = 'current_user';
-  $handler->display->display_options['arguments']['field_speakers_uid']['default_argument_skip_url'] = 0;
-  $handler->display->display_options['arguments']['field_speakers_uid']['summary']['number_of_records'] = '0';
-  $handler->display->display_options['arguments']['field_speakers_uid']['summary']['format'] = 'default_summary';
-  $handler->display->display_options['arguments']['field_speakers_uid']['summary_options']['items_per_page'] = '25';
-  $handler->display->display_options['arguments']['field_speakers_uid']['specify_validation'] = 1;
-  $handler->display->display_options['arguments']['field_speakers_uid']['validate']['type'] = 'user';
-  $handler->display->display_options['arguments']['field_speakers_uid']['validate_options']['type'] = 'either';
-  $handler->display->display_options['arguments']['field_speakers_uid']['validate_options']['restrict_roles'] = 0;
-  $handler->display->display_options['arguments']['field_speakers_uid']['break_phrase'] = 0;
-  $handler->display->display_options['arguments']['field_speakers_uid']['not'] = 0;
+  /* Contextual filter: Content: Speakers (field_session_speakers) */
+  $handler->display->display_options['arguments']['field_session_speakers_target_id']['id'] = 'field_session_speakers_target_id';
+  $handler->display->display_options['arguments']['field_session_speakers_target_id']['table'] = 'field_data_field_session_speakers';
+  $handler->display->display_options['arguments']['field_session_speakers_target_id']['field'] = 'field_session_speakers_target_id';
+  $handler->display->display_options['arguments']['field_session_speakers_target_id']['default_argument_type'] = 'fixed';
+  $handler->display->display_options['arguments']['field_session_speakers_target_id']['summary']['format'] = 'default_summary';
   $handler->display->display_options['filter_groups']['groups'] = array(
     1 => 'AND',
     2 => 'AND',
@@ -2875,17 +3196,15 @@ function cod_session_views_default_views() {
   );
   $handler->display->display_options['filters']['field_accepted_value']['group'] = 1;
   /* Filter criterion: Content: Room (field_session_room) */
-  $handler->display->display_options['filters']['field_session_room_nid']['id'] = 'field_session_room_nid';
-  $handler->display->display_options['filters']['field_session_room_nid']['table'] = 'field_data_field_session_room';
-  $handler->display->display_options['filters']['field_session_room_nid']['field'] = 'field_session_room_nid';
-  $handler->display->display_options['filters']['field_session_room_nid']['operator'] = 'not empty';
-  $handler->display->display_options['filters']['field_session_room_nid']['group'] = 1;
-  /* Filter criterion: Content: Time slot (field_session_slot) */
-  $handler->display->display_options['filters']['field_session_slot_nid']['id'] = 'field_session_slot_nid';
-  $handler->display->display_options['filters']['field_session_slot_nid']['table'] = 'field_data_field_session_slot';
-  $handler->display->display_options['filters']['field_session_slot_nid']['field'] = 'field_session_slot_nid';
-  $handler->display->display_options['filters']['field_session_slot_nid']['operator'] = 'not empty';
-  $handler->display->display_options['filters']['field_session_slot_nid']['group'] = 1;
+  $handler->display->display_options['filters']['field_session_room_target_id']['id'] = 'field_session_room_target_id';
+  $handler->display->display_options['filters']['field_session_room_target_id']['table'] = 'field_data_field_session_room';
+  $handler->display->display_options['filters']['field_session_room_target_id']['field'] = 'field_session_room_target_id';
+  $handler->display->display_options['filters']['field_session_room_target_id']['operator'] = 'not empty';
+  /* Filter criterion: Content: Time slot (field_session_time_slot) */
+  $handler->display->display_options['filters']['field_session_time_slot_target_id']['id'] = 'field_session_time_slot_target_id';
+  $handler->display->display_options['filters']['field_session_time_slot_target_id']['table'] = 'field_data_field_session_time_slot';
+  $handler->display->display_options['filters']['field_session_time_slot_target_id']['field'] = 'field_session_time_slot_target_id';
+  $handler->display->display_options['filters']['field_session_time_slot_target_id']['operator'] = 'not empty';
 
   /* Display: Content pane */
   $handler = $view->new_display('panel_pane', 'Content pane', 'panel_pane_1');
