Refactor label tag
Add HP Label