routes fix, templates fix