Some improvements around menu highlighting