Updated to fix navigation events