Improve navbar navigation