fixed navigation bugs and cleaned up
Merge branch 'paddatrapper-navigation'