Updated site generation and templates