Major ui upgrades