Latest changes with html issues