UI Upgrades and bug fixes