cleanup main templates, add partials