Convert navigation to be contained within a class.