Field creation, edit and delete revamp