New template and Links redux