Updated HTML generator