Fixed loading error, added loading