Fix content width for small screens.
Reworked pages template, template class tweaks.
Merge remote-tracking branch 'upstream/master'