Change to ui.navigator
Merge branch 'ui.navigator'