Fixed storyboard issues