Fix dimensions and label placements
Merge branch 'master' into gh-pages

* master:
  Fix dimensions and label placements