Refactoring
Merge branch 'yakush-silvestrov-storefront-design-fix' of github.com:ottemo/storefront into yakush-silvestrov-storefront-design-fix