Added new includes and layouts. Still developing an architecture for product details.