Layout for organizatios without map improved