Storyboard fixes