Fixes to some UI game logic, deleted swing ui