diff --git a/app/views/proposals/show.html.haml b/app/views/proposals/show.html.haml
index 5de37a52..1ef22ce9 100644
--- a/app/views/proposals/show.html.haml
+++ b/app/views/proposals/show.html.haml
@@ -45,13 +45,6 @@
             .row.speakerbio
               .col-md-12
                 = markdown(speaker.biography)
-          -if @event.scheduled?    
-            %dl.col-md-12
-              -if @event.ended?
-                - @votable_fields.each do |field|
-                  %dt= field.title
-                  %dd= rating_for @event, field.title
-                  %br
     .col-md-9
       .row
         .col-md-12
@@ -126,3 +119,15 @@
                       %dt Room:
                       %dd
                         = event.room.name
+          .col-md-12
+            %hr
+            %table.table
+              %thead
+                %td.col-md-2
+                  %b Feedback:
+                - @votable_fields.each do |field|
+                  %tr 
+                    %td.col-md-2
+                      = field.title
+                    %td
+                      = rating_for @event, field.title, star: field.stars