Setup site layout for new pages + general tidyup
Setup site layout for new pages + general tidyup