Cleanup, added ActivityIndicatorViews