UPD: fix scopes
UPD: small fixing controller
UPD: fix views of widget
UPD: small fixes
Merge pull request #914 from angel-kulikov/master

UPD: small fixes