Improve html-base