Fixed nav bar selection issue