FIX: Fixed the button events