rework active nav highlight logic; reinstate search on desktop