Bug fixes. Added drag&drop on toolbar button.