nav refactory