some fixes
Merge remote-tracking branch 'origin/new_web_verstka' into new_web_verstka