Some changes with pages