better fields save + front-end template