Storyboard tweaks