Refactoring: html stuff to own service/item/html