cleaned up some nav issues
Merge branch 'master' of github.com:mike590/Gnarwhales