MDL-38573 choice: Reformat settings form