Updated logic, product & landing pages - 8/27
Updated code for products & landing pages
merged and updated code