Storyboard layout tweaked