Small changes on combat form and friendly form, renaming friendly form to PickupForm.