Changed storyboard and merged favoriteVC