Storyboard and connection bug fix