Outdated bootstrap markup
Bootstrap5 needs explicit spacing between form rows
Replace batch-update with data-fix modules. Add data-fix for _PRIM tags. Fixes: #1354, Fixes: #1370, Fixes: #1386, Fixes: #2931