Add layouts for 12, 20, and ~80 per page
Merge remote-tracking branch 'github/master'