corrected navigation link states and added navigation highlight