ARMSTWO-109, ARMSTWO-106, ARMSTWO-114 #done Added fields as suggested to the form