Resolve conflict
Template Review - header and nav fixes