diff --git a/Composer/packages/adaptive-form/src/components/WithTypeIcons.tsx b/Composer/packages/adaptive-form/src/components/WithTypeIcons.tsx
index 8661c6050d..64ec8bdfc0 100644
--- a/Composer/packages/adaptive-form/src/components/WithTypeIcons.tsx
+++ b/Composer/packages/adaptive-form/src/components/WithTypeIcons.tsx
@@ -36,7 +36,7 @@ export function WithTypeIcons(WrappedComponent: FieldWidget): FieldWidget {
           required={props.required}
         />
         <div css={styles.mainWrapper}>
-          <div css={styles.iconWrapper}>{iconText}</div>
+          {iconText && <div css={styles.iconWrapper}>{iconText}</div>}
           <div css={styles.componentWrapper}>
             <WrappedComponent {...props} label={undefined} />
           </div>
diff --git a/Composer/packages/adaptive-form/src/components/fields/OneOfField/utils.ts b/Composer/packages/adaptive-form/src/components/fields/OneOfField/utils.ts
index 339d2c1903..db9844a488 100644
--- a/Composer/packages/adaptive-form/src/components/fields/OneOfField/utils.ts
+++ b/Composer/packages/adaptive-form/src/components/fields/OneOfField/utils.ts
@@ -29,9 +29,9 @@ export function getOptions(
   schema: JSONSchema7,
   definitions?: SchemaDefinitions
 ): { options: IDropdownOption[]; isNested: boolean } {
-  const { type, oneOf } = schema;
+  const { type, oneOf, additionalProperties } = schema;
 
-  let isNested = false;
+  let isNested = !!additionalProperties;
 
   if (type && Array.isArray(type)) {
     const options: IDropdownOption[] = type.map((t) => ({
diff --git a/Composer/packages/adaptive-form/src/components/fields/OpenObjectField/ObjectItem.tsx b/Composer/packages/adaptive-form/src/components/fields/OpenObjectField/ObjectItem.tsx
index 5e302eaf5a..9e10a1e39d 100644
--- a/Composer/packages/adaptive-form/src/components/fields/OpenObjectField/ObjectItem.tsx
+++ b/Composer/packages/adaptive-form/src/components/fields/OpenObjectField/ObjectItem.tsx
@@ -91,6 +91,7 @@ const ObjectItem: React.FC<ObjectItemProps> = ({
             {...rest}
             definitions={definitions}
             id={`${name}.value`}
+            label={stackedLayout ? formatMessage('Value') : false}
             name="value"
             placeholder={placeholder}
             schema={schema}
diff --git a/Composer/packages/adaptive-form/src/components/fields/OpenObjectField/styles.ts b/Composer/packages/adaptive-form/src/components/fields/OpenObjectField/styles.ts
index 1fbb864fbc..047e810ae1 100644
--- a/Composer/packages/adaptive-form/src/components/fields/OpenObjectField/styles.ts
+++ b/Composer/packages/adaptive-form/src/components/fields/OpenObjectField/styles.ts
@@ -32,7 +32,9 @@ export const filler = css`
 
 export const item = (stackedLayout?: boolean) => css`
   flex: 1;
-
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
   & + & {
     margin-left: ${!stackedLayout ? '16px' : '0'};
   }
diff --git a/Composer/packages/adaptive-form/src/utils/getFieldIconText.ts b/Composer/packages/adaptive-form/src/utils/getFieldIconText.ts
index a0e56a1b81..56e6f1b57d 100644
--- a/Composer/packages/adaptive-form/src/utils/getFieldIconText.ts
+++ b/Composer/packages/adaptive-form/src/utils/getFieldIconText.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-export const getFieldIconText = (type: any): string => {
+export const getFieldIconText = (type: any): string | undefined => {
   const typeFormatted = Array.isArray(type) ? type[0] : type;
   if (typeFormatted === 'string') {
     return 'abc';
@@ -16,5 +16,4 @@ export const getFieldIconText = (type: any): string => {
   } else if (typeFormatted === 'expression') {
     return '=';
   }
-  return '';
 };