Main form UI Updates / Property page added