tidied up storyboard