Setup site layout for new pages + general tidyup