Fix BoxFormBuilder and polish