Added better control over label display, more data in the generated HTML