Edits to layout.#3607
Merge branch 'SCHOLAR-3.x' of github.com:openscholar/openscholar into SCHOLAR-3.x