some fix
Merge branch 'new-design' of github.com:AndreyPetrick/web-develop into new-design