Add remove function and prevent adding duplicates to form.