Improvements to GameUI