diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index ef409eb1..8fb9c7ae 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -19,13 +19,11 @@ module ApplicationHelper
   end
 
   def event_progress_color(progress)
-    progress = progress.to_i
-
-    case progress
+    case progress.to_i
     when 100 then 'progress-bar-success'
-    when 86 then 'progress-bar-info'
+    when 85 then 'progress-bar-info'
     when 71 then 'progress-bar-warning'
-    when 14, 29, 43, 57 then 'progress-bar-danger'
+    when 14, 28, 42, 57 then 'progress-bar-danger'
     end
   end
 
diff --git a/app/models/event.rb b/app/models/event.rb
index f8c07ade..7f5d9aa8 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -207,11 +207,10 @@ class Event < ActiveRecord::Base
   # Returns the progress of the proposal's set up
   #
   # ====Returns
-  # * +Fixnum+ -> Progress in Percent
+  # * +String+ -> Progress in Percent
   def calculate_progress
     result = self.progress_status
-    true_items = result.select { |_key, value| value }.length
-    (true_items / result.length.to_f * 100).round(0).to_s
+    (100 * result.values.count(true) / result.values.count).to_s
   end
 
   private