more UI work, refs #7660, #refs #7797, fixes #7773