Refactor the block and unblock exclusive for team members and add and de...

...lete for non team members