Issue #362: Renamed & re-ordered custom block form fields.
Merge pull request #503 from BWPanda/362/custom_block_form_changes

Issue #362: Renamed & re-ordered custom block form fields.