Final version of yelp app