[#56185728] Make some form layout more consistent. Make sure fields have
the form-control class set