some butter patches and navigateTo fix