added neightbourhood to organization. layut adjustments on orgs and users