Clean up and some Fixes in Progress Bar