Usability Improvements

Usability improvements implemented following review by @Rumyra