Pending and Claim buttons fixed