LPS-38435 Usability Improvements