Use event delegation for click in Modal
Refactor button actions controller