 				v.addElement(h);
 				return v;
 			}else {
-				var width:int = getInputFieldWidth(defn, true);
+				var width:int = getAttributeDataGroupHeaderWidth(defn);
 				
 				v = new VGroup();
 				v.width = width;

		}
		
		public static function getInputFieldWidth(def:AttributeDefinitionProxy, isInDataGroup:Boolean = false):int {
			if(def is TextAttributeDefinitionProxy) {
				var textAttributeDef:TextAttributeDefinitionProxy = TextAttributeDefinitionProxy(def);
				var type:TextAttributeDefinitionProxy$Type = textAttributeDef.type;
				switch(type) {

	 * */
	public class UIBuilder {
		
		public static function buildForm(entity:EntityDefinitionProxy, version:ModelVersionProxy):FormContainer {
				var formContainer:FormContainer = new FormContainer();
				formContainer.initialize();
