[IMP] Claim form,Improved Deadline alignment