Added proper navbar highlighting