Template Review - nav and header fixes