Fix #66, make the progress image move correctly and further simplify code