diff --git a/app/views/admin/schedules/_form.html.haml b/app/views/admin/schedules/_form.html.haml
index 8c6c091d..11fd9967 100644
--- a/app/views/admin/schedules/_form.html.haml
+++ b/app/views/admin/schedules/_form.html.haml
@@ -6,5 +6,5 @@
 .row
   .col-md-12
     = semantic_form_for @schedule, url: admin_conference_schedules_path(@conference.short_title) do |f|
-      = f.input :track, collection: Track.accessible_by(current_ability).where(program: @program).self_organized.confirmed.pluck(:name, :id), include_blank: false
+      = f.input :track, collection: Track.accessible_by(current_ability).where(program: @program), include_blank: false
       = f.action :submit, as: :button, button_html: { class: 'btn btn-primary' }
diff --git a/app/views/schedules/_event.html.haml b/app/views/schedules/_event.html.haml
index 2dbe5087..7d2102d3 100644
--- a/app/views/schedules/_event.html.haml
+++ b/app/views/schedules/_event.html.haml
@@ -1,19 +1,18 @@
 .panel.panel-default.event-panel{ onClick: 'eventClicked(event, this);', "data-url" => "#{url_for(conference_program_proposal_path(@conference.short_title, event.id))}" }
-  .panel-body
+  .panel-heading{ style: event.track&.color && "background-color: #{event.track.color}; color: #{ contrast_color(event.track.color) }" }
     - event.speakers_ordered.each do |speaker|
-      = image_tag speaker.profile_picture, :class => "img-circle pull-right all-speaker-pic", |
-                                        :alt => speaker.name, |
-                                        :title => speaker.name |
+      = image_tag speaker.profile_picture, class: "img-circle pull-right",  alt: speaker.name, style: "padding: 2px;"
 
     %p
       = canceled_replacement_event_label(event, event_schedule)
       = replacement_event_notice(event_schedule)
 
-    %span.h3
+    %span.h3{style: "margin-bottom: 20px"}
       = event.title
       %br
       %small
         = event.subtitle
+  .panel-body
     %h4
       - if(event.speakers.any?)
         presented by #{event.speaker_names}
diff --git a/app/views/tracks/show.html.haml b/app/views/tracks/show.html.haml
index 52448b98..a6aa066c 100644
--- a/app/views/tracks/show.html.haml
+++ b/app/views/tracks/show.html.haml
@@ -45,3 +45,7 @@
           Relevance
         %dd
           = markdown(@track.relevance)
+
+  .row
+    - @track.events.each do |event|
+      = render 'schedules/event', event: event, event_schedule: event.event_schedules.first