Refactor site view