New loading screen
More improvements and some refactor