Improve html markup