Fixed display on small devices.
Merge branch 'master' into gh-pages