Fixed navigation bar issue