diff --git a/app/views/conference/_tracks.html.haml b/app/views/conference/_tracks.html.haml
index 45cf6aa0..e2b07f89 100644
--- a/app/views/conference/_tracks.html.haml
+++ b/app/views/conference/_tracks.html.haml
@@ -1,9 +1,9 @@
-%div.row
+%div.row.text-center
   %div.col-md-12
     %h2 Tracks
     - @conference.tracks.each do |t|
-      %div.col-md-4
-        %h4 
+      %div{ class: (@conference.tracks.count.to_i <= 2 ? "col-md-#{12/@conference.tracks.count.to_i}" : "col-md-4") }
+        %h4
           = t.name
         %p
-          = t.description 
\ No newline at end of file
+          = t.description
diff --git a/app/views/conference/show.html.haml b/app/views/conference/show.html.haml
index 5245006c..fbf4f76a 100644
--- a/app/views/conference/show.html.haml
+++ b/app/views/conference/show.html.haml
@@ -3,7 +3,7 @@
 
 - unless @conference.description.blank?
   %p= @conference.description
-  %section{ id: 'program' }
+%section{ id: 'program' }
   .pad
     = render 'program'