Updated, and added a loading panel too