Fix org detail view
Use angular services and reuse data