Update to organization formatting
Use custom form macro instead of override default