more template changes, adding organization select