PropertiesView Refactoring