Removed Storyboard and replaced with xibs