fix some nav bugs