Cleaning up UI. Adding in skeleton of demo.