Fixed more navbar higlighting