Scrap multiple HTML blocks (contexts) in favour of separate Elements

[fran-worley]

This layer of complexity shouldn't be necessary an element should have 1 HTML block.

With wrapped controls, the Wrappers should be their own Element and the builder should reference those wrappers, rather than the underlying control.

This should cleanup things up considerably and simplify the API for defining html output.