progress on nav switch
Fix conflicts