Improve the outputted html