Updated progress indicator to upload button + angular refactors