Tighten up page validations
erge branch 'master' of https://github.com/christopherlobay/sloth