DAR-2604: changing the way of binding to modal buttons