navigation toolbar improved