html layout
Merge branch 'design-&-html-layout'