Fix storyboard issues