Fix html issues