More UX changes to AddGameUI and EditGameUI