Merge pull request #1 from 00s/html-structure

Html structure
Merge pull request #2 from 00s/master

Master
Merge pull request #3 from 00s/layout

Layout
Merge pull request #4 from 00s/cleaning-vs-mess

merge to master