changes for gamestate and UI

changes for gamestate and UI