fix buttons and bulk update