Refactored and added a lobby screen