Changes merged to pages branch

Accidentally created changes in the master branch, when they probably need to be on the pages branch.