property view refactor