Move navigation out of default