Render refactor (with couple of fixes)

Filters don't work on texts yet?