Navigation improvement

pull pleaase