Added routing, templates