UI and upgrade
UI Upgrades and bug fixes