changed layout to non fluid
Merge branch 'master' into gh-pages