Fixed nav issues