Improve html