Reorganized storyboard, included new View for Demo.