started refactoring of buttons and actions