new design for the food page
fix merge conflict