Improved PropertyWIdget