refactored style and added progressbar