Update views to use form builder, fixed tests.