Removed loading screen, fixed modal issue