Improve generation of html pages