Fixed Performance Issue with Storyboards