Update form types and the bundles, customize view