Working on claim board feature