Unit info panel now shows info for correct unit