More responsive nav work