Addresses some review comments - RA-199

Added a spinner - RA-199