improved some contrasts
added 'services' to organization submenu