Updated UI, added progress indicators