Update loading state to not use loading-state class in view