diff --git a/cod_base/cod_base.features.field.inc b/cod_base/cod_base.features.field.inc
index ebe0743..491aa80 100644
--- a/cod_base/cod_base.features.field.inc
+++ b/cod_base/cod_base.features.field.inc
@@ -10,7 +10,7 @@
 function cod_base_field_default_fields() {
   $fields = array();
 
-  // Exported field: 'user-user-field_profile_first'
+  // Exported field: 'user-user-field_profile_first'.
   $fields['user-user-field_profile_first'] = array(
     'field_config' => array(
       'active' => '1',
@@ -31,6 +31,7 @@ function cod_base_field_default_fields() {
           0 => 'format',
         ),
       ),
+      'locked' => '0',
       'module' => 'text',
       'settings' => array(
         'max_length' => '255',
@@ -72,7 +73,7 @@ function cod_base_field_default_fields() {
     ),
   );
 
-  // Exported field: 'user-user-field_profile_interests'
+  // Exported field: 'user-user-field_profile_interests'.
   $fields['user-user-field_profile_interests'] = array(
     'field_config' => array(
       'active' => '1',
@@ -93,6 +94,7 @@ function cod_base_field_default_fields() {
           0 => 'format',
         ),
       ),
+      'locked' => '0',
       'module' => 'text',
       'settings' => array(),
       'translatable' => '1',
@@ -132,7 +134,7 @@ function cod_base_field_default_fields() {
     ),
   );
 
-  // Exported field: 'user-user-field_profile_job_title'
+  // Exported field: 'user-user-field_profile_job_title'.
   $fields['user-user-field_profile_job_title'] = array(
     'field_config' => array(
       'active' => '1',
@@ -153,6 +155,7 @@ function cod_base_field_default_fields() {
           0 => 'format',
         ),
       ),
+      'locked' => '0',
       'module' => 'text',
       'settings' => array(
         'max_length' => '255',
@@ -194,7 +197,7 @@ function cod_base_field_default_fields() {
     ),
   );
 
-  // Exported field: 'user-user-field_profile_last'
+  // Exported field: 'user-user-field_profile_last'.
   $fields['user-user-field_profile_last'] = array(
     'field_config' => array(
       'active' => '1',
@@ -215,6 +218,7 @@ function cod_base_field_default_fields() {
           0 => 'format',
         ),
       ),
+      'locked' => '0',
       'module' => 'text',
       'settings' => array(
         'max_length' => '255',
@@ -256,7 +260,7 @@ function cod_base_field_default_fields() {
     ),
   );
 
-  // Exported field: 'user-user-field_profile_org'
+  // Exported field: 'user-user-field_profile_org'.
   $fields['user-user-field_profile_org'] = array(
     'field_config' => array(
       'active' => '1',
@@ -277,6 +281,7 @@ function cod_base_field_default_fields() {
           0 => 'format',
         ),
       ),
+      'locked' => '0',
       'module' => 'text',
       'settings' => array(
         'max_length' => '255',
diff --git a/cod_base/cod_base.features.user_permission.inc b/cod_base/cod_base.features.user_permission.inc
index 5925ede..5ada9dd 100644
--- a/cod_base/cod_base.features.user_permission.inc
+++ b/cod_base/cod_base.features.user_permission.inc
@@ -60,6 +60,15 @@ function cod_base_user_default_permissions() {
     'module' => 'node',
   );
 
+  // Exported permission: access dashboard.
+  $permissions['access dashboard'] = array(
+    'name' => 'access dashboard',
+    'roles' => array(
+      0 => 'administrator',
+    ),
+    'module' => 'dashboard',
+  );
+
   // Exported permission: access own webform results.
   $permissions['access own webform results'] = array(
     'name' => 'access own webform results',
diff --git a/cod_base/cod_base.info b/cod_base/cod_base.info
index bfcd9f0..09f3990 100644
--- a/cod_base/cod_base.info
+++ b/cod_base/cod_base.info
@@ -8,6 +8,7 @@ dependencies[] = admin
 dependencies[] = admin_menu
 dependencies[] = advanced_help
 dependencies[] = comment
+dependencies[] = dashboard
 dependencies[] = features
 dependencies[] = field_permissions
 dependencies[] = menu
@@ -64,4 +65,5 @@ features[user_permission][] = view the administration theme
 features[user_role][] = administrator
 features[user_role][] = content editor
 features[variable][] = admin_toolbar
+features[variable][] = date_format_date_no_time_
 files[] = cod_base.module
diff --git a/cod_base/cod_base.strongarm.inc b/cod_base/cod_base.strongarm.inc
index 3fc0ab8..c0bbb7c 100644
--- a/cod_base/cod_base.strongarm.inc
+++ b/cod_base/cod_base.strongarm.inc
@@ -27,5 +27,12 @@ function cod_base_strongarm() {
   );
   $export['admin_toolbar'] = $strongarm;
 
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'date_format_date_no_time_';
+  $strongarm->value = 'D, j M Y';
+  $export['date_format_date_no_time_'] = $strongarm;
+
   return $export;
 }
diff --git a/cod_session/cod_session.features.field.inc b/cod_session/cod_session.features.field.inc
index ccf5830..3d1bd2f 100644
--- a/cod_session/cod_session.features.field.inc
+++ b/cod_session/cod_session.features.field.inc
@@ -10,7 +10,7 @@
 function cod_session_field_default_fields() {
   $fields = array();
 
-  // Exported field: 'node-page-body'
+  // Exported field: 'node-page-body'.
   $fields['node-page-body'] = array(
     'field_config' => array(
       'active' => '1',
@@ -36,6 +36,7 @@ function cod_session_field_default_fields() {
           0 => 'format',
         ),
       ),
+      'locked' => '0',
       'module' => 'text',
       'settings' => array(
         'field_permissions' => array(
@@ -99,7 +100,7 @@ function cod_session_field_default_fields() {
     ),
   );
 
-  // Exported field: 'node-room-body'
+  // Exported field: 'node-room-body'.
   $fields['node-room-body'] = array(
     'field_config' => array(
       'active' => '1',
@@ -125,6 +126,7 @@ function cod_session_field_default_fields() {
           0 => 'format',
         ),
       ),
+      'locked' => '0',
       'module' => 'text',
       'settings' => array(
         'field_permissions' => array(
@@ -190,7 +192,7 @@ function cod_session_field_default_fields() {
     ),
   );
 
-  // Exported field: 'node-room-field_room_capacity'
+  // Exported field: 'node-room-field_room_capacity'.
   $fields['node-room-field_room_capacity'] = array(
     'field_config' => array(
       'active' => '1',
@@ -203,6 +205,7 @@ function cod_session_field_default_fields() {
       ),
       'foreign keys' => array(),
       'indexes' => array(),
+      'locked' => '0',
       'module' => 'number',
       'settings' => array(),
       'translatable' => '0',
@@ -260,7 +263,7 @@ function cod_session_field_default_fields() {
     ),
   );
 
-  // Exported field: 'node-room-field_room_photo'
+  // Exported field: 'node-room-field_room_photo'.
   $fields['node-room-field_room_photo'] = array(
     'field_config' => array(
       'active' => '1',
@@ -281,6 +284,7 @@ function cod_session_field_default_fields() {
           0 => 'fid',
         ),
       ),
+      'locked' => '0',
       'module' => 'image',
       'settings' => array(
         'default_image' => 0,
@@ -323,6 +327,7 @@ function cod_session_field_default_fields() {
       'required' => 0,
       'settings' => array(
         'alt_field' => 0,
+        'default_image' => 0,
         'file_directory' => '',
         'file_extensions' => 'png gif jpg jpeg',
         'max_filesize' => '',
@@ -344,7 +349,7 @@ function cod_session_field_default_fields() {
     ),
   );
 
-  // Exported field: 'node-room-field_room_session_capacity'
+  // Exported field: 'node-room-field_room_session_capacity'.
   $fields['node-room-field_room_session_capacity'] = array(
     'field_config' => array(
       'active' => '1',
@@ -357,6 +362,7 @@ function cod_session_field_default_fields() {
       ),
       'foreign keys' => array(),
       'indexes' => array(),
+      'locked' => '0',
       'module' => 'number',
       'settings' => array(),
       'translatable' => '0',
@@ -414,7 +420,7 @@ function cod_session_field_default_fields() {
     ),
   );
 
-  // Exported field: 'node-schedule_item-body'
+  // Exported field: 'node-schedule_item-body'.
   $fields['node-schedule_item-body'] = array(
     'field_config' => array(
       'active' => '1',
@@ -440,6 +446,7 @@ function cod_session_field_default_fields() {
           0 => 'format',
         ),
       ),
+      'locked' => '0',
       'module' => 'text',
       'settings' => array(
         'field_permissions' => array(
@@ -504,7 +511,7 @@ function cod_session_field_default_fields() {
     ),
   );
 
-  // Exported field: 'node-schedule_item-field_accepted'
+  // Exported field: 'node-schedule_item-field_accepted'.
   $fields['node-schedule_item-field_accepted'] = array(
     'field_config' => array(
       'active' => '1',
@@ -521,6 +528,7 @@ function cod_session_field_default_fields() {
           0 => 'value',
         ),
       ),
+      'locked' => '0',
       'module' => 'list',
       'settings' => array(
         'allowed_values' => array(
@@ -583,7 +591,7 @@ function cod_session_field_default_fields() {
     ),
   );
 
-  // Exported field: 'node-schedule_item-field_session_room'
+  // Exported field: 'node-schedule_item-field_session_room'.
   $fields['node-schedule_item-field_session_room'] = array(
     'field_config' => array(
       'active' => '1',
@@ -799,6 +807,7 @@ function cod_session_field_default_fields() {
           0 => 'format',
         ),
       ),
+      'locked' => '0',
       'module' => 'text',
       'settings' => array(
         'field_permissions' => array(
@@ -881,6 +890,7 @@ function cod_session_field_default_fields() {
           0 => 'value',
         ),
       ),
+      'locked' => '0',
       'module' => 'list',
       'settings' => array(
         'allowed_values' => array(
@@ -964,6 +974,7 @@ function cod_session_field_default_fields() {
           0 => 'value',
         ),
       ),
+      'locked' => '0',
       'module' => 'list',
       'settings' => array(
         'allowed_values' => array(
@@ -1216,68 +1227,55 @@ function cod_session_field_default_fields() {
     ),
   );
 
-  // Exported field: 'node-session-field_session_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_permissions' => array(
-        'type' => '0',
-      ),
+      'field_name' => 'field_slides',
       'foreign keys' => array(
-        'users' => array(
+        'fid' => array(
           'columns' => array(
-            'target_id' => 'uid',
+            'fid' => 'fid',
           ),
-          'table' => 'users',
+          'table' => 'file_managed',
         ),
       ),
       'indexes' => array(
-        'target_id' => array(
-          0 => 'target_id',
+        'fid' => array(
+          0 => 'fid',
         ),
       ),
       'locked' => '0',
-      'module' => 'entityreference',
+      'module' => 'file',
       'settings' => array(
-        '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(),
+        'display_default' => 1,
+        'display_field' => 1,
+        'field_permissions' => array(
+          'create' => 'create',
+          'edit' => 0,
+          'edit own' => 'edit own',
+          'view' => 'view',
+          'view own' => 0,
         ),
-        'handler_submit' => 'Change handler',
-        'target_type' => 'user',
+        'uri_scheme' => 'public',
       ),
-      'translatable' => '0',
-      'type' => 'entityreference',
+      'translatable' => '1',
+      'type' => 'file',
     ),
     'field_instance' => array(
       'bundle' => 'session',
-      'default_value' => NULL,
       'deleted' => '0',
-      'description' => '',
+      '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' => 'entityreference',
-          'settings' => array(
-            'link' => FALSE,
-          ),
-          'type' => 'entityreference_label',
-          'weight' => 9,
+          'module' => 'file',
+          'settings' => array(),
+          'type' => 'file_default',
+          'weight' => '2',
         ),
         'listing' => array(
           'label' => 'above',
@@ -1293,75 +1291,90 @@ function cod_session_field_default_fields() {
         ),
       ),
       'entity_type' => 'node',
-      'field_name' => 'field_speakers',
-      'label' => 'Speaker(s)',
-      'required' => 1,
+      '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' => 'entityreference',
+        'module' => 'file',
         'settings' => array(
-          'match_operator' => 'CONTAINS',
-          'path' => '',
-          'size' => '60',
+          'progress_indicator' => 'throbber',
         ),
-        'type' => 'entityreference_autocomplete_tags',
-        'weight' => '1',
+        'type' => 'file_generic',
+        'weight' => '3',
       ),
     ),
   );
 
-  // Exported field: 'node-session-field_slides'.
-  $fields['node-session-field_slides'] = array(
+  // Exported field: 'node-session-field_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',
         ),
       ),
       'locked' => '0',
-      'module' => 'file',
+      '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,
         ),
         'listing' => array(
           'label' => 'above',
@@ -1377,24 +1390,22 @@ 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',
       ),
     ),
   );
@@ -1598,13 +1609,10 @@ function cod_session_field_default_fields() {
 
   // Translatables
   // Included for use with string extractors like potx.
-  t('Add your username and optionally 1-5 additional speaker usernames.');
   t('Body');
-  t('Capacity');
   t('Date and time');
   t('Description');
   t('Experience level');
-  t('How many people does this space hold?');
   t('Number of sessions or BoFs that this room can hold in a time slot. Used to allow multiple BoFs in the same room at the same time slot.');
   t('Photo');
   t('Room');
@@ -1615,6 +1623,8 @@ function cod_session_field_default_fields() {
   t('Status');
   t('Time Slot');
   t('Time slot');
+  t('Total capacity of the room, in persons.');
+  t('Total room capacity');
   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 ce8433f..d71cbc4 100644
--- a/cod_session/cod_session.features.inc
+++ b/cod_session/cod_session.features.inc
@@ -52,12 +52,10 @@ function cod_session_flag_default_flags() {
       ),
       'unflag' => array(),
     ),
-    'weight' => 0,
-    'show_on_form' => 0,
-    'access_author' => '',
     'show_on_page' => 1,
     'show_on_teaser' => 1,
-    'show_contextual_link' => FALSE,
+    'show_on_form' => 0,
+    'access_author' => '',
     'i18n' => 0,
     'module' => 'cod_session',
     'locked' => array(
@@ -86,12 +84,10 @@ function cod_session_flag_default_flags() {
       'flag' => array(),
       'unflag' => array(),
     ),
-    'weight' => 0,
-    'show_on_form' => 0,
-    'access_author' => '',
     'show_on_page' => 1,
     'show_on_teaser' => 0,
-    'show_contextual_link' => FALSE,
+    'show_on_form' => 0,
+    'access_author' => '',
     'i18n' => 0,
     'module' => 'cod_session',
     'locked' => array(
@@ -123,12 +119,10 @@ function cod_session_flag_default_flags() {
         0 => '4',
       ),
     ),
-    'weight' => 0,
-    'show_on_form' => 0,
-    'access_author' => '',
     'show_on_page' => 1,
     'show_on_teaser' => 0,
-    'show_contextual_link' => FALSE,
+    'show_on_form' => 0,
+    'access_author' => '',
     'i18n' => 0,
     'module' => 'cod_session',
     'locked' => array(
diff --git a/cod_session/cod_session.info b/cod_session/cod_session.info
index ce1a3fb..03bf809 100644
--- a/cod_session/cod_session.info
+++ b/cod_session/cod_session.info
@@ -1,141 +1,139 @@
-name = "COD Session"
-description = "COD Session Scheduling & Voting"
-core = "7.x"
-package = "COD"
-php = "5.2.4"
-project = "cod_session"
-dependencies[] = "auto_nodetitle"
-dependencies[] = "cod_base"
-dependencies[] = "date"
-dependencies[] = "date_popup"
-dependencies[] = "entityreference"
-dependencies[] = "features"
-dependencies[] = "field_group"
-dependencies[] = "field_permissions"
-dependencies[] = "flag"
-dependencies[] = "image"
-dependencies[] = "list"
-dependencies[] = "menu"
-dependencies[] = "number"
-dependencies[] = "quicktabs"
-dependencies[] = "quicktabs_tabstyles"
-dependencies[] = "search"
-dependencies[] = "strongarm"
-dependencies[] = "views"
-dependencies[] = "views_bulk_operations"
-dependencies[] = "views_content"
-dependencies[] = "views_ui"
-datestamp = "1312320179"
-features[ctools][] = "field_group:field_group:1"
-features[ctools][] = "strongarm:strongarm:1"
-features[ctools][] = "views:views_default:3.0"
-features[field][] = "node-page-body"
-features[field][] = "node-room-body"
-features[field][] = "node-room-field_room_capacity"
-features[field][] = "node-room-field_room_photo"
-features[field][] = "node-room-field_room_session_capacity"
-features[field][] = "node-schedule_item-body"
-features[field][] = "node-schedule_item-field_accepted"
-features[field][] = "node-schedule_item-field_session_room"
-features[field][] = "node-schedule_item-field_session_slot"
-features[field][] = "node-session-body"
-features[field][] = "node-session-field_accepted"
-features[field][] = "node-session-field_experience"
-features[field][] = "node-session-field_session_room"
-features[field][] = "node-session-field_session_slot"
-features[field][] = "node-session-field_slides"
-features[field][] = "node-session-field_speakers"
-features[field][] = "node-session-field_track"
-features[field][] = "node-time_slot-field_slot_datetime"
-features[field_group][] = "group_audience|node|session|default"
-features[field_group][] = "group_audience|node|session|form"
-features[field_group][] = "group_schedule_info|node|schedule_item|default"
-features[field_group][] = "group_schedule_info|node|session|default"
-features[field_group][] = "group_schedule|node|schedule_item|form"
-features[field_group][] = "group_schedule|node|session|form"
-features[flag][] = "session_confirm"
-features[flag][] = "session_schedule"
-features[flag][] = "session_vote"
-features[menu_custom][] = "main-menu"
-features[menu_custom][] = "menu-menu-quick-links"
-features[menu_links][] = "main-menu:program"
-features[menu_links][] = "main-menu:program/sessions"
-features[menu_links][] = "menu-menu-quick-links:program/session-schedule/your-schedule"
-features[node][] = "page"
-features[node][] = "room"
-features[node][] = "schedule_item"
-features[node][] = "session"
-features[node][] = "time_slot"
-features[user_permission][] = "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"
-features[user_permission][] = "create session content"
-features[user_permission][] = "create time_slot content"
-features[user_permission][] = "delete any room content"
-features[user_permission][] = "delete any schedule_item content"
-features[user_permission][] = "delete any session content"
-features[user_permission][] = "delete any time_slot content"
-features[user_permission][] = "delete own session content"
-features[user_permission][] = "edit any room content"
-features[user_permission][] = "edit any schedule_item content"
-features[user_permission][] = "edit any session content"
-features[user_permission][] = "edit any time_slot content"
-features[user_permission][] = "edit field_accepted"
-features[user_permission][] = "edit own field_accepted"
-features[user_permission][] = "edit own session content"
-features[user_permission][] = "view field_accepted"
-features[user_role][] = "session organizer"
-features[variable][] = "ant_pattern_time_slot"
-features[variable][] = "ant_time_slot"
-features[variable][] = "comment_anonymous_room"
-features[variable][] = "comment_anonymous_schedule_item"
-features[variable][] = "comment_anonymous_session"
-features[variable][] = "comment_anonymous_time_slot"
-features[variable][] = "comment_default_mode_room"
-features[variable][] = "comment_default_mode_schedule_item"
-features[variable][] = "comment_default_mode_session"
-features[variable][] = "comment_default_mode_time_slot"
-features[variable][] = "comment_default_per_page_room"
-features[variable][] = "comment_default_per_page_schedule_item"
-features[variable][] = "comment_default_per_page_session"
-features[variable][] = "comment_default_per_page_time_slot"
-features[variable][] = "comment_form_location_room"
-features[variable][] = "comment_form_location_schedule_item"
-features[variable][] = "comment_form_location_session"
-features[variable][] = "comment_form_location_time_slot"
-features[variable][] = "comment_page"
-features[variable][] = "comment_preview_room"
-features[variable][] = "comment_preview_schedule_item"
-features[variable][] = "comment_preview_session"
-features[variable][] = "comment_preview_time_slot"
-features[variable][] = "comment_room"
-features[variable][] = "comment_schedule_item"
-features[variable][] = "comment_session"
-features[variable][] = "comment_subject_field_room"
-features[variable][] = "comment_subject_field_schedule_item"
-features[variable][] = "comment_subject_field_session"
-features[variable][] = "comment_subject_field_time_slot"
-features[variable][] = "comment_time_slot"
-features[variable][] = field_bundle_settings_node__room
+name = COD Session
+description = COD Session Scheduling & Voting
+core = 7.x
+package = COD
+php = 5.2.4
+project = cod_session
+dependencies[] = auto_nodetitle
+dependencies[] = cod_base
+dependencies[] = date
+dependencies[] = date_popup
+dependencies[] = entityreference
+dependencies[] = features
+dependencies[] = field_group
+dependencies[] = field_permissions
+dependencies[] = flag
+dependencies[] = image
+dependencies[] = list
+dependencies[] = menu
+dependencies[] = number
+dependencies[] = quicktabs
+dependencies[] = quicktabs_tabstyles
+dependencies[] = search
+dependencies[] = strongarm
+dependencies[] = views
+dependencies[] = views_bulk_operations
+dependencies[] = views_content
+dependencies[] = views_ui
+datestamp = 1312320179
+features[ctools][] = field_group:field_group:1
+features[ctools][] = strongarm:strongarm:1
+features[ctools][] = views:views_default:3.0
+features[features_api][] = api:1
+features[field][] = node-page-body
+features[field][] = node-room-body
+features[field][] = node-room-field_room_capacity
+features[field][] = node-room-field_room_photo
+features[field][] = node-room-field_room_session_capacity
+features[field][] = node-schedule_item-body
+features[field][] = node-schedule_item-field_accepted
+features[field][] = node-schedule_item-field_session_room
+features[field][] = node-schedule_item-field_session_slot
+features[field][] = node-session-body
+features[field][] = node-session-field_accepted
+features[field][] = node-session-field_experience
+features[field][] = node-session-field_session_room
+features[field][] = node-session-field_session_slot
+features[field][] = node-session-field_slides
+features[field][] = node-session-field_speakers
+features[field][] = node-session-field_track
+features[field][] = node-time_slot-field_slot_datetime
+features[field_group][] = group_audience|node|session|default
+features[field_group][] = group_audience|node|session|form
+features[field_group][] = group_schedule_info|node|schedule_item|default
+features[field_group][] = group_schedule_info|node|session|default
+features[field_group][] = group_schedule|node|schedule_item|form
+features[field_group][] = group_schedule|node|session|form
+features[flag][] = session_confirm
+features[flag][] = session_schedule
+features[flag][] = session_vote
+features[menu_custom][] = main-menu
+features[menu_custom][] = menu-menu-quick-links
+features[menu_links][] = main-menu:program/sessions
+features[node][] = page
+features[node][] = room
+features[node][] = schedule_item
+features[node][] = session
+features[node][] = time_slot
+features[user_permission][] = create field_accepted
+features[user_permission][] = create room content
+features[user_permission][] = create schedule_item content
+features[user_permission][] = create session content
+features[user_permission][] = create time_slot content
+features[user_permission][] = delete any room content
+features[user_permission][] = delete any schedule_item content
+features[user_permission][] = delete any session content
+features[user_permission][] = delete any time_slot content
+features[user_permission][] = delete own session content
+features[user_permission][] = edit any room content
+features[user_permission][] = edit any schedule_item content
+features[user_permission][] = edit any session content
+features[user_permission][] = edit any time_slot content
+features[user_permission][] = edit field_accepted
+features[user_permission][] = edit own field_accepted
+features[user_permission][] = edit own session content
+features[user_permission][] = schedule schedule_item
+features[user_permission][] = schedule session
+features[user_permission][] = view field_accepted
+features[user_role][] = session organizer
+features[variable][] = ant_pattern_time_slot
+features[variable][] = ant_time_slot
+features[variable][] = comment_anonymous_room
+features[variable][] = comment_anonymous_schedule_item
+features[variable][] = comment_anonymous_session
+features[variable][] = comment_anonymous_time_slot
+features[variable][] = comment_default_mode_room
+features[variable][] = comment_default_mode_schedule_item
+features[variable][] = comment_default_mode_session
+features[variable][] = comment_default_mode_time_slot
+features[variable][] = comment_default_per_page_room
+features[variable][] = comment_default_per_page_schedule_item
+features[variable][] = comment_default_per_page_session
+features[variable][] = comment_default_per_page_time_slot
+features[variable][] = comment_form_location_room
+features[variable][] = comment_form_location_schedule_item
+features[variable][] = comment_form_location_session
+features[variable][] = comment_form_location_time_slot
+features[variable][] = comment_page
+features[variable][] = comment_preview_room
+features[variable][] = comment_preview_schedule_item
+features[variable][] = comment_preview_session
+features[variable][] = comment_preview_time_slot
+features[variable][] = comment_room
+features[variable][] = comment_schedule_item
+features[variable][] = comment_session
+features[variable][] = comment_subject_field_room
+features[variable][] = comment_subject_field_schedule_item
+features[variable][] = comment_subject_field_session
+features[variable][] = comment_subject_field_time_slot
+features[variable][] = comment_time_slot
 features[variable][] = field_bundle_settings_node__schedule_item
 features[variable][] = field_bundle_settings_node__session
-features[variable][] = "menu_options_time_slot"
-features[variable][] = "menu_parent_time_slot"
-features[variable][] = "node_options_page"
-features[variable][] = "node_options_room"
-features[variable][] = "node_options_schedule_item"
-features[variable][] = "node_options_session"
-features[variable][] = "node_options_time_slot"
-features[variable][] = "node_preview_time_slot"
-features[variable][] = "node_submitted_page"
-features[variable][] = "node_submitted_time_slot"
-features[views_view][] = "cod_schedule"
-features[views_view][] = "cod_time_slots"
-features[views_view][] = "schedule_room_list"
-features[views_view][] = "sessions"
-features[views_view][] = "sessions_admin"
-features[views_view][] = "sessions_admin_contact"
-features[views_view][] = "sessions_speaker_confirmation"
-files[] = "cod_session_views_style_plugin_schedule.inc"
+features[variable][] = menu_options_time_slot
+features[variable][] = menu_parent_time_slot
+features[variable][] = node_options_page
+features[variable][] = node_options_room
+features[variable][] = node_options_schedule_item
+features[variable][] = node_options_session
+features[variable][] = node_options_time_slot
+features[variable][] = node_preview_time_slot
+features[variable][] = node_submitted_page
+features[variable][] = node_submitted_time_slot
+features[views_view][] = cod_schedule
+features[views_view][] = cod_time_slots
+features[views_view][] = schedule_room_list
+features[views_view][] = sessions
+features[views_view][] = sessions_admin
+features[views_view][] = sessions_admin_contact
+features[views_view][] = sessions_speaker_confirmation
+files[] = cod_session_views_style_plugin_schedule.inc
diff --git a/cod_session/cod_session.module b/cod_session/cod_session.module
index fa325a5..9bc0680 100644
--- a/cod_session/cod_session.module
+++ b/cod_session/cod_session.module
@@ -108,34 +108,9 @@ 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
@@ -147,37 +122,6 @@ function cod_session_day_url($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) {
diff --git a/cod_session/cod_session.views.inc b/cod_session/cod_session.views.inc
index 4e532a4..573a376 100644
--- a/cod_session/cod_session.views.inc
+++ b/cod_session/cod_session.views.inc
@@ -12,7 +12,7 @@ function cod_session_views_plugins() {
     'module' => 'cod_session',
     'style' => array(
       'cod_session_schedule' => array(
-        'title' => t('Session schedule'),
+        'title' => t('Session schedule grid'),
         'help' => t('Display view as a table with room columns and time slot rows'),
         'handler' => 'cod_session_views_plugin_style_schedule',
         'theme' => 'cod_session_schedule',
diff --git a/cod_session/cod_session.views_default.inc b/cod_session/cod_session.views_default.inc
index a5f8fdd..8642160 100644
--- a/cod_session/cod_session.views_default.inc
+++ b/cod_session/cod_session.views_default.inc
@@ -33,10 +33,16 @@ function cod_session_views_default_views() {
   $handler->display->display_options['exposed_form']['type'] = 'basic';
   $handler->display->display_options['pager']['type'] = 'none';
   $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']['interactive_type'] = 'session';
-  $handler->display->display_options['style_options']['schedule_display'] = '0';
+  $handler->display->display_options['style_plugin'] = 'quicktabs';
+  $handler->display->display_options['style_options']['grouping'] = array(
+    0 => array(
+      'field' => 'field_slot_datetime',
+      'rendered' => 1,
+      'rendered_strip' => 1,
+    ),
+  );
+  $handler->display->display_options['style_options']['tab_style'] = 'Basic';
+  $handler->display->display_options['style_options']['tab_title_field'] = 'field_slot_datetime';
   $handler->display->display_options['row_plugin'] = 'fields';
   /* No results behavior: Global: Text area */
   $handler->display->display_options['empty']['area']['id'] = 'area';
@@ -48,10 +54,11 @@ function cod_session_views_default_views() {
   $handler->display->display_options['empty']['area']['format'] = 'filtered_html';
   $handler->display->display_options['empty']['area']['tokenize'] = 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;
+  $handler->display->display_options['relationships']['field_session_slot_target_id']['id'] = 'field_session_slot_target_id';
+  $handler->display->display_options['relationships']['field_session_slot_target_id']['table'] = 'field_data_field_session_slot';
+  $handler->display->display_options['relationships']['field_session_slot_target_id']['field'] = 'field_session_slot_target_id';
+  $handler->display->display_options['relationships']['field_session_slot_target_id']['label'] = 'Time slot';
+  $handler->display->display_options['relationships']['field_session_slot_target_id']['required'] = 1;
   /* Field: Content: Title */
   $handler->display->display_options['fields']['title']['id'] = 'title';
   $handler->display->display_options['fields']['title']['table'] = 'node';
@@ -76,37 +83,6 @@ function cod_session_views_default_views() {
   $handler->display->display_options['fields']['title']['empty_zero'] = 0;
   $handler->display->display_options['fields']['title']['hide_alter_empty'] = 1;
   $handler->display->display_options['fields']['title']['link_to_node'] = 1;
-  /* Field: Content: Speaker(s) */
-  $handler->display->display_options['fields']['field_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';
@@ -155,6 +131,44 @@ function cod_session_views_default_views() {
   $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: Content: Date and time */
+  $handler->display->display_options['fields']['field_slot_datetime']['id'] = 'field_slot_datetime';
+  $handler->display->display_options['fields']['field_slot_datetime']['table'] = 'field_data_field_slot_datetime';
+  $handler->display->display_options['fields']['field_slot_datetime']['field'] = 'field_slot_datetime';
+  $handler->display->display_options['fields']['field_slot_datetime']['relationship'] = 'field_session_slot_target_id';
+  $handler->display->display_options['fields']['field_slot_datetime']['label'] = '';
+  $handler->display->display_options['fields']['field_slot_datetime']['exclude'] = TRUE;
+  $handler->display->display_options['fields']['field_slot_datetime']['alter']['alter_text'] = 0;
+  $handler->display->display_options['fields']['field_slot_datetime']['alter']['make_link'] = 0;
+  $handler->display->display_options['fields']['field_slot_datetime']['alter']['absolute'] = 0;
+  $handler->display->display_options['fields']['field_slot_datetime']['alter']['external'] = 0;
+  $handler->display->display_options['fields']['field_slot_datetime']['alter']['replace_spaces'] = 0;
+  $handler->display->display_options['fields']['field_slot_datetime']['alter']['trim_whitespace'] = 0;
+  $handler->display->display_options['fields']['field_slot_datetime']['alter']['nl2br'] = 0;
+  $handler->display->display_options['fields']['field_slot_datetime']['alter']['word_boundary'] = 1;
+  $handler->display->display_options['fields']['field_slot_datetime']['alter']['ellipsis'] = 1;
+  $handler->display->display_options['fields']['field_slot_datetime']['alter']['more_link'] = 0;
+  $handler->display->display_options['fields']['field_slot_datetime']['alter']['strip_tags'] = 0;
+  $handler->display->display_options['fields']['field_slot_datetime']['alter']['trim'] = 0;
+  $handler->display->display_options['fields']['field_slot_datetime']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['field_slot_datetime']['element_label_colon'] = FALSE;
+  $handler->display->display_options['fields']['field_slot_datetime']['element_default_classes'] = 1;
+  $handler->display->display_options['fields']['field_slot_datetime']['hide_empty'] = 0;
+  $handler->display->display_options['fields']['field_slot_datetime']['empty_zero'] = 0;
+  $handler->display->display_options['fields']['field_slot_datetime']['hide_alter_empty'] = 1;
+  $handler->display->display_options['fields']['field_slot_datetime']['settings'] = array(
+    'format_type' => 'date_no_time_',
+    'fromto' => 'value',
+    'multiple_number' => '',
+    'multiple_from' => '',
+    'multiple_to' => '',
+  );
+  $handler->display->display_options['fields']['field_slot_datetime']['field_api_classes'] = 0;
+  /* Sort criterion: Content: Date and time (field_slot_datetime) */
+  $handler->display->display_options['sorts']['field_slot_datetime_value']['id'] = 'field_slot_datetime_value';
+  $handler->display->display_options['sorts']['field_slot_datetime_value']['table'] = 'field_data_field_slot_datetime';
+  $handler->display->display_options['sorts']['field_slot_datetime_value']['field'] = 'field_slot_datetime_value';
+  $handler->display->display_options['sorts']['field_slot_datetime_value']['relationship'] = 'field_session_slot_target_id';
   $handler->display->display_options['filter_groups']['groups'] = array(
     1 => 'AND',
     2 => 'AND',
@@ -197,6 +211,11 @@ function cod_session_views_default_views() {
   /* Display: Schedule */
   $handler = $view->new_display('page', 'Schedule', 'page_1');
   $handler->display->display_options['defaults']['relationships'] = FALSE;
+  /* Relationship: Entity Reference: Referenced Entity */
+  $handler->display->display_options['relationships']['field_session_slot_target_id']['id'] = 'field_session_slot_target_id';
+  $handler->display->display_options['relationships']['field_session_slot_target_id']['table'] = 'field_data_field_session_slot';
+  $handler->display->display_options['relationships']['field_session_slot_target_id']['field'] = 'field_session_slot_target_id';
+  $handler->display->display_options['relationships']['field_session_slot_target_id']['required'] = 1;
   $handler->display->display_options['path'] = 'program/session-schedule/%';
   $handler->display->display_options['menu']['title'] = 'Session Schedule';
   $handler->display->display_options['menu']['weight'] = '-50';
@@ -226,7 +245,7 @@ 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: Entity Reference: Referenced Entity */
+  /* Relationship: Broken/missing handler */
   $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';
@@ -285,6 +304,16 @@ function cod_session_views_default_views() {
   $handler->display->display_options['menu']['name'] = 'main-menu';
   $handler->display->display_options['menu']['context'] = 0;
   $handler->display->display_options['tab_options']['weight'] = '0';
+
+  /* Display: Session schedule */
+  $handler = $view->new_display('page', 'Session schedule', 'page_3');
+  $handler->display->display_options['path'] = 'program/session-schedule';
+  $handler->display->display_options['menu']['type'] = 'normal';
+  $handler->display->display_options['menu']['title'] = 'Session schedule';
+  $handler->display->display_options['menu']['description'] = 'Session schedule';
+  $handler->display->display_options['menu']['weight'] = '0';
+  $handler->display->display_options['menu']['name'] = 'main-menu';
+  $handler->display->display_options['menu']['context'] = 0;
   $export['cod_schedule'] = $view;
 
   $view = new view;
@@ -550,7 +579,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: Broken/missing handler */
+  /* 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';
@@ -1369,7 +1398,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: Broken/missing handler */
+  /* 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';
@@ -2259,7 +2288,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: Broken/missing handler */
+  /* 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';
diff --git a/cod_session/cod_session_views_style_plugin_schedule.inc b/cod_session/cod_session_views_style_plugin_schedule.inc
index 5be90f0..371f228 100644
--- a/cod_session/cod_session_views_style_plugin_schedule.inc
+++ b/cod_session/cod_session_views_style_plugin_schedule.inc
@@ -28,7 +28,6 @@ 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'];
 
@@ -45,7 +44,6 @@ 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;
@@ -55,16 +53,6 @@ class cod_session_views_plugin_style_schedule extends views_plugin_style {
    * Style options.
    */
   function options_form(&$form, &$form_state) {
-    /*$schedule_days = cod_session_days();
-    if (!empty($schedule_days)) {
-      $form['schedule_days'] = array(
-        '#title' => t('Schedule days'),
-        '#default_value' => !empty($this->options['schedule_days']) ? $this->options['schedule_days'] : array(),
-        '#type' => 'checkboxes',
-        '#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.
@@ -88,14 +76,6 @@ 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')) {