Small fix
Allow to load state
Fixed issue on cancel and highlight
Separated progress