Merge pull request #1823 from ppasq/fixer

General Style fixes on page templates