updates to product list and detail views and data logic
Merge branch 'dev'