Popup refactoring
Test fix
Merge pull request #180 from yandex-ui/popup-refactoring

Popup refactoring