add pictogram and refactoring