Miscellaneous Usability Improvements

See commit messages for details