Update views to suer form builder and fix tests