more changes to the way org is associated with the project

- use the id property on the org to ensure it has been created and returned with a valid id
- wrap the org form fields in an #if content as sometimes to the content wasn't being set. Needs more investigation but at least if we notice no form fields then they can click "new" org button.
- only focus the first org input field if one isn't already focused.