Site view: refactors and adds private members