First round of changes for local navigation