Updated forms and UI based on feedback from testers