Minor bug fixes ahead of first release
Merge pull request #2 from JonForest/Content-Pages

Minor bug fixes ahead of first release