continue Navigator refactoring (not functional)
Authored by: klafekie 2016-09-08
Parent: [r138]
Child: [r140]