Refactor dive site edit and update