Move navigation to separate file