Improve layout
Imrpove product pages
Fix product pages to only show correct products