More work on new UI.  Committing this before getting too sidetracked by SharedSolar work