Update views to use form builder and fix tests