UI upgrades and bugfixes