Adjust field layout and make all file field types get an "@" prepended before sending to the API