nav bugfixes and improvements