Property Mapping Panel Fixes

-Validation
-Property mapping ui update