Fixed some storyboard issues