Adding UI improvements
UI improvements