Small navigation modifications