Fixed navigation stupidness