reworked templates and routes