diff --git a/app/modules/epics/create-epic/create-epic.jade b/app/modules/epics/create-epic/create-epic.jade
index 645ca696..44367e04 100644
--- a/app/modules/epics/create-epic/create-epic.jade
+++ b/app/modules/epics/create-epic/create-epic.jade
@@ -44,7 +44,7 @@ tg-lightbox-close
                 input(
                     type="checkbox"
                     name="team_requirement"
-                    ng-model="vm.newEpic.teamRequirement"
+                    ng-model="vm.newEpic.team_requirement"
                     id="team-requirement"
                 )
                 label.requirement.trans-button(
@@ -55,7 +55,7 @@ tg-lightbox-close
                 input(
                     type="checkbox"
                     name="client_requirement"
-                    ng-model="vm.newEpic.clientRequirement"
+                    ng-model="vm.newEpic.client_requirement"
                     id="client-requirement"
                 )
                 label.requirement.trans-button(
@@ -66,7 +66,7 @@ tg-lightbox-close
                 input(
                     type="checkbox"
                     name="blocked"
-                    ng-model="vm.newEpic.isBlocked"
+                    ng-model="vm.newEpic.is_blocked"
                     id="blocked"
                     ng-click="displayBlockedReason = !displayBlockedReason"
                 )
@@ -87,4 +87,4 @@ tg-lightbox-close
                 type="submit"
                 translate="EPICS.CREATE.CREATE_EPIC"
             )
-        
+
diff --git a/app/modules/epics/dashboard/epic-row/epic-row.controller.coffee b/app/modules/epics/dashboard/epic-row/epic-row.controller.coffee
index ba338e5b..d840e567 100644
--- a/app/modules/epics/dashboard/epic-row/epic-row.controller.coffee
+++ b/app/modules/epics/dashboard/epic-row/epic-row.controller.coffee
@@ -31,9 +31,16 @@ class EpicRowController
         @.displayAssignedTo = false
 
     _calculateProgressBar: () ->
-        totalUs = @.epic.getIn(['user_stories_counts', 'closed'])
-        totalUsCompleted = @.epic.getIn(['user_stories_counts', 'opened'])
-        @.percentage = totalUs * 100 / totalUsCompleted
+        if @.epic.getIn(['status_extra_info', 'is_closed']) == true
+            @.percentage = "100%"
+        else
+            opened = @.epic.getIn(['user_stories_counts', 'opened'])
+            closed = @.epic.getIn(['user_stories_counts', 'closed'])
+            total = opened + closed
+            if total == 0
+                @.percentage = "0%"
+            else
+                @.percentage = "#{closed * 100 / total}%"
 
     updateEpicStatus: (status) ->
         id = @.epic.get('id')
diff --git a/app/modules/epics/dashboard/epic-row/epic-row.jade b/app/modules/epics/dashboard/epic-row/epic-row.jade
index b62a32e6..c7c9d94a 100644
--- a/app/modules/epics/dashboard/epic-row/epic-row.jade
+++ b/app/modules/epics/dashboard/epic-row/epic-row.jade
@@ -74,7 +74,7 @@
         .progress-bar
         .progress-status(
             ng-if="::vm.percentage"
-            ng-attr-width="::vm.percentage"
+            ng-style="{'width':vm.percentage}"
         )
 .epic-stories-wrapper(ng-if="vm.displayUserStories && vm.epicStories")
 
diff --git a/app/modules/epics/dashboard/story-row/story-row.controller.coffee b/app/modules/epics/dashboard/story-row/story-row.controller.coffee
index d2b2f68b..e93eca79 100644
--- a/app/modules/epics/dashboard/story-row/story-row.controller.coffee
+++ b/app/modules/epics/dashboard/story-row/story-row.controller.coffee
@@ -26,11 +26,14 @@ class StoryRowController
         @._calculateProgressBar()
 
     _calculateProgressBar: () ->
-        tasks = @.story.get('tasks').toJS()
-        totalTasks = @.story.get('tasks').size
-        areTasksCompleted = _.map(tasks, 'is_closed')
-        totalTasksCompleted = _.pull(areTasksCompleted, false).length
-        @.percentage = totalTasksCompleted * 100 / totalTasks
+        if @.story.get('is_closed') == true
+            @.percentage = "100%"
+        else
+            tasks = @.story.get('tasks').toJS()
+            totalTasks = @.story.get('tasks').size
+            areTasksCompleted = _.map(tasks, 'is_closed')
+            totalTasksCompleted = _.pull(areTasksCompleted, false).length
+            @.percentage = "#{totalTasksCompleted * 100 / totalTasks}%"
 
     onSelectAssignedTo: () ->
         console.log 'ng-click="vm.onSelectAssignedTo()"'
diff --git a/app/modules/epics/dashboard/story-row/story-row.jade b/app/modules/epics/dashboard/story-row/story-row.jade
index 9c8c513a..0783c479 100644
--- a/app/modules/epics/dashboard/story-row/story-row.jade
+++ b/app/modules/epics/dashboard/story-row/story-row.jade
@@ -4,10 +4,10 @@
     .vote(
         ng-if="vm.column.votes"
         ng-class="{'is-voter': vm.story.get('is_voter')}"
-    ) 
+    )
         tg-svg(svg-icon='icon-upvote')
         span {{::vm.story.get('total_voters')}}
-        
+
     .name(ng-if="vm.column.name")
         - var hash = "#";
         a(
@@ -48,5 +48,5 @@
         .progress-bar
         .progress-status(
             ng-if="::vm.percentage"
-            ng-attr-width="::vm.percentage"
+            ng-style="{'width':vm.percentage}"
         )