refactored: btn-edit and btn-eject directives introduced