major UI rework, refs #7660
Merge branch 'dev' into test