Cleaned up the storyboard