UI and gameplay improvements