As part of 3.2.0 release we need to tackle several storefront theme improvements and related functionality