Revised UI.  Refs #6555.