ECMS-4777:Incorrect UI of Metadata and Add/Edit Properties