update views to use form builder and fix tests