More UI work on storyboards