Adds MacroableTrait to FormBuilder and HtmlBuilder
Cleaning up to code standards