Front end fixes #1148
Merge branch 'dev' of https://github.com/VirtoCommerce/vc-community