refactored loading highlighting