Move port and protocol into one form group