Finish the nav part work