Refactor HTML helper
Add api component