massive refactor of site layout