Nav header changes and remaining issues
nav header conflicts resolved