Update demo storyboard to improve layout and eliminate warnings