minor layout changes. fix mousewheel on firefox
Merge branch 'master' into gh-pages