Cleaned up storyboard and removed extra Segues