Adjusted macros;
Merge branch 'master' of https://github.com/TatsianaK/SuperOnlineShop