Improve #5 Cafe Listing