Template Review - nav fixes