Fix html rendering issues