[WIP] Demo-UI Changes

These are the base of some ui changes that will go into the demo due on Dec 17.