Improve HTML export