Fixed nav issues
Merge branch 'master' into ryan
Merge branch 'ryan'