Simplify the structure of html

ref #3