fixed loading state and removed old loading elements