change and remove buttons
refactoring, listeners