Improve create new page && edit current page propperties