Displaying active link in the nav bar and some UI changes