diff --git a/app/models/conference.rb b/app/models/conference.rb
index e5c55018..4cdf1a45 100644
--- a/app/models/conference.rb
+++ b/app/models/conference.rb
@@ -566,8 +566,8 @@ class Conference < ActiveRecord::Base
     email_settings.updated_conference_registration_dates_template
   end
 
-  def keynote_speakers
-    User.with_role(:keynote_speaker, self)
+  def keynotes
+    events.where(state: 'confirmed').select { |e| e.event_type.title == 'Keynote'}
   end
 
   ##
diff --git a/app/views/conference/_program.html.haml b/app/views/conference/_program.html.haml
index 5b1c82ae..a67d81e1 100644
--- a/app/views/conference/_program.html.haml
+++ b/app/views/conference/_program.html.haml
@@ -24,9 +24,9 @@
           = link_to(conference_schedule_path(@conference.short_title), class: 'btn btn-default btn-lg') do
             Full Schedule
 
-
   %h3.text-center
     Don't miss out!
+  %br
   - if @conference.highlights.any?
     .row
       .col-md-12