Enrich UI half implemented.  Needs cleanup in #mainpanel.