Refactor edit and new pages, add _fields