major UI rework, refs #7660