Refactoring - Add Button Event Listeners