generated HTML improvments #11