Fix the CSS problem with the menu overlapping
Update HTML
Merge branch 'master' into gh-pages