Fixed new and edit page