fix nav functionality issues