Improve html formatting