clean up code
remove extra screen
add activity indicator back in