diff --git a/app/helpers/conference_helper.rb b/app/helpers/conference_helper.rb
index 2ded3789..c392a814 100644
--- a/app/helpers/conference_helper.rb
+++ b/app/helpers/conference_helper.rb
@@ -82,7 +82,7 @@ module ConferenceHelper
     events_schedules = conference.program.selected_event_schedules(
       includes: [:room, { event: %i[track event_type speakers submitter] }]
     ).select(&:happening_now?)
-    events_schedules = [] unless events_schedules
+    events_schedules ||= []
     events_schedules
   end
 end
diff --git a/app/views/conferences/show.html.haml b/app/views/conferences/show.html.haml
index 96d10838..53f61abd 100644
--- a/app/views/conferences/show.html.haml
+++ b/app/views/conferences/show.html.haml
@@ -47,14 +47,13 @@
   -# happening now events
   - if @conference.splashpage.include_happening_now
     - if @events_schedules.any?
-      - for event_schedule in @events_schedules
-        .container
+      .container{style: "padding: 20;"}
+        - for event_schedule in @events_schedules
           = render 'schedules/event', conference: @conference, event_schedule: event_schedule, event: event_schedule.event
     - else
       .row
         .col-md-12
-          #happening_now_panel
-            %h3.text-center There are no events happening now.
+          %h3.text-center There are no events happening now.
 
   -# calls for content, or program
   - if @conference.splashpage.include_cfp