Adding avatar for organizations
Cleaning up views