Reorganized storyboard to better match expected storyline