moved some stuff to html module