Broker form redesign