Corrected some bug with the nav