Restructured storyboard