Added more client-side templating with partials