Replace divs with Dough form helpers

@benbarnett @benlovell 
And here