Some navigation modifications.