Merge branch 'dev'
Change main margin/padding, apply bg colour to comments, and adjust pages accordinly