diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index 5d66af25..a09b2b01 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -174,6 +174,7 @@ module EventsHelper
   end
 
   def join_event_link(event, current_user)
+    # TODO: Should this take in an event_schedule?
     return unless event.url.present? && current_user
 
     conference = event.conference
@@ -181,13 +182,14 @@ module EventsHelper
 
     if current_user.roles.where(id: conference.roles).any?
       # Show Pre-Event links for any memeber of the conference team.
-      link_to("Join Live Event (debug is now?: #{is_now})",
+      link_to("Join Live Event #{'(Admin link)' unless is_now}",
                       event.url, target: '_blank')
     elsif current_user.registered_to_event?(conference)
-      link_to('Join Live Event', event.url, target: '_blank')
-      # else
-      #   link_to('Live Event Link Coming Soon', '#')
-      # end
+      if is_now
+        link_to('Join Live Event', event.url, target: '_blank')
+      else
+        link_to('(Live Event Link Available During Event)', '#')
+      end
     end
   end
 
diff --git a/app/views/schedules/happening_now.haml b/app/views/schedules/happening_now.haml
index c16140df..bfa2aced 100644
--- a/app/views/schedules/happening_now.haml
+++ b/app/views/schedules/happening_now.haml
@@ -1,20 +1,9 @@
 .container#program
-  = render partial: 'schedule_tabs', locals: { active: 'now' }
+  = render 'schedule_tabs', active: 'now'
 
   %h1.text-center
     Happening Now at
     = @conference.title
-  -# .dropdown.program-dropdown
-  -#   %button{ type: "button", class: "btn btn-default dropdown-toggle", 'data-toggle' => "dropdown" }
-  -#     Dates
-  -#     %span.caret
-  -#   %ul.dropdown-menu
-  -#     - @dates.each do |date|
-  -#       %li.li-dropdown-program
-  -#         = link_to date, "##{date}", class: "program-selector#{ ' no-events-day' unless @conference.program.any_event_for_this_date?(date) }"
-  -#     - if @unscheduled_events.any?
-  -#       %li.li-dropdown-program
-  -#         = link_to('Unscheduled', "#unscheduled", class: 'program-selector')
 
   .row
     .col-md-12
@@ -24,12 +13,9 @@
         This page was loaded at
         = inyourtz(Time.now) do
           #{Time.now.strftime('%a %b %d at %I:%M %P (%z)')}
-      %p
-        P.S. This page is in beta, and if it doesn't make sense, we're sorry.
-      %small
-        Times & Timezones...only one of the many "2 hard problems in computer science".
 
   .row
+    / TODO: Clean this up, merge with all events page.
     / scheduled events
     - date = nil
     - time = nil
@@ -49,13 +35,13 @@
               = time = event_schedule.start_time.strftime('%H:%M')
         .col-xs-12.col-md-11
           .new-time-event
-            = render partial: 'event', locals: { event: event_schedule.event, event_schedule: event_schedule }
+            = render 'event', event: event_schedule.event, event_schedule: event_schedule
       - else
         .col-xs-12.col-md-11.col-md-offset-1
-          = render partial: 'event', locals: { event: event_schedule.event, event_schedule: event_schedule }
+          = render 'event', event: event_schedule.event, event_schedule: event_schedule
 
 :javascript
-  // Go to current date and time
+  // Refresh the page every 5 minutes.
   $(document).ready(function(){
     setTimeout(function() {
       window.location = window.location;