Fix investigation links
Get all the templates to render in the right place