layout modified and font-family
Merge branch 'master' into gh-pages

Layout change and font-family