UI and efficiency upgrades