refactoring of States and new game option on pause