Improvements to the organisation edit functionality.