todo: join validation with add and remove buttons