Improve html output