refine the code
add nav highlight