Render refactor (with couple of fixes)

Agreed.