Fixed several nav issues. Ready for release.