Fixed product and location pages

Fixed product and location pages