Cleanup and added loading page.