Fixed progress message dismissal + improvements