In progress changes

Some more changes to the demo app to clean up and polish the UI a bit.