Pass at fixing intermittent navbar failures