Navigation bar, highlighting items has been reworked.