Updates to PopUp class and GameLogic