Fix new and edit pages