Changed templating with partials