refactored property editing forms