Layout and pagination update