Minor UI upgrades