(Settings, single-column) Form grouping cleanup

- Revising structure to ensure .form-group is consistently applied for grouping form labels and elements together