Fix a possible regression in Navbar and highlight relaed icon when on a page
Fix a possible regression in Navbar and highlight relaed icon when on a page

hichameyessou/blip,tidepool-org/blip,tidepool-org/blip,hichameyessou/blip,hichameyessou/blip,tidepool-org/blip