several UI upgrades