fix for #4547
Merge pull request #4561 from helgatheviking/fix/duplicate-label-for-settings-checkbox

fix for #4547
tidy up checkbox output
No span for checkbox descriptions
Format prices when using quick edit