Some UI improvements
UI update