decoupled public site and added templating