Reorder field modifiers
Improve default checkbox state