Add navbar higlighting. Fix cast spacing