Improve the new page creation