reorganize html structure
Merge pull request #1 from mtcld/restructure

reorganize html structure