improved re-layout of FlexiFormComponent.bbj