Some changes to navigation