Refs #7449 fixed usability issues found in testing