Improved usability

Lisitsa Nikita from Dmitry Bobrov's computer.