Refactoring gallery stuff
Refining property view
Refining property view