Removed hardcoded 21 from the storyboard