Updated site builder