Fixed issues with modals conflict
Refresh the timer based on progress stats

This still needs to be hardened for better offline handling.
Added parameter for fadeShape speed