updated trade setup form to include all fields