improve navigation helper