quick fixes to template & links