[Added] Action listener to buttons
[Refactoring]