fix some bugs witj nav