Minor ui upgrades