Fix missing pagination in layouts