Navigation: small adjustments and improvements.