Adding slightly better loading page, still not happy with it though