ERTP form improvements

Changes based on user testing on preview