Nav name fix and Next port nav