renamed some classes, added loading screen