Refactor visibility options tracking to form data tracking as the changes in giver/recipient option should be considered as well