Fixed the issues with the storyboard