Include rendering for other elements.

- Yes it's a mess of conditions, but prettiness can come later.