Attempts to clean up/fix some of the e-commerce store front views
(cherry picked from commit bb67711)