New pages and lots of fixes
.
Merge remote-tracking branch 'origin/master'