Refactoring storyboard to make more sense