Minor fixes on layout + typo
Merge branch '2015-b' into gh-pages

* 2015-b:
  Minor fixes on layout + typo