more Nav changes #41