Update for storyboard and nib