Switched to using storyboards