Color and loading fixes