change form display and naming