diff --git a/cod_session/cod-session-schedule.tpl.php b/cod_session/cod-session-schedule.tpl.php
index b13856f29be2225794ddf6a810d26dc875b374f2..0250203ac46e752918c579b64d0c91ba4966befa 100644
--- a/cod_session/cod-session-schedule.tpl.php
+++ b/cod_session/cod-session-schedule.tpl.php
@@ -1,66 +1,104 @@
 <?php if(!empty($days) && !empty($rooms) && !empty($arranged_slots)): ?>
-<?php if (!empty($day_links)): ?>
-<ul>
-<?php foreach ($day_links as $link): ?>
-<li><?php print $link; ?></li>
-<?php endforeach ?>
-</ul>
-<?php endif ?>
 <?php foreach ($days as $day_key => $day_title): ?>
+  <div class="session-day" id="sessions-<?php print $day_key; ?>">
   <h2><?php print $day_title; ?></h2>
-  <table class="session-calendar">
-    <tr>
-      <th><?php print t('Time'); ?></th>
-      <?php foreach ($rooms as $room_nid => $room): ?>
-      <?php if ($show_rooms[$day_key][$room_nid]): ?>
-        <th><span class="room-label"><?php print $room['title']; ?></span><?php if(!empty($room['sponsor'])): ?><div class="sponsor-label"><?php print $room['sponsor']; ?></div><?php endif; ?></th>
-      <?php endif; ?>
-      <?php endforeach ?>
-    </tr>
-    <?php foreach ($arranged_slots[$day_key] as $slot): ?>
-    <tr class="<?php print $zebra = $zebra == 'even' ? 'odd':'even'; ?> <?php print $slot['class']; ?>">
+  <?php if ($schedule_display == 0): ?>
+    <table class="session-calendar multi-column-schedule">
+      <?php foreach ($arranged_slots[$day_key] as $slot): ?>
+      <tr class="<?php print $zebra = $zebra == 'even' ? 'odd':'even'; ?> <?php print $slot['class']; ?>">
         <td class="time-label">
           <?php print $slot['start']; ?>&nbsp;-<br /><?php print $slot['end']; ?>
         </td>
-        <?php foreach ($room_nids as $room_nid): ?>
-          <?php if (!empty($schedule_grid[$day_key][$slot['nid']][$room_nid])): ?>
-            <?php // Are there scheduled items to print in this cell?
-            if (!empty($schedule_grid[$day_key][$slot['nid']][$room_nid]['sessions'])): ?>
-              <td class="session occupied<?php print $schedule_grid[$day_key][$slot['nid']][$room_nid]['class']; ?>" colspan="<?php print $schedule_grid[$day_key][$slot['nid']][$room_nid]['colspan']; ?>">
-              <?php foreach($schedule_grid[$day_key][$slot['nid']][$room_nid]['sessions'] as $session): ?>
-                <div class="views-item type-<?php print check_plain($session['session']->type); ?>">
-                <?php print $view_results[$session['session']->nid]; ?>
-                </div>
-              <?php endforeach ?>
-              <?php // Room availability if set.
-              if (isset($schedule_grid[$day_key][$slot['nid']][$room_nid]['availability'])): ?>
-                <div><?php print $schedule_grid[$day_key][$slot['nid']][$room_nid]['availability']; ?></div>
-              <?php endif ?>
-              <?php // Cell call-to-action if set.
-              if (isset($schedule_grid[$day_key][$slot['nid']][$room_nid]['cta'])): ?>
-                <div><?php print $schedule_grid[$day_key][$slot['nid']][$room_nid]['cta']; ?></div>
-              <?php endif ?>
-            <?php // Print a cell if it's not being spanned.
-            elseif (!$schedule_grid[$day_key][$slot['nid']][$room_nid]['spanned'] && $show_rooms[$day_key][$room_nid]): ?>
-              <td class="session empty">&nbsp;
-              <?php // Room availability if set.
-              if (isset($schedule_grid[$day_key][$slot['nid']][$room_nid]['availability'])): ?>
-                <div><?php print $schedule_grid[$day_key][$slot['nid']][$room_nid]['availability']; ?></div>
-              <?php endif ?>
-              <?php // Cell call-to-action if set.
-              if (isset($schedule_grid[$day_key][$slot['nid']][$room_nid]['cta'])): ?>
-                <div><?php print $schedule_grid[$day_key][$slot['nid']][$room_nid]['cta']; ?></div>
-              <?php endif ?>
+        <td>
+        <?php foreach($schedule_grid[$day_key][$slot['nid']] as $room_key => $schedule_room): ?>
+          <?php if (!empty($schedule_room['sessions'])): ?>
+          <div class="schedule-room-<?php print $room_key; ?> <?php print $schedule_room['class']; ?>">
+            <?php foreach($schedule_room['sessions'] as $session): ?>
+              <div class="views-item type-<?php print check_plain($session['session']->type); ?>">
+              <?php print $view_results[$session['session']->nid]; ?>
+              </div>
+            <?php endforeach; ?>
+            <?php // Room availability if set.
+            if (isset($schedule_grid[$day_key][$slot['nid']][$room_key]['availability'])): ?>
+              <div><?php print $schedule_grid[$day_key][$slot['nid']][$room_key]['availability']; ?></div>
+            <?php endif ?>
+            <?php // Schedule call-to-action if set.
+            if (isset($schedule_grid[$day_key][$slot['nid']][$room_key]['cta'])): ?>
+              <div><?php print $schedule_grid[$day_key][$slot['nid']][$room_key]['cta']; ?></div>
             <?php endif ?>
-
-            <?php // Only end the table cell if there were items or spanning.
-            if (!empty($schedule_grid[$day_key][$slot['nid']][$room_nid]['sessions']) || !$schedule_grid[$day_key][$slot['nid']][$room_nid]['spanned']): ?>
-              </td>
+          </div>
+          <?php elseif (!$schedule_grid[$day_key][$slot['nid']][$room_key]['spanned'] && $show_rooms[$day_key][$room_key]): ?>
+            <?php // Room availability if set.
+            if (isset($schedule_grid[$day_key][$slot['nid']][$room_key]['availability'])): ?>
+              <div><?php print $schedule_grid[$day_key][$slot['nid']][$room_key]['availability']; ?></div>
             <?php endif ?>
-          <?php endif ?>
+            <?php // Schedule call-to-action if set.
+            if (isset($schedule_grid[$day_key][$slot['nid']][$room_key]['cta'])): ?>
+              <div><?php print $schedule_grid[$day_key][$slot['nid']][$room_key]['cta']; ?></div>
+            <?php endif ?>
+          <?php endif; ?>
+          <div class="schedule-room-title"><?php print $rooms[$room_key]['title']; ?></div>
+        <?php endforeach ?>
+        </td>
+      </tr>
+      <?php endforeach; ?>
+    </table>
+  <?php endif; ?>
+  <?php if ($schedule_display == 1): ?>
+    <table class="session-calendar multi-column-schedule">
+      <tr>
+        <th><?php print t('Time'); ?></th>
+        <?php foreach ($rooms as $room_nid => $room): ?>
+        <?php if ($show_rooms[$day_key][$room_nid]): ?>
+          <th><span class="room-label"><?php print $room['title']; ?></span><?php if(!empty($room['sponsor'])): ?><div class="sponsor-label"><?php print $room['sponsor']; ?></div><?php endif; ?></th>
+        <?php endif; ?>
         <?php endforeach ?>
-    </tr>
-    <?php endforeach ?>
-  </table>
+      </tr>
+      <?php foreach ($arranged_slots[$day_key] as $slot): ?>
+      <tr class="<?php print $zebra = $zebra == 'even' ? 'odd':'even'; ?> <?php print $slot['class']; ?>">
+          <td class="time-label">
+            <?php print $slot['start']; ?>&nbsp;-<br /><?php print $slot['end']; ?>
+          </td>
+          <?php foreach ($room_nids as $room_nid): ?>
+            <?php if (!empty($schedule_grid[$day_key][$slot['nid']][$room_nid])): ?>
+              <?php // Are there scheduled items to print in this cell?
+              if (!empty($schedule_grid[$day_key][$slot['nid']][$room_nid]['sessions'])): ?>
+                <td class="session occupied<?php print $schedule_grid[$day_key][$slot['nid']][$room_nid]['class']; ?>" colspan="<?php print $schedule_grid[$day_key][$slot['nid']][$room_nid]['colspan']; ?>">
+                <?php foreach($schedule_grid[$day_key][$slot['nid']][$room_nid]['sessions'] as $session): ?>
+                  <div class="views-item type-<?php print check_plain($session['session']->type); ?>">
+                  <?php print $view_results[$session['session']->nid]; ?>
+                  </div>
+                <?php endforeach ?>
+                <?php // Room availability if set.
+                if (isset($schedule_grid[$day_key][$slot['nid']][$room_nid]['availability'])): ?>
+                  <div><?php print $schedule_grid[$day_key][$slot['nid']][$room_nid]['availability']; ?></div>
+                <?php endif ?>
+                <?php // Cell call-to-action if set.
+                if (isset($schedule_grid[$day_key][$slot['nid']][$room_nid]['cta'])): ?>
+                  <div><?php print $schedule_grid[$day_key][$slot['nid']][$room_nid]['cta']; ?></div>
+                <?php endif ?>
+              <?php // Print a cell if it's not being spanned.
+              elseif (!$schedule_grid[$day_key][$slot['nid']][$room_nid]['spanned'] && $show_rooms[$day_key][$room_nid]): ?>
+                <td class="session empty">&nbsp;
+                <?php // Room availability if set.
+                if (isset($schedule_grid[$day_key][$slot['nid']][$room_nid]['availability'])): ?>
+                  <div><?php print $schedule_grid[$day_key][$slot['nid']][$room_nid]['availability']; ?></div>
+                <?php endif ?>
+                <?php // Cell call-to-action if set.
+                if (isset($schedule_grid[$day_key][$slot['nid']][$room_nid]['cta'])): ?>
+                  <div><?php print $schedule_grid[$day_key][$slot['nid']][$room_nid]['cta']; ?></div>
+                <?php endif ?>
+              <?php endif ?>
+              <?php // Only end the table cell if there were items or spanning.
+              if (!empty($schedule_grid[$day_key][$slot['nid']][$room_nid]['sessions']) || !$schedule_grid[$day_key][$slot['nid']][$room_nid]['spanned']): ?>
+                </td>
+              <?php endif ?>
+            <?php endif ?>
+          <?php endforeach ?>
+      </tr>
+      <?php endforeach ?>
+    </table>
+  <?php endif; ?>
+  </div>
 <?php endforeach ?>
 <?php endif ?>
diff --git a/cod_session/cod_session.features.field.inc b/cod_session/cod_session.features.field.inc
index afa53f6146442c4e4a9b6fb56d61ba46dc2e1fc8..5ab305df3b228a4682a5ce20e90bdf5322ae0f00 100644
--- a/cod_session/cod_session.features.field.inc
+++ b/cod_session/cod_session.features.field.inc
@@ -186,38 +186,33 @@ function cod_session_field_default_fields() {
       'deleted' => '0',
       'entity_types' => array(),
       'field_name' => 'field_room_capacity',
-      'foreign keys' => array(
-        'format' => array(
-          'columns' => array(
-            'format' => 'format',
-          ),
-          'table' => 'filter_format',
-        ),
-      ),
-      'indexes' => array(
-        'format' => array(
-          0 => 'format',
-        ),
-      ),
-      'module' => 'text',
-      'settings' => array(
-        'max_length' => '60',
+      'field_permissions' => array(
+        'type' => '0',
       ),
-      'translatable' => '1',
-      'type' => 'text',
+      'foreign keys' => array(),
+      'indexes' => array(),
+      'module' => 'number',
+      'settings' => array(),
+      'translatable' => '0',
+      'type' => 'number_integer',
     ),
     'field_instance' => array(
       'bundle' => 'room',
       'default_value' => NULL,
       'deleted' => '0',
-      'description' => 'How many people does this space hold?',
+      'description' => 'Total capacity of the room, in persons.',
       'display' => array(
         'default' => array(
-          'label' => 'inline',
-          'module' => 'text',
-          'settings' => array(),
-          'type' => 'text_default',
-          'weight' => '0',
+          'label' => 'above',
+          'module' => 'number',
+          'settings' => array(
+            'decimal_separator' => '.',
+            'prefix_suffix' => TRUE,
+            'scale' => 0,
+            'thousand_separator' => ' ',
+          ),
+          'type' => 'number_integer',
+          'weight' => '1',
         ),
         'teaser' => array(
           'label' => 'above',
@@ -228,20 +223,21 @@ function cod_session_field_default_fields() {
       ),
       'entity_type' => 'node',
       'field_name' => 'field_room_capacity',
-      'label' => 'Capacity',
+      'label' => 'Total room capacity',
       'required' => 0,
       'settings' => array(
-        'text_processing' => '0',
+        'max' => '',
+        'min' => '',
+        'prefix' => '',
+        'suffix' => '',
         'user_register_form' => FALSE,
       ),
       'widget' => array(
-        'active' => 1,
-        'module' => 'text',
-        'settings' => array(
-          'size' => '60',
-        ),
-        'type' => 'text_textfield',
-        'weight' => '1',
+        'active' => 0,
+        'module' => 'number',
+        'settings' => array(),
+        'type' => 'number',
+        'weight' => '2',
       ),
     ),
   );
@@ -549,7 +545,7 @@ function cod_session_field_default_fields() {
   $fields['node-schedule_item-field_session_room'] = array(
     'field_config' => array(
       'active' => '1',
-      'cardinality' => '-1',
+      'cardinality' => '1',
       'deleted' => '0',
       'entity_types' => array(),
       'field_name' => 'field_session_room',
@@ -557,57 +553,58 @@ function cod_session_field_default_fields() {
         'type' => '2',
       ),
       'foreign keys' => array(
-        'nid' => array(
+        'node' => array(
           'columns' => array(
-            'nid' => 'nid',
+            'target_id' => 'nid',
           ),
           'table' => 'node',
         ),
       ),
       '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' => 8,
         ),
         'teaser' => array(
           'label' => 'above',
@@ -628,12 +625,12 @@ function cod_session_field_default_fields() {
         'module' => 'options',
         'settings' => array(),
         'type' => 'options_buttons',
-        'weight' => '5',
+        'weight' => '9',
       ),
     ),
   );
 
-  // Exported field: 'node-schedule_item-field_session_slot'
+  // Exported field: 'node-schedule_item-field_session_slot'.
   $fields['node-schedule_item-field_session_slot'] = array(
     'field_config' => array(
       'active' => '1',
@@ -645,44 +642,43 @@ function cod_session_field_default_fields() {
         'type' => '2',
       ),
       'foreign keys' => array(
-        'nid' => array(
+        'node' => array(
           'columns' => array(
-            'nid' => 'nid',
+            'target_id' => 'nid',
           ),
           'table' => 'node',
         ),
       ),
       '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 +687,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' => 7,
         ),
         'teaser' => array(
           'label' => 'above',
@@ -706,7 +704,7 @@ function cod_session_field_default_fields() {
       ),
       'entity_type' => 'node',
       'field_name' => 'field_session_slot',
-      'label' => 'Time slot',
+      'label' => 'Time Slot',
       'required' => 0,
       'settings' => array(
         'user_register_form' => FALSE,
@@ -716,12 +714,12 @@ function cod_session_field_default_fields() {
         'module' => 'options',
         'settings' => array(),
         'type' => 'options_select',
-        'weight' => '4',
+        'weight' => '8',
       ),
     ),
   );
 
-  // Exported field: 'node-session-body'
+  // Exported field: 'node-session-body'.
   $fields['node-session-body'] = array(
     'field_config' => array(
       'active' => '1',
@@ -806,7 +804,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',
@@ -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',
@@ -956,11 +954,11 @@ 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',
@@ -968,44 +966,43 @@ function cod_session_field_default_fields() {
         'type' => '2',
       ),
       'foreign keys' => array(
-        'nid' => array(
+        'node' => array(
           'columns' => array(
-            'nid' => 'nid',
+            'target_id' => 'nid',
           ),
           'table' => 'node',
         ),
       ),
       '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',
@@ -1014,11 +1011,13 @@ function cod_session_field_default_fields() {
       'description' => 'Select room(s) in which the session occurs.',
       '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' => 11,
         ),
         'teaser' => array(
           'label' => 'above',
@@ -1039,12 +1038,12 @@ function cod_session_field_default_fields() {
         'module' => 'options',
         'settings' => array(),
         'type' => 'options_buttons',
-        'weight' => '7',
+        'weight' => '10',
       ),
     ),
   );
 
-  // Exported field: 'node-session-field_session_slot'
+  // Exported field: 'node-session-field_session_slot'.
   $fields['node-session-field_session_slot'] = array(
     'field_config' => array(
       'active' => '1',
@@ -1056,44 +1055,43 @@ function cod_session_field_default_fields() {
         'type' => '2',
       ),
       'foreign keys' => array(
-        'nid' => array(
+        'node' => array(
           'columns' => array(
-            'nid' => 'nid',
+            'target_id' => 'nid',
           ),
           'table' => 'node',
         ),
       ),
       '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' => 'session',
@@ -1102,11 +1100,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' => 10,
         ),
         'teaser' => array(
           'label' => 'above',
@@ -1127,59 +1127,73 @@ function cod_session_field_default_fields() {
         'module' => 'options',
         'settings' => array(),
         'type' => 'options_select',
-        'weight' => '6',
+        'weight' => '9',
       ),
     ),
   );
 
-  // Exported field: 'node-session-field_slides'
-  $fields['node-session-field_slides'] = array(
+  // Exported field: 'node-session-field_session_speakers'.
+  $fields['node-session-field_speakers'] = array(
     'field_config' => array(
       'active' => '1',
       'cardinality' => '-1',
       'deleted' => '0',
       'entity_types' => array(),
-      'field_name' => 'field_slides',
+      'field_name' => 'field_speakers',
+      'field_permissions' => array(
+        'type' => '0',
+      ),
       'foreign keys' => array(
-        'fid' => array(
+        'users' => array(
           'columns' => array(
-            'fid' => 'fid',
+            'target_id' => 'uid',
           ),
-          'table' => 'file_managed',
+          'table' => 'users',
         ),
       ),
       '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' => 'field_profile_first:value',
+            'property' => 'uid',
+            'type' => 'none',
+          ),
+          'target_bundles' => array(),
         ),
-        'uri_scheme' => 'public',
+        'handler_submit' => 'Change handler',
+        'target_type' => 'user',
       ),
-      '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 +1203,52 @@ function cod_session_field_default_fields() {
         ),
       ),
       'entity_type' => 'node',
-      'field_name' => 'field_slides',
-      'label' => 'Slides',
-      'required' => 0,
+      'field_name' => 'field_speakers',
+      'label' => 'Speaker(s)',
+      'required' => 1,
       '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',
+        'module' => 'entityreference',
         'settings' => array(
-          'progress_indicator' => 'throbber',
+          'match_operator' => 'CONTAINS',
+          'path' => '',
+          'size' => '60',
         ),
-        'type' => 'file_generic',
-        'weight' => '3',
+        'type' => 'entityreference_autocomplete_tags',
+        'weight' => '1',
       ),
     ),
   );
 
-  // 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 +1256,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 +1281,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 +1317,7 @@ function cod_session_field_default_fields() {
           0 => 'value',
         ),
       ),
+      'locked' => '0',
       'module' => 'list',
       'settings' => array(
         'allowed_values' => array(
@@ -1371,7 +1374,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 +1384,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(
@@ -1501,6 +1505,7 @@ function cod_session_field_default_fields() {
   t('Slides');
   t('Speaker(s)');
   t('Status');
+  t('Time Slot');
   t('Time slot');
   t('Track');
   t('Upload your slides here as a PDF, or link to them from the description. (This is typically done after your session.)');
diff --git a/cod_session/cod_session.features.inc b/cod_session/cod_session.features.inc
index 0b2b934701e753edf74f0c7e1e89feb9bb188cf8..1f039302ee6e84413081e4ed24ad242ccf5ac3e2 100644
--- a/cod_session/cod_session.features.inc
+++ b/cod_session/cod_session.features.inc
@@ -52,9 +52,11 @@ function cod_session_flag_default_flags() {
       ),
       'unflag' => array(),
     ),
+    'weight' => 0,
     'show_on_page' => 1,
     'show_on_teaser' => 1,
     'show_on_form' => 0,
+    'show_contextual_link' => FALSE,
     'access_author' => '',
     'i18n' => 0,
     'module' => 'cod_session',
@@ -84,9 +86,11 @@ function cod_session_flag_default_flags() {
       'flag' => array(),
       'unflag' => array(),
     ),
-    'show_on_page' => 0,
-    'show_on_teaser' => 1,
+    'weight' => 0,
+    'show_on_page' => 1,
+    'show_on_teaser' => 0,
     'show_on_form' => 0,
+    'show_contextual_link' => FALSE,
     'access_author' => '',
     'i18n' => 0,
     'module' => 'cod_session',
@@ -113,15 +117,17 @@ function cod_session_flag_default_flags() {
     'link_type' => 'toggle',
     'roles' => array(
       'flag' => array(
-        0 => 3,
+        0 => '4',
       ),
       'unflag' => array(
-        0 => 3,
+        0 => '4',
       ),
     ),
+    'weight' => 0,
     'show_on_page' => 1,
     'show_on_teaser' => 0,
     'show_on_form' => 0,
+    'show_contextual_link' => FALSE,
     'access_author' => '',
     'i18n' => 0,
     'module' => 'cod_session',
diff --git a/cod_session/cod_session.features.menu_custom.inc b/cod_session/cod_session.features.menu_custom.inc
index 4dc41ba2743ad803f6fcc55e8f5b4523018bc6ed..26dece4a1db7068c74f8645c508e6956f1c978d7 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.menu_links.inc b/cod_session/cod_session.features.menu_links.inc
index b5b5c276c012e181c40865b277a9887738393233..b774cb3f116a5481bc9d615651fa001b5acb0a48 100644
--- a/cod_session/cod_session.features.menu_links.inc
+++ b/cod_session/cod_session.features.menu_links.inc
@@ -10,20 +10,6 @@
 function cod_session_menu_default_menu_links() {
   $menu_links = array();
 
-  // Exported menu link: main-menu:program
-  $menu_links['main-menu:program'] = array(
-    'menu_name' => 'main-menu',
-    'link_path' => 'program',
-    'router_path' => 'program',
-    'link_title' => 'Session schedule',
-    'options' => array(),
-    'module' => 'system',
-    'hidden' => '0',
-    'external' => '0',
-    'has_children' => '1',
-    'expanded' => '0',
-    'weight' => '0',
-  );
   // Exported menu link: main-menu:program/sessions
   $menu_links['main-menu:program/sessions'] = array(
     'menu_name' => 'main-menu',
@@ -37,31 +23,10 @@ function cod_session_menu_default_menu_links() {
     'has_children' => '0',
     'expanded' => '0',
     'weight' => '0',
-    'parent_path' => 'program',
-  );
-  // Exported menu link: menu-menu-quick-links:program/session-schedule/your-schedule
-  $menu_links['menu-menu-quick-links:program/session-schedule/your-schedule'] = array(
-    'menu_name' => 'menu-menu-quick-links',
-    'link_path' => 'program/session-schedule/your-schedule',
-    'router_path' => 'program/session-schedule/your-schedule',
-    'link_title' => 'Your schedule',
-    'options' => array(
-      'attributes' => array(
-        'title' => 'Your personal conference schedule',
-      ),
-    ),
-    'module' => 'menu',
-    'hidden' => '0',
-    'external' => '0',
-    'has_children' => '0',
-    'expanded' => '0',
-    'weight' => '0',
   );
   // Translatables
   // Included for use with string extractors like potx.
-  t('Session schedule');
   t('Sessions');
-  t('Your schedule');
 
 
   return $menu_links;
diff --git a/cod_session/cod_session.features.user_permission.inc b/cod_session/cod_session.features.user_permission.inc
index d5d7869c38f0184d80e34b8c3542882c91202abc..7a09ca5cb62e23b7e271828cd37d83634f215099 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,25 @@ function cod_session_user_default_permissions() {
     'module' => 'node',
   );
 
-  // Exported permission: view field_accepted
+  // Exported permission: schedule schedule_item.
+  $permissions['schedule schedule_item'] = array(
+    'name' => 'schedule schedule_item',
+    'roles' => array(
+      0 => 'administrator',
+    ),
+    'module' => 'cod_session',
+  );
+
+  // Exported permission: schedule session.
+  $permissions['schedule session'] = array(
+    'name' => 'schedule session',
+    'roles' => array(
+      0 => 'administrator',
+    ),
+    'module' => 'cod_session',
+  );
+
+  // 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 187327d6387f17fc1be73bc6db92dfa41a3cddb6..2a7f1ad54f9c2a5df748c5c10ac02fc080122346 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 c05392c760bfc8fd665305696305f66e3bb6c6df..c311b8385787761aba233aedf8a3fe1abaf20b1a 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';
@@ -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_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 c86744affeb52c62b6ec31b6ba92ac96412c0167..5089bc6d10ca4e9872b201e13e4cd1cecb00d76f 100644
--- a/cod_session/cod_session.info
+++ b/cod_session/cod_session.info
@@ -15,11 +15,10 @@ dependencies[] = "flag"
 dependencies[] = "image"
 dependencies[] = "list"
 dependencies[] = "menu"
-dependencies[] = "node_reference"
 dependencies[] = "number"
 dependencies[] = "search"
 dependencies[] = "strongarm"
-dependencies[] = "user_reference"
+dependencies[] = "entityreference"
 dependencies[] = "views"
 dependencies[] = "views_bulk_operations"
 dependencies[] = "views_content"
@@ -65,6 +64,8 @@ features[node][] = "room"
 features[node][] = "schedule_item"
 features[node][] = "session"
 features[node][] = "time_slot"
+features[user_permission][] = "schedule schedule_item"
+features[user_permission][] = "schedule session"
 features[user_permission][] = "create field_accepted"
 features[user_permission][] = "create room content"
 features[user_permission][] = "create schedule_item content"
@@ -115,6 +116,9 @@ 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__room
+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"
diff --git a/cod_session/cod_session.module b/cod_session/cod_session.module
index 22ce9df4578604810801c56ad6ca069998feb23a..faabb74b346d5e90ea964d611a33c04be423a676 100644
--- a/cod_session/cod_session.module
+++ b/cod_session/cod_session.module
@@ -108,11 +108,76 @@ function cod_session_menu() {
     'access arguments' => array(1),
     'type' => MENU_CALLBACK,
   );
-
+  $items['program/session-schedule'] = array(
+    'title' => 'Schedule',
+    'page arguments' => array('cod_schedule', 'page_1'),
+    'page callback' => 'cod_session_schedule_tabs',
+    'access callback' => 'cod_session_schedule_access',
+    'access arguments' => array(1),
+    'menu_name' => 'main-menu',
+    'type' => MENU_NORMAL_ITEM,
+  );
   return $items;
 }
 
 /**
+ * Implements hook_menu_local_tasks_alter().
+ */
+function cod_session_menu_local_tasks_alter(&$data, $router_item, $root_path) {
+  // Add action link to 'node/add' on 'admin/content' page.
+  if (strpos($root_path, 'program/session-schedule') !== FALSE) {
+    $item = menu_get_item('program/session-schedule');
+    if ($item['access'] && isset($data['tabs'][0])) {
+      $data['tabs'][0]['count']++;
+      array_unshift($data['tabs'][0]['output'], array(
+        '#theme' => 'menu_local_task',
+        '#link' => $item,
+      ));
+    }
+  }
+}
+
+/**
+ * Helper function for matching day to URL arguments
+ */
+function cod_session_day_url($day) {
+  $day = str_replace(' ','-',$day);
+  $day = str_replace(',','',$day);
+  return strtolower($day);
+}
+
+/**
+ * Menu callback function for Program Session Schedule
+ */
+function cod_session_schedule_tabs($view_id, $display_id) {
+  $days = cod_session_days();
+  if (!empty($days)) {
+    $tabs = array();
+    $cnt = 0;
+    foreach($days as $day) {
+      $tabs[] = array(
+        'title' => $day,
+        'type' => 'view',
+        'vid' => $view_id,
+        'display' => $display_id,
+        'args' => cod_session_day_url($day),
+        'weight' => $cnt++, // Doesn't properly sort if we provide same values
+      );
+    }
+    $qtoptions = array(
+      'style' => 'Basic',
+      'ajax' => FALSE,
+    );
+    $qtname = 'cod_session_tabs';
+    $quicktabs = quicktabs_build_quicktabs($qtname,$qtoptions,$tabs);
+    return drupal_render($quicktabs['content']);
+  }
+  else {
+    return views_embed_view($view_id, $display_id);
+  }
+}
+
+/**
  * Implements hook_form_FORM_ID_alter().
  */
 function cod_session_form_node_type_form_alter(&$form, &$form_state, $form_id) {
@@ -208,8 +273,8 @@ function cod_session_form_alter(&$form, &$form_state, $form_id) {
       }
       elseif (!empty($form['#node']->nid) && !empty($form['#node']->field_session_room) && !empty($form['#node']->field_session_slot)) {
         // Get room and slot from node during node edit.
-        $room_nid = $form['#node']->field_session_room[LANGUAGE_NONE][0]['nid'];
-        $slot_nid = $form['#node']->field_session_slot[LANGUAGE_NONE][0]['nid'];
+        $room_nid = $form['#node']->field_session_room['und'][0]['target_id'];
+        $slot_nid = $form['#node']->field_session_slot['und'][0]['target_id'];
       }
       else {
         return;
@@ -253,12 +318,12 @@ function cod_session_form_alter(&$form, &$form_state, $form_id) {
       // Set Room and Time-slot fields. Prepopulate is not used to accomplish
       // this because as of 2.2 Prepopulate doesn't support hidden or access
       // FALSE fields.
-      $form['field_session_room'][LANGUAGE_NONE]['#default_value'][$room_nid] = $room_nid;
-      $form['field_session_slot'][LANGUAGE_NONE]['#default_value'] = $slot_nid;
+      $form['field_session_room']['und']['#default_value'] = $room_nid;
+      $form['field_session_slot']['und']['#default_value'] = $slot_nid;
       // Disable editing and hide the room and slot fields wuth after_build, FAPI!!!
       if (!user_access('edit any ' . $form['#node']->type . ' content')) {
-        $form['field_session_room'][LANGUAGE_NONE]['#access'] = FALSE;
-        $form['field_session_slot'][LANGUAGE_NONE]['#access'] = FALSE;
+        $form['field_session_room']['und']['#access'] = FALSE;
+        $form['field_session_slot']['und']['#access'] = FALSE;
       }
       // Disable node preview because of Prepopulate bug http://drupal.org/node/661842
       unset($form['actions']['preview']);
@@ -272,8 +337,8 @@ function cod_session_form_alter(&$form, &$form_state, $form_id) {
 function _cod_session_unschedule(&$form, &$form_state) {
   if ($form_state['values']['op'] == $form_state['values']['cod_unschedule']) {
     // Unset scheduled room and time slot.
-    $form_state['values']['field_session_room'][LANGUAGE_NONE][0]['nid'] = NULL;
-    $form_state['values']['field_session_slot'][LANGUAGE_NONE][0]['nid'] = NULL;
+    $form_state['values']['field_session_room']['und'][0]['target_id'] = NULL;
+    $form_state['values']['field_session_slot']['und'][0]['target_id'] = NULL;
     drupal_set_message(t('%name has been unscheduled. To reshedule, click "Schedule a session" on any available time slot.', array('%name' => $form_state['values']['title'])));
     // @todo set redirect?
   }
@@ -411,8 +476,8 @@ function cod_session_schedule_form_submit($form, $form_state) {
   // @todo consider whether there should be a
   // cod_session_schedule_form_validate() with node_validate().
   $item = node_load($form_state['values']['session'], NULL, TRUE);
-  $item->field_session_slot[LANGUAGE_NONE][0]['nid'] = $form_state['values']['schedule']['slot']->nid;
-  $item->field_session_room[LANGUAGE_NONE][0]['nid'] = $form_state['values']['schedule']['room']->nid;
+  $item->field_session_slot['und'][0]['target_id'] = $form_state['values']['schedule']['slot']->nid;
+  $item->field_session_room['und'][0]['target_id'] = $form_state['values']['schedule']['room']->nid;
   $item = node_submit($item);
   node_save($item);
 }
@@ -499,18 +564,18 @@ function cod_session_node_presave($node) {
 function cod_session_node_validate($node, $form, &$form_state) {
   // If the node has a room and slot field, make sure there are no existing nodes that have the same room/slot combination.
   // Unless the node is not unique check room capacity.
-  if (!empty($node->field_session_slot[LANGUAGE_NONE][0]['nid']) && !empty($node->field_session_room[LANGUAGE_NONE][0]['nid'])) {
+  if (!empty($node->field_session_slot['und'][0]['target_id']) && !empty($node->field_session_room['und'][0]['target_id'])) {
     $slots = $rooms = array();
     foreach ($node->field_session_slot as $slot) {
-      if (!empty($slot[0]['nid'])) {
-        $slots[] = $slot[0]['nid'];
+      if (!empty($slot[0]['target_id'])) {
+        $slots[] = $slot[0]['target_id'];
       }
     }
 
     // Get rooms.
     foreach ($node->field_session_room as $room) {
-      if (!empty($room[0]['nid'])) {
-        $rooms[$room[0]['nid']] = node_load($room[0]['nid']);
+      if (!empty($room[0]['target_id'])) {
+        $rooms[$room[0]['target_id']] = node_load($room[0]['target_id']);
       }
     }
 
@@ -530,8 +595,8 @@ function cod_session_node_validate($node, $form, &$form_state) {
       $query = new EntityFieldQuery();
       $query->entityCondition('entity_type', 'node')
         ->propertyCondition('status', 1)
-        ->fieldCondition('field_session_room', 'nid', $room_nids, 'IN')
-        ->fieldCondition('field_session_slot', 'nid', $slots, 'IN');
+        ->fieldCondition('field_session_room', 'target_id', $room_nids, 'IN')
+        ->fieldCondition('field_session_slot', 'target_id', $slots, 'IN');
       if (isset($node->nid)) {
         // Don't let this node block unscheduling.
         $query->propertyCondition('nid', $node->nid, '!=');
@@ -546,9 +611,9 @@ function cod_session_node_validate($node, $form, &$form_state) {
       if (!empty($content)) {
         foreach ($content as $scheduled) {
           $capacity--;
-          if ($capacity <= 0 || (variable_get('cod_unique_' . $scheduled->type, COD_SCHEDULE_SINGLE) == COD_SCHEDULE_SINGLE)) {
+          if ($capacity <= 0 || (variable_get('cod_unique_' . $scheduled->type, COD_SCHEDULE_SINGLE) == COD_SCHEDULE_SINGLE) || (variable_get('cod_unique_' . $node->type, COD_SCHEDULE_SINGLE) == COD_SCHEDULE_SINGLE)) {
             // @todo handle this scheduled item being in multiple rooms?
-            $room = $rooms[$scheduled->field_session_room[LANGUAGE_NONE][0]['nid']];
+            $room = $rooms[$scheduled->field_session_room['und'][0]['target_id']];
             $errors[] = t('!session in !room', array('!session' => l($scheduled->title, 'node/' . $scheduled->nid), '!room' => l($room->title, 'node/' . $room->nid)));
           }
         }
@@ -623,6 +688,19 @@ function template_preprocess_cod_session_schedule(&$vars) {
     }
   }
 
+  // There is no contextual argument filter, but if a valid day
+  // argument is present, we modify the cod_schedule_days
+  // to only display that day overriden by the URL.
+  if(isset($view->args[0])) {
+    foreach ($view->cod_schedule_days as $day_key => $day_value) {
+      if(cod_session_day_url($day_value) == $view->args[0]) {
+        $view->cod_schedule_days[$day_key] = $day_value;
+      } elseif($view->args[0] != 'all') {
+        unset($view->cod_schedule_days[$day_key]);
+      }
+    }
+  }
+
   // Get days of the schedule from the View style setting. This will be used
   // when depicting day links and for determining time slots to appear on this
   // day's grid.
@@ -755,7 +833,10 @@ function template_preprocess_cod_session_schedule(&$vars) {
 
   if (!empty($scheduled_items)) {
     foreach ($scheduled_items as $item) {
-      if (!empty($item->field_session_slot[LANGUAGE_NONE][0]['nid']) && !empty($item->field_session_room[LANGUAGE_NONE][0]['nid'])) {
+      if (!empty($item->field_session_slot['und'][0]['target_id'])) {
+        $target_slot = $item->field_session_slot['und'][0]['target_id'];
+      }
+      if (isset($target_slot) && !empty($item->field_session_room['und'][0]['target_id'])) {
         if (!empty($item->cod_session_classes)) {
           $class = ' ' . implode(' ', array_keys($item->cod_session_classes));
         }
@@ -764,16 +845,16 @@ function template_preprocess_cod_session_schedule(&$vars) {
         }
 
         // Handle sessions in multiple rooms.
-        foreach ($item->field_session_room[LANGUAGE_NONE] as $room_instance) {
-          $item_grid[$item->field_session_slot[LANGUAGE_NONE][0]['nid']][$room_instance['nid']][$item->nid]['session'] = $item;
-          $item_grid[$item->field_session_slot[LANGUAGE_NONE][0]['nid']][$room_instance['nid']][$item->nid]['class'] = $class;
+        foreach ($item->field_session_room['und'] as $room_instance) {
+          $item_grid[$target_slot][$room_instance['target_id']][$item->nid]['session'] = $item;
+          $item_grid[$target_slot][$room_instance['target_id']][$item->nid]['class'] = $class;
           // Record rooms and used slots.
-          $used_rooms[$room_instance['nid']][] = $item->field_session_slot[LANGUAGE_NONE][0]['nid'];
+          $used_rooms[$room_instance['target_id']][] = $target_slot;
         }
 
       // Create array of populated slots.
-        if (!in_array($item->field_session_slot[LANGUAGE_NONE][0]['nid'], $used_slots)) {
-          $used_slots[] = $item->field_session_slot[LANGUAGE_NONE][0]['nid'];
+        if (!in_array($target_slot, $used_slots)) {
+          $used_slots[] = $target_slot;
         }
       }
       // Record sessions for this user, their call-to-action can use it.
@@ -854,6 +935,8 @@ function template_preprocess_cod_session_schedule(&$vars) {
     }
   }
 
+  $single_node_types = cod_session_single_schedulable_types();
+
   // @todo get rooms for each day?
   // Build schedule grid array. This is the final processing before handing over
   // to the tpl file.
@@ -933,6 +1016,22 @@ function template_preprocess_cod_session_schedule(&$vars) {
             }
           }
 
+          // Check if there are any nodes with COD_SCHEDULE_SINGLE assigned to this room and time
+          // It is already by default that the room is not available if the session is COD_SCHEDULE_SINGLE
+          if ($view->cod_schedule_interactive && $available) {
+            $query = new EntityFieldQuery();
+            $entities = $query->entityCondition('entity_type', 'node')
+            ->propertyCondition('type', $single_node_types, 'IN')
+            ->fieldCondition('field_session_room', 'target_id', $room_nid)
+            ->fieldCondition('field_session_slot', 'target_id', $slot['nid'])
+            ->propertyCondition('status', 1)
+            ->range(0,1)
+            ->execute();
+            if (count($entities) > 0) {
+              $available = 0;
+            }
+          }
+
           // Include room availability and call-to-action if this is an interactive
           // schedule and user is allowed to create and schedule.
           if ($view->cod_schedule_interactive && cod_session_schedule_access($view->cod_interactive_type, $user)) {
@@ -983,6 +1082,7 @@ function template_preprocess_cod_session_schedule(&$vars) {
   $vars['rooms'] = $rooms;
   $vars['room_nids'] = $room_nids;
   $vars['show_rooms'] = $show_rooms;
+  $vars['schedule_display'] = $view->cod_schedule_display;
 }
 
 /**
@@ -1176,3 +1276,19 @@ function _cod_session_scheduler_title($type) {
   $type_info = node_type_get_type($type);
   return t('Schedule a @name', array('@name' => $type_info->name));
 }
+
+/**
+ * Helper function to determine content types with single schedule types.
+ */
+function cod_session_single_schedulable_types() {
+  $single_types = array();
+  $types = node_type_get_types();
+  foreach ($types as $type => $content_type) {
+    $bundle = field_info_instances('node', $type);
+    if (isset($bundle['field_session_room']) && isset($bundle['field_session_slot']) && variable_get('cod_unique_' . $type, COD_SCHEDULE_SINGLE) == COD_SCHEDULE_SINGLE) {
+      $single_types[] = $type;
+    }
+  }
+
+  return $single_types;
+}
\ No newline at end of file
diff --git a/cod_session/cod_session.strongarm.inc b/cod_session/cod_session.strongarm.inc
index e429724eb5e5ca597b62157d5435f6cd8de3b8ad..a07812ff97333d4abbb6432792215be4ff18f9a2 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 dcb35e8b80add793eb2dfa3b1e4b634b306c7ead..9264ca86daf0a47abc363c3ceeb7eb1bf983ae9d 100644
--- a/cod_session/cod_session.views_default.inc
+++ b/cod_session/cod_session.views_default.inc
@@ -35,10 +35,8 @@ function cod_session_views_default_views() {
   $handler->display->display_options['pager']['options']['offset'] = '0';
   $handler->display->display_options['style_plugin'] = 'cod_session_schedule';
   $handler->display->display_options['style_options']['schedule_interactive'] = '0';
-  $handler->display->display_options['style_options']['schedule_days'] = array(
-    'Sunday February, 26 2012' => 0,
-  );
   $handler->display->display_options['style_options']['interactive_type'] = 'session';
+  $handler->display->display_options['style_options']['schedule_display'] = '0';
   $handler->display->display_options['row_plugin'] = 'fields';
   /* No results behavior: Global: Text area */
   $handler->display->display_options['empty']['area']['id'] = 'area';
@@ -49,35 +47,11 @@ function cod_session_views_default_views() {
   $handler->display->display_options['empty']['area']['content'] = 'Please create one or more rooms and time slots, and assign a session or schedule item to them. For help with scheduling, please see the <a href="http://drupal.org/documentation/build/cod/">COD Documentation</a>.';
   $handler->display->display_options['empty']['area']['format'] = 'filtered_html';
   $handler->display->display_options['empty']['area']['tokenize'] = 0;
-  /* Relationship: Flags: session_schedule */
-  $handler->display->display_options['relationships']['flag_content_rel']['id'] = 'flag_content_rel';
-  $handler->display->display_options['relationships']['flag_content_rel']['table'] = 'node';
-  $handler->display->display_options['relationships']['flag_content_rel']['field'] = 'flag_content_rel';
-  $handler->display->display_options['relationships']['flag_content_rel']['label'] = 'flag: session_schedule';
-  $handler->display->display_options['relationships']['flag_content_rel']['required'] = 0;
-  $handler->display->display_options['relationships']['flag_content_rel']['flag'] = 'session_schedule';
-  /* 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'] = 1;
-  $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'] = 1;
-  $handler->display->display_options['fields']['field_track']['field_api_classes'] = 0;
+  /* 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']['required'] = 1;
   /* Field: Content: Title */
   $handler->display->display_options['fields']['title']['id'] = 'title';
   $handler->display->display_options['fields']['title']['table'] = 'node';
@@ -103,35 +77,65 @@ function cod_session_views_default_views() {
   $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;
+  $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'] = 1;
+  $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: 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']['label'] = '';
+  $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']['more_link'] = 0;
+  $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'] = FALSE;
+  $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'] = 1;
+  $handler->display->display_options['fields']['field_track']['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']['label'] = '';
   $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;
@@ -141,38 +145,16 @@ function cod_session_views_default_views() {
   $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']['more_link'] = 0;
   $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_label_colon'] = FALSE;
   $handler->display->display_options['fields']['field_experience']['element_default_classes'] = 1;
   $handler->display->display_options['fields']['field_experience']['hide_empty'] = 1;
   $handler->display->display_options['fields']['field_experience']['empty_zero'] = 0;
   $handler->display->display_options['fields']['field_experience']['hide_alter_empty'] = 1;
   $handler->display->display_options['fields']['field_experience']['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';
-  $handler->display->display_options['fields']['ops']['field'] = 'ops';
-  $handler->display->display_options['fields']['ops']['relationship'] = 'flag_content_rel';
-  $handler->display->display_options['fields']['ops']['label'] = '';
-  $handler->display->display_options['fields']['ops']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['ops']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['ops']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['ops']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['ops']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['ops']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['ops']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['ops']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['ops']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['ops']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['ops']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['ops']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['ops']['element_label_colon'] = FALSE;
-  $handler->display->display_options['fields']['ops']['element_default_classes'] = 1;
-  $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'] = 1;
   $handler->display->display_options['filter_groups']['groups'] = array(
     1 => 'AND',
     2 => 'AND',
@@ -202,22 +184,20 @@ 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;
+  $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_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_slot_target_id']['id'] = 'field_session_slot_target_id';
+  $handler->display->display_options['filters']['field_session_slot_target_id']['table'] = 'field_data_field_session_slot';
+  $handler->display->display_options['filters']['field_session_slot_target_id']['field'] = 'field_session_slot_target_id';
+  $handler->display->display_options['filters']['field_session_slot_target_id']['operator'] = 'not empty';
 
   /* Display: Schedule */
   $handler = $view->new_display('page', 'Schedule', 'page_1');
-  $handler->display->display_options['path'] = 'program/session-schedule';
-  $handler->display->display_options['menu']['type'] = 'default tab';
+  $handler->display->display_options['defaults']['relationships'] = FALSE;
+  $handler->display->display_options['path'] = 'program/session-schedule/%';
   $handler->display->display_options['menu']['title'] = 'Session Schedule';
   $handler->display->display_options['menu']['weight'] = '-50';
   $handler->display->display_options['menu']['name'] = 'main-menu';
@@ -245,6 +225,18 @@ function cod_session_views_default_views() {
   $handler->display->display_options['empty']['area']['content'] = 'You can add sessions to your personal schedule from the <a href="/program/session-schedule">main schedule.</a>';
   $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: 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']['required'] = 1;
+  /* Relationship: Flags: session_schedule */
+  $handler->display->display_options['relationships']['flag_content_rel']['id'] = 'flag_content_rel';
+  $handler->display->display_options['relationships']['flag_content_rel']['table'] = 'node';
+  $handler->display->display_options['relationships']['flag_content_rel']['field'] = 'flag_content_rel';
+  $handler->display->display_options['relationships']['flag_content_rel']['required'] = 0;
+  $handler->display->display_options['relationships']['flag_content_rel']['flag'] = 'session_schedule';
   $handler->display->display_options['defaults']['filters'] = FALSE;
   /* Filter criterion: Content: Published */
   $handler->display->display_options['filters']['status']['id'] = 'status';
@@ -271,24 +263,21 @@ 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;
+  $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_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_slot_target_id']['id'] = 'field_session_slot_target_id';
+  $handler->display->display_options['filters']['field_session_slot_target_id']['table'] = 'field_data_field_session_slot';
+  $handler->display->display_options['filters']['field_session_slot_target_id']['field'] = 'field_session_slot_target_id';
+  $handler->display->display_options['filters']['field_session_slot_target_id']['operator'] = 'not empty';
   /* Filter criterion: Flags: Flagged */
   $handler->display->display_options['filters']['flagged']['id'] = 'flagged';
   $handler->display->display_options['filters']['flagged']['table'] = 'flag_content';
   $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'] = '1';
-  $handler->display->display_options['filters']['flagged']['group'] = 1;
   $handler->display->display_options['path'] = 'program/session-schedule/your-schedule';
   $handler->display->display_options['menu']['type'] = 'tab';
   $handler->display->display_options['menu']['title'] = 'Your schedule';
@@ -561,7 +550,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) */
+  /* Field: Broken/missing handler */
   $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';
@@ -582,10 +571,6 @@ function cod_session_views_default_views() {
   $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 */
   $handler->display->display_options['fields']['body']['id'] = 'body';
   $handler->display->display_options['fields']['body']['table'] = 'field_data_body';
@@ -963,12 +948,11 @@ 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) */
+  /* Relationship: Broken/missing handler */
   $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 +1087,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,7 +1369,7 @@ 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) */
+  /* Field: Broken/missing handler */
   $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';
@@ -1407,10 +1390,6 @@ function cod_session_views_default_views() {
   $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: Experience level */
   $handler->display->display_options['fields']['field_experience']['id'] = 'field_experience';
   $handler->display->display_options['fields']['field_experience']['table'] = 'field_data_field_experience';
@@ -1572,13 +1551,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'] = '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';
@@ -1813,7 +1792,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,8 +1802,7 @@ 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) */
+  /* 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';
@@ -1989,13 +1967,12 @@ 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) */
+  /* 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']['label'] = 'Speaker(s)';
   $handler->display->display_options['relationships']['field_speakers_uid']['required'] = 1;
-  $handler->display->display_options['relationships']['field_speakers_uid']['delta'] = '-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';
@@ -2282,7 +2259,7 @@ 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) */
+  /* Field: Broken/missing handler */
   $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';
@@ -2303,12 +2280,6 @@ function cod_session_views_default_views() {
   $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 +2463,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 +2521,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,21 +2553,18 @@ 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) */
+  /* 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']['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 */
+  /* Relationship: Flags: (Please select a flag) */
   $handler->display->display_options['relationships']['flag_content_rel']['id'] = 'flag_content_rel';
   $handler->display->display_options['relationships']['flag_content_rel']['table'] = 'node';
   $handler->display->display_options['relationships']['flag_content_rel']['field'] = 'flag_content_rel';
   $handler->display->display_options['relationships']['flag_content_rel']['label'] = 'session_confirm';
   $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';
   $handler->display->display_options['defaults']['filters'] = FALSE;
   /* Filter criterion: Content: Published */
   $handler->display->display_options['filters']['status']['id'] = 'status';
@@ -2619,7 +2587,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 +2599,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,20 +2636,17 @@ 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) */
+  /* 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']['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 */
+  /* Relationship: Flags: (Please select a flag) */
   $handler->display->display_options['relationships']['flag_content_rel']['id'] = 'flag_content_rel';
   $handler->display->display_options['relationships']['flag_content_rel']['table'] = 'node';
   $handler->display->display_options['relationships']['flag_content_rel']['field'] = 'flag_content_rel';
   $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';
   $handler->display->display_options['defaults']['filters'] = FALSE;
   /* Filter criterion: Content: Published */
   $handler->display->display_options['filters']['status']['id'] = 'status';
@@ -2706,12 +2671,12 @@ 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) */
+  /* 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';
@@ -2777,12 +2742,11 @@ function cod_session_views_default_views() {
   $handler->display->display_options['style_options']['override'] = 1;
   $handler->display->display_options['style_options']['sticky'] = 0;
   $handler->display->display_options['style_options']['empty_table'] = 0;
-  /* Relationship: Flags: session_confirm */
+  /* Relationship: Flags: (Please select a flag) */
   $handler->display->display_options['relationships']['flag_content_rel']['id'] = 'flag_content_rel';
   $handler->display->display_options['relationships']['flag_content_rel']['table'] = 'node';
   $handler->display->display_options['relationships']['flag_content_rel']['field'] = 'flag_content_rel';
   $handler->display->display_options['relationships']['flag_content_rel']['required'] = 0;
-  $handler->display->display_options['relationships']['flag_content_rel']['flag'] = 'session_confirm';
   /* Field: Content: Title */
   $handler->display->display_options['fields']['title']['id'] = 'title';
   $handler->display->display_options['fields']['title']['table'] = 'node';
@@ -2846,7 +2810,7 @@ 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) */
+  /* Contextual filter: Broken/missing handler */
   $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';
@@ -2860,8 +2824,6 @@ function cod_session_views_default_views() {
   $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;
   $handler->display->display_options['filter_groups']['groups'] = array(
     1 => 'AND',
     2 => 'AND',
@@ -2874,13 +2836,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';
diff --git a/cod_session/cod_session_views_style_plugin_schedule.inc b/cod_session/cod_session_views_style_plugin_schedule.inc
index 879d8cb81264efefc82fbdf0825898d6217b5db0..5be90f0865ababc2d65a7ca27d7e9fed4d7ed101 100644
--- a/cod_session/cod_session_views_style_plugin_schedule.inc
+++ b/cod_session/cod_session_views_style_plugin_schedule.inc
@@ -1,10 +1,7 @@
 <?php
 /**
  * @file
- * A views plugin class that provides a calendar view style.
- *
- * This file and class must exist for the calendar plugin to be recognized by
- * Views.
+ * A views plugin class that provides a Session Schedule view style.
  *
  * @ingroup views_style_plugins
  */
@@ -31,7 +28,7 @@ class cod_session_views_plugin_style_schedule extends views_plugin_style {
     }
     $interactive_type = $this->options['interactive_type'];
     $view->cod_interactive_type = !empty($view->cod_schedule_interactive) ? $interactive_type : FALSE;
-
+    $view->cod_schedule_display = $this->options['schedule_display'];
     $view->cod_room_queue = $this->options['room_queue'];
     $view->cod_time_queue = $this->options['time_queue'];
 
@@ -48,6 +45,7 @@ class cod_session_views_plugin_style_schedule extends views_plugin_style {
     $schedule_days = cod_session_days();
     $options['schedule_days'] = !empty($schedule_days) ? array_keys($schedule_days) : array();
     $options['interactive_type'] = 0;
+    $options['schedule_display'] = 0;
     $options['room_queue'] = NULL;
     $options['time_queue'] = NULL;
     return $options;
@@ -57,7 +55,7 @@ class cod_session_views_plugin_style_schedule extends views_plugin_style {
    * Style options.
    */
   function options_form(&$form, &$form_state) {
-    $schedule_days = cod_session_days();
+    /*$schedule_days = cod_session_days();
     if (!empty($schedule_days)) {
       $form['schedule_days'] = array(
         '#title' => t('Schedule days'),
@@ -66,7 +64,7 @@ class cod_session_views_plugin_style_schedule extends views_plugin_style {
         '#options' => $schedule_days,
         '#description' => t('Select which days to show on this display. Defaults to all event days.'),
       );
-    }
+    }*/
 
     // "interactive" is an internal name, in the UI it's referred to as the
     // scheduling mode.
@@ -90,6 +88,14 @@ class cod_session_views_plugin_style_schedule extends views_plugin_style {
       '#description' => t("Set the content type to provide scheduling controls for. 'Show schedule and scheduling controls' mode must be enabled."),
     );
 
+    $form['schedule_display'] = array(
+      '#title' => t('Display format for schedule'),
+      '#default_value' => isset($this->options['schedule_display']) ? $this->options['schedule_display'] : 0,
+      '#type' => 'radios',
+      '#options' => array(0 => 'Vertical', 1 => 'Grid'),
+      '#description' => t("Set the schedule display to display sessions in a single column or multiple columns sorted by room."),
+    );
+
     // Provide nodequeues for room and timeslot ordering. If set this nodequeue
     // becomes the argument to the schedule_room_list view.
     if (module_exists('nodequeue')) {
@@ -99,7 +105,6 @@ class cod_session_views_plugin_style_schedule extends views_plugin_style {
         foreach ($queues as $queue) {
           $options[$queue->qid] = $queue->title;
         }
-
         $form['room_queue'] = array(
           '#type' => 'radios',
           '#title' => t('Room queue'),