Fixed navigation once again