Add missing button events. Add onRemove function.