Fixed loading page bugs