refactoring Property UI handling: cleanier