Use form builder helpers

I've also adjusted the method to not re-wrap the label text in a
string as this marks it as dirty, meaning it gets escaped.