Made the demo app universal