little refactors
added loading page