update templates and routes per Andrei's comment