Cleanup for the new UI.

Cleanup job.  No biggies.  Some minor changes.