UX improvements - refs #6715