Making the organization page more user friendly