Loads of changes to UI and game logic fixes