UI updates

Usability update