Final page-per-thing tweaks