layout correction + roo users improvement