Fixed up some Storyboard stuff