Upgraded storyboards to use adaptive-layout