Fixed navigation bar bugs