Improved Navigation on the nav bar click even to sync with buttons