Make safe nav an independent template
Reintegrate templates with views