set navigation apart
clean up for release