Refactored progress bars
Merge branch 'task/event_progress'