Replace divs with Dough form helpers

@benbarnett @benlovell 
@baphled is there a better way to do it?