Tidy and rename ui-game
Separate ui bits of flickering