DOCS-1006: adding new interface elements and more refactoring