Fixed some nav bugs.