Selected weapon is now highlighted correctly