restructured storyboard/view flow