refactor site layout