fix the layout, looks ok in chrome as well
Merge branch 'master' into gh-pages