Updated demo app to be Universal