Clean up and added complete win/lose/menu states