removed weird UI, added progressbar
merge