Replaced ToggleButtonListener usages with ButtonListener and removed ButtonListener