HTML generation improved.