+ add page number
+ update layout