revised templates/fixed links