Usability updates

Usability updates