Bug fix and linked up new storyboard.