diff --git a/app/controllers/conference_controller.rb b/app/controllers/conference_controller.rb
index eecaf71d..96f62aed 100644
--- a/app/controllers/conference_controller.rb
+++ b/app/controllers/conference_controller.rb
@@ -15,7 +15,6 @@ class ConferenceController < ApplicationController
     @rooms = @conference.venue.rooms if @conference.venue
     @events = @conference.program.events
     @dates = @conference.start_date..@conference.end_date
-
     if @dates == Date.current
       @today = Date.current.strftime('%Y-%m-%d')
     else
diff --git a/app/views/conference/_schedule.html.erb b/app/views/conference/_schedule.html.erb
index 1d036378..2f73efab 100644
--- a/app/views/conference/_schedule.html.erb
+++ b/app/views/conference/_schedule.html.erb
@@ -13,51 +13,39 @@
         <div class="tab-pane <%= 'active' if @dates.first == date %>" id ="<%= date %>" >
           <table class="table table-bordered" id="schedule" width="100%">
             <tr>
-              <th>Time</th>
-              <% @rooms.each do |room| %>
-                <th><%= room.name %></th>
+              <th>Rooms</th>
+              <%# The conference starts at 9 and ends at 18:45 %>
+              <% intervals = (19 - 9) * 4 %>
+              <% (9..18).each do |i| %>
+                  <th colspan="4"><%= "#{i}:00" %></th>
               <% end %>
             </tr>
-
-                <% span = {} %>
-                <% @rooms.each do |room| %>
-                  <% span[room.id] = 1 %>
-                <% end %>
-
-            <% conf_start = DateTime.parse("#{date} 09:00") %>
-            <% conf_end = DateTime.parse("#{date} 19:00") %>
-
-            <% while conf_start < conf_end %>
-              <%-
-                start_hour = conf_start.hour
-                start_min = conf_start.min %>
-
+            <% @rooms.each do |room| %>
+              <% span = 1 %>
               <tr>
-                <td style="width:5%">
-                  <%= conf_start.strftime("%H:%M") %>
-                </td>
-
-                <% @rooms.each do |room| %>
-                  <% events_for_date = @events.find_all {|e| e.room_id == room.id && e.start_time && e.start_time.to_date == date } %>
-                  <% event = events_for_date.find_all{|e| e.start_time.hour == start_hour && e.start_time.min == start_min } %>
-                  <% if !event.empty? %>
-                    <!-- There is an event, calculate the span and show it -->
-                    <% span[room.id] = event[0].event_type.length / 15 %>
-                    <%= render partial: 'schedule_item', locals: {event: event, room: room, span: span} %>
-                    <% span[room.id] = span[room.id] + 1 %>
-                    <% elsif  span[room.id] > 1 %>
-                      <!-- span is <%= span[room.id] %> and bigger than 1, substract 1 from span -->
-                      <% span[room.id] = ( span[room.id] - 1 ) if span[room.id] > 1 %>
+                <td><%= room.name %></td>
+                  <% events_for_date = room.events.find_all{ |e| e.start_time.to_date == date } %>
+                  <% start_time = DateTime.parse("#{date} 09:00") %>
+                  <% (1..intervals).each do |i| %>
+                    <% events_for_time = events_for_date.find_all{|e| e.start_time == start_time} %>
+                    <% if !events_for_time.empty? %>
+                      <% event = events_for_time[0] %>
+                      <!-- There is an event, calculate the span and show it -->
+                      <% span = event.event_type.length / 15 %>
+                      <%= render partial: 'schedule_item', locals: {event: event, span: span, intervals: intervals} %>
+                      <% span += 1 %>
+                    <% elsif  span > 1 %>
+                      <% span -= 1 %>
                     <% end %>
-                    <% if span[room.id] == 1 %>
+                    <% if span == 1 %>
                       <!-- span equals 1 show an empty td -->
-                      <td style="width: <%= 95 / @rooms.length %>%">
+                      <td style="width: <%= 95 / intervals%>%">
                       </td>
                     <% end %>
-                <%end %>
+                    <% start_time += 15.minutes %>
+                  <% end %>
               </tr>
-              <% conf_start += 15.minutes %>
-            <%end %>
+            <% end %>
           </table>
         </div>
       <% end %>
diff --git a/app/views/conference/_schedule_item.html.haml b/app/views/conference/_schedule_item.html.haml
index 743095ca..167fbbb5 100644
--- a/app/views/conference/_schedule_item.html.haml
+++ b/app/views/conference/_schedule_item.html.haml
@@ -1,24 +1,23 @@
-%td.event{ style: "width: #{95 / @rooms.length}%; cursor:pointer", |
-           rowspan: span[room.id], |
+%td.event{ style: "width: #{95 * span / intervals}%; cursor:pointer", |
+           colspan: span, |
            role: "button" } |
-  %a.unstyled-link{href: url_for(conference_program_proposal_path(@conference.short_title, event[0].id))}
-    - if speaker = event[0].speakers.first
+  %a.unstyled-link{href: url_for(conference_program_proposal_path(@conference.short_title, event.id))}
+    - if speaker = event.speakers.first
       = image_tag speaker.gravatar_url, :class => "img-circle pull-right", |
                                          :alt => speaker.name, |
                                          :title => speaker.name, |
                                          :style => "padding:8px;" |
     %h5
       %span.fa.fa-comment
-      = event[0].title
-      - unless event[0].subtitle.blank?
+      = event.title
+      - unless event.subtitle.blank?
         %span.schedule-subtitle
-          = event[0].subtitle
+          = event.subtitle
     %span.schedule-speaker
       %span.fa.fa-user
       = speaker.name
-    - if event[0].track
+    - if event.track
       %span.schedule-track
         %span.fa.fa-road
-        %span.label{ style: "background-color: #{event[0].track.color}" }
+        %span.label{ style: "background-color: #{event.track.color}" }
           = event[0].track.name
-