Fixed issues with activity indicator