Lots of work on the UI and gameplay