Moving more elements to Storyboard.