refactor form elements and wire them in with affordability service properties