Refactor navigation concern

This isn't part of the refactor