improve the report component