Refactor Object List View