Completing challenge 1 and some tweaks of storyboard