Animation tweaks, navigation tweaks