Completed more storyboard