refactor affordabilities controller to play nicely with js views
remove explicit scope check
clean up step 2 form to match design spec