extended and refactored OrganisationManage viewlet, refs #8952