Fixed bug where added fields shared the same field options, refactored field EJS templates