diff --git a/app/views/conferences/_highlights.haml b/app/views/conferences/_highlights.haml
new file mode 100644
index 00000000..0ea1eb99
--- /dev/null
+++ b/app/views/conferences/_highlights.haml
@@ -0,0 +1,18 @@
+.row
+  .col-md-12
+    %h3.text-center
+      Program Highlights
+.row
+  .col-md-12
+    .row.row-centered
+      - @conference.highlighted_events.each do |event|
+        - speaker = event.speakers_ordered.first
+        .col-md-3.col-sm-3.col-centered.col-top.highlights
+          = link_to conference_program_proposal_path(@conference.short_title, event),
+            class: 'thumbnail' do
+            = image_tag speaker.gravatar_url(size: 300),
+              class: ['img-responsive', 'img-circle'],
+              title: speaker.name
+            .caption
+              %h3.text-center= speaker.name
+              %h4.text-center= event.title
diff --git a/app/views/conferences/_schedule_splashpage.html.haml b/app/views/conferences/_schedule_splashpage.html.haml
index 4f47c31e..075fff32 100644
--- a/app/views/conferences/_schedule_splashpage.html.haml
+++ b/app/views/conferences/_schedule_splashpage.html.haml
@@ -4,56 +4,27 @@
 
 - cache [@confererence, @conference.confirmed_tracks, '#splash#schedule'] do
   %section#schedule
-  .container
-    .row
-      .col-md-12
-        %h2.text-center
-          Program
-        %p.lead.text-center
-          %span.notranslate
-            = @conference.title
-          has the most awesome program ever!
-          - if @conference.splashpage.include_tracks && @conference.confirmed_tracks.any?
-            See rock-star speakers cover the topics of
-            - @conference.confirmed_tracks.each_slice(3) do |slice|
-              .row.row-centered
-                - slice.each do |track|
-                  .col-md-4.col-sm-4.col-centered.col-top.track
-                    %h4.text-center
-                      = track.name
-                    = markdown(track.description)
-                    - if track.start_date
-                      %br
-                      From: #{track.start_date.strftime('%A, %B %-d. %Y')}
-                    - if track.end_date
-                      %br
-                      To: #{track.end_date.strftime('%A, %B %-d. %Y')}
-                    - if track.room
-                      %br
-                      In: #{track.room.name}
-
-    - if @conference.program.try(:schedule_public?)
+    .container
       .row
         .col-md-12
-          %p.cta-button.text-center
-            = link_to(conference_schedule_path(@conference.short_title), class: 'btn btn-default btn-lg') do
-              Full Schedule
+          %p.lead.text-center
+            %span.notranslate
+              = @conference.title
+            has the most awesome program ever!
 
-    %h3.text-center
-      Don't miss out!
-    %br
-    - if @conference.highlighted_events.any?
-      .row
-        .col-md-12
-          - @conference.highlighted_events.each_slice(2) do |slice|
-            .row.row-centered
-              - slice.each do |event|
-                .col-md-6.col-centered.col-top.highlights
-                  %p.text-center
-                    %b= event.title
-                  %h5.text-center
-                    = markdown truncate(event.abstract, length: 500, separator: ' ')
-                    = link_to "Read More", conference_program_proposal_path(@conference.short_title, event)
+      - if @conference.highlighted_events.any?
+        = render 'highlights'
+
+      - if @conference.splashpage.include_tracks && @conference.confirmed_tracks.any?
+        = render 'tracks'
+
+      - if @conference.program.try(:schedule_public?)
+        .row
+          .col-md-12
+            %p.cta-button.text-center
+              = link_to(conference_schedule_path(@conference.short_title),
+                class: 'btn btn-success btn-lg') do
+                Full Schedule
 
 - if @conference.splashpage.include_booths && @conference.confirmed_booths.any?
   = render 'booths'
diff --git a/app/views/conferences/_tracks.haml b/app/views/conferences/_tracks.haml
new file mode 100644
index 00000000..1938ab0f
--- /dev/null
+++ b/app/views/conferences/_tracks.haml
@@ -0,0 +1,17 @@
+.row
+  .col-md-12
+    %h3.text-center
+      Tracks
+.row.row-centered
+  - @conference.confirmed_tracks.to_a.sort_by!(&:name).each do |track|
+    .col-md-3.col-sm-3.col-centered.col-top.track
+      .thumbnail
+        .caption
+          %h3.text-center
+            = track.name
+          %p.text-center
+            - if track.start_date && track.end_date
+              = date_string(track.start_date, track.end_date)
+            - if track.room
+              In #{track.room.name}
+          = markdown truncate(track.description, length: 200, separator: ' ')